upgrade autocompletion 2P