Follow-up to #17024: Labels missing for fields without CSH