Filters with query params fix