Cleaned up some if-statements in the filterengine, should make it more readable and probably a little bit more effecient as well
Merge pull request #2 from bjaanes/master

Some filterengine clean up