Removed unnecessary filter toggling.

Also renamed the filter function to be a bit more obvious.