Fix entity_types output