Autocomplete upgrade