fix minor eventsId issues