fix entity form prob with enter button
non-op changes
refactor the way the entity model changes work