Fix paging and pagination to work with client side filtering