updates to make autocomplete work