Merge "Fix selected entity type."