Autocomplete return objects fix