Fix basic typeahead