Fixed tooltips and datamart