Improved handling of event-id