ComboBox HW - some changes