Better handling of comboboxes