improve autocompletion