Query workbench keeps forgetting the query context

One thing that I've noticed about the 7.0 Query editing window is that is has amnesia when it comes to the query context (the context controlled by the upper right box).  It would be ever so much cooler if the query context were associated with the queries in the query history.  I've found that my browser keeps forgetting what the context is when I move around - causing errors whenever I return and run a query, or go back to a previous query "out of context".  It would greatly (IMO) improve the user experience if this association were made and remembered.

Filing this as a 7.01 fix because of how nice it would be to have ASAP.  Feel free to defer to whatever, but please don't discard the idea altogether w/o some discussion. 

Presumably this "fix" would be desirable in both the Query and Analytics N1QL editors.