[PDT 5478] Fix client side filtering where paging within a shard is required