Filtering works
Made filtering work better