Fixed issue for Autocomplete