autocomplete order fixes