Fix typeahead