disable autocomplete
small modify
Merge branch 'dev'