Shift some of the paging logic down to controller level
Shift some of the paging logic down to controller level (2)