Added potential fix for autocomplete issue