Fix:Events edition/creation