Change the query controller so that it evaluates all of the pages (keeping the API the same but supporting the new paging system)