Keep the same item selected in search autocomplete

issue:

    UI Search keeps previous search term with incorrect focus (instead of clearing it out)