EntityFormFactory fixed