Improve pagination.