Move the EntityFilter model into Entity::Filter