Combobox: fix for auto-filtering and tiny improvement