Fixing issue with autocomplete