query page improvments (with conflicts)
Merge branch 'master' of https://github.com/theorenck/atlas