Further tweaks & bugfixes to the trade lead processing