Pagination improvements.