Started fixing typeahead