Fixing autocomplete

+ return of the caret while autocompleting (better)