Fixed computation of entity type for EntityTypeIds in values