CLSN-1441 Code Review : Pagination route change