Added intelligence behind making TDI clickable