ensure tooltips are always accurate
Merge pull request #1185 from control-center/feature/CC-298

ensure tooltips are always accurate