further autocomplete changes