Move event_id session setting to private method