added proper T1/T2 item linking