Update yoda to rely on data from request_id instead of event

Update yoda to rely on data from request_id instead of event #303