Fixed selection issues with combobox