Major update for autocomplete