Diagnosis selection widget fixes