changed keypath field and added delete with keypath field
fixed issues with keypath field != 'id'