Pagination flow fixes