Improved filter parsing to support more edge cases
Merge branch 'master' of Github:yogthos/Selmer