Finalize autocompletion v1.5