[#52937045] https://www.pivotaltracker.com/s/projects/864405/stories/52937045 - Result paging and query API cleanup