#225 - Allow for regular expressions in filters (feature)
refactor filter.cs
more refactoring around filter handling