Autocompletion minor tweak