Fix problem with names with markup in tooltips