Pagination key fix