fix filter bugs