Improved branch combobox