Modify queries
Merge branch 'master' of github.com:DCP-Project/minnow-prototype into storage-rewrite
Fix up more query doodads