Fix enhanced events

Pelayo Torresrequested to merge
OCF88-fix-enhanced-event-report into staging

Merge request reports