Fixed a few filter bugs