Refresh filters/attributes when I hit Cancel, then Retry

Currently, if a query is loading, and you hit cancel, then add an attribute to the rows, and hit "retry", it will just load the last chart it successfully loaded, and ignore the changes you made. Retry should check and pick up these changes, so that I don't have to then drag a row to a column and back again, just to get the query to load with the elements I added.