YouTube: logic partly moved to TS2