fix - get entityid from the map, not entity