[Update] Make autocomplete mightier