autocomplete bug fixing, almost ready