unify autocompletion management, update #1838