diff --git a/plugins/CoreHome/templates/_dataTableCell.twig b/plugins/CoreHome/templates/_dataTableCell.twig
index a5d21d105d3..3ef2e8803f2 100644
--- a/plugins/CoreHome/templates/_dataTableCell.twig
+++ b/plugins/CoreHome/templates/_dataTableCell.twig
@@ -20,17 +20,23 @@
{% endif %}
{% if row.getMetadata(tooltipIndex) %}{% endif %}
- {% set totals = dataTable.getMetadata('totals') %}
+
+{% set totals = dataTable.getMetadata('totals') %}
{% if column in totals|keys -%}
- {% set rowPercentage = row.getColumn(column)|percentage(totals[column], 1) %}
- {% set totalValue = siteSummary.getFirstRow.getColumn(column) %}
+ {% set labelColumn = columns_to_display|first %}
+ {% set reportTotal = totals[column] %}
+ {% set siteTotal = siteSummary.getFirstRow.getColumn(column) %}
+ {% set rowPercentage = row.getColumn(column)|percentage(reportTotal, 1) %}
+
+ {% set firstPartOfTooltip = ["'", row.getColumn(labelColumn), "' represents ", rowPercentage, ' of ', reportTotal, ' ', translations[column]|default(column), ' with ', translations[labelColumn]|default(labelColumn), '.']|join %}
- {% if totalValue %}
- {% set totalPercentage = row.getColumn(column)|percentage(totalValue, 1) %}
- {% set secondPartOfTooltip = ['This is ', totalPercentage, ' of all ', totalValue, ' ', translations[column]|default(column)]|join %}
+ {% if siteTotal and siteTotal != reportTotal %}
+ {% set totalPercentage = row.getColumn(column)|percentage(siteTotal, 1) %}
+ {% set secondPartOfTooltip = ['This is ', totalPercentage, ' of all ', siteTotal, ' ', translations[column]|default(column), '.']|join %}
{% else %}
{% set secondPartOfTooltip = '' %}
+
{% endif %}
- {{ rowPercentage }}
+ {{ rowPercentage }}
{%- endif %}
{% endspaceless %}