Datalink and show bug fix

Datalink and show bug fix