More cleanup, etc..

Pagination updated to use new query system, mulling over how to handle
hard-capping queries if needed (To keep from returning too many values
on a request, obviously to save server resources and bandwidth)