Rework of hover logic to allow a single label to be displayed