Chg: autocomplete begin refactor