Bug fixes for Filter