fix entity validation order for the EntityMap