Remove client-side filtering now we prefilter