multi-select search with search string fixed

Much cleaner this way. Nice work Sasmita!