ComboBox: various fixes and improvements (thanks @wkeese for your feedback)