updated with latest autocomplete changes