fixes for tooltip logic