cleanup autocomplete bugs