Changes to Include label and Table In tooltip