[OE-3779] Diagnosis selection fixes