Creating T7 transactions for DBA's in 9.0

We ran our first payroll in E1 where we have multiple legal entities on one payroll version (7 separate legal entities).  All worked well until we got to the T7 creation.  The T7s for taxes split properly ie created a separate T7 for each legal entity.  However, the T7's for DBAs created only 1 T7 for each supplier, picking up the document company and GL coding from the largest company number that was processed.  For example, for Canada Savings Bonds (CSB) deductions, I have one T7 although employees from all 7 companies have CSB deductions, and the document company is