most filter bugs fixed