autocomplete fixed
Merge branch 'autocomplete' into dev