fix(typeahead): corrections for bugs #2293, #2535