Typeahead fixes