Completed EntityMap epuration

now entity "name" is optional