entity filter upgrade
Merge pull request #38 from c2is/filters

entity filter upgrade