CiviCRM improvement on civicrmEvent