Fixed wrong organization assignment on modal
Event update inside onSave
Event delete inside onDelete