Pagination fixed and working