Fixing add, update autocomplete field