Add a space after autocompletion & fix overeagerness