Finishing autocompletion fixing