Fix Typeahead