Replaced typeahead with autocomplete