Corrected issue with duplicate tooltips
CORE-4358