improved autocompletion