new query policy
Merge branch 'master' of https://github.com/acsalu/airstorm-mothership