Fix typeahead hopefully