Query paging added, next up I need sorting so I can write better tests