Typeahead fix