Renamed MatchPattern to Filter, cleaned up
Removed warnign