* Update tooltip issue reported by QA team