fix confirmation
autocomplete
Merge branch 'minshu'