Typeahead fixes

Typeahead fixes