Issues with autocompletion fixed