Cater for named event fields (#4915)
* Cater for named event fields * Adjust name extraction * Rebuild with named events * Empty object * Adjust * Additional * Adjust
This commit is contained in:
* Cater for named event fields * Adjust name extraction * Rebuild with named events * Empty object * Adjust * Additional * Adjust