refactoring
new EntityFilter
new view