Fixed autocompletion annoyances