moved T1/T2 BPO matching to a dict