Combobox: various improvements and fixes. Fixes #401