token fix, event name only output