Pagination now counts the entries