re #926 - Use the router to handle the pagination
Merge branch 'feature/926-7' into staging