fixes for autocomplete