Typeahead hack fully fixed