Fix two filter bugs