WIP introducing entity filters (tests now failing)
Introducing entity filters