Working version of moxy entity filters