Pagination improvements.
Changes