Adjustments for tooltip logic