Fix case where saving query always used current context/view
Merge pull request #396 from cbmi/issue-395

Fix case where saving query always used current context/view