fix #24574: two more changes to tooltips