Changed avoid goal to use Entity Filter.