Further tweaks on trade leads analysis