More changes to autocomplete.