Don't hijack page queries
Merge pull request #24 from borkweb/6401-load-pages

Don't hijack page queries