Update to store queries
Merge branch 'master' of https://github.com/grabbeh/thisorthat