Fix tooltip + enhancement

Adressed PR's comment