Working on #436 - Portal Pagination