EntityView Filter changes
EntityView Subquery support
Some cleanup