-More fixes for autocomplete