think I fixed the issue of broken filtering