Fixed Combobox selection handler