Changes for tooltip question mark issue resolved