Fixed autocompletion replace