UC-2546 Corrected combobox selection