Fix search hightlighted, and combobox bug