Fix pagination issue on /listing page

Fix pagination issue where some records are displayed on diff
pages.