Have you tried autofill? It may clear up some confusion with your T4s. Not sue, but it may be worth a try.
