Fixed first diagnosis issue

Searching for diagnosis and saving would corrupt the selected values
over time due to some mixed up variables