Improving riders pagination.