Fix for paging query builder with filter