bugs fix
edit autocomplete