Fix tooltips and rectangle highlighting