RA-163 Changed from typeahead to autocomplete