[OE-3687] Diagnosis selection fixes