Filters can now be build as regular expressions as well as simple substrings (faster)
Merge branch 'filter' into featuremerge