Fix more filter bugs