More Autocomplete2 Changes