Update handling of tooltips in JHC