Entity filter is now a recursive filter
Update Entity model to force entity name to be unique