Fixed Pagination issue with listing pages