Improved pagination.