re #926 - Use the router to handle the pagination