Which of Vietnam’s largest US shippers also shipped from China in 2016–17?

Query

WITH china_shippers_2016_17 AS (
    SELECT upperUTF8(trimBoth(shipper_name_std)) AS sname
    FROM bols
    WHERE actual_arrival_date >= toDate('2016-01-01')
      AND actual_arrival_date <= toDate('2017-12-31')
      AND (match(upperUTF8(country), 'CHINA|ZHONGHUA') OR match(upperUTF8(loading_port), 'SHANGHAI|NINGBO|YANTIAN|SHEKOU|NANSHA|QINGDAO|TIANJIN|DALIAN|GUANGZHOU|XIAMEN'))
      AND length(trimBoth(shipper_name_std)) > 3
    GROUP BY sname
    HAVING count() >= 5
)
SELECT
    vn.sname,
    vn.vn_bols,
    if(cs.sname != '', 1, 0) AS was_china_shipper_2016_17
FROM (
    SELECT upperUTF8(trimBoth(shipper_name_std)) AS sname,
           uniqExact(bill_of_lading) AS vn_bols
    FROM bols
    WHERE actual_arrival_date >= toDate('2022-01-01')
      AND actual_arrival_date <= toDate('2025-12-31')
      AND (match(upperUTF8(country), 'VIET|VIETNAM') OR match(upperUTF8(loading_port), 'HO CHI MINH|HAI PHONG|HAIPHONG|DA NANG'))
      AND length(trimBoth(shipper_name_std)) > 3
    GROUP BY sname
    ORDER BY vn_bols DESC
    LIMIT 50
) AS vn
LEFT JOIN china_shippers_2016_17 AS cs ON vn.sname = cs.sname
ORDER BY vn.vn_bols DESC