fixes to autocomplete