Fix Autocomplete issue when in edit mode