Autocompletion improvements