diff --git a/src/components/charts/Chart.tsx b/src/components/charts/Chart.tsx
index 2ec40d07..993618c2 100644
--- a/src/components/charts/Chart.tsx
+++ b/src/components/charts/Chart.tsx
@@ -81,6 +81,7 @@ export function Chart({
   const updateChart = (data: any) => {
     chart.current.data.datasets.forEach((dataset: { data: any }, index: string | number) => {
       dataset.data = data?.datasets[index]?.data;
+      chart.current.legend.legendItems[index].text = data?.datasets[index].label;
     });
 
     chart.current.options = options;
@@ -88,9 +89,9 @@ export function Chart({
     // Allow config changes before update
     onUpdate?.(chart.current);
 
-    chart.current.update(updateMode);
-
     setLegendItems(chart.current.legend.legendItems);
+
+    chart.current.update(updateMode);
   };
 
   useEffect(() => {
diff --git a/src/components/metrics/PageviewsChart.tsx b/src/components/metrics/PageviewsChart.tsx
index ea9720fd..347bf155 100644
--- a/src/components/metrics/PageviewsChart.tsx
+++ b/src/components/metrics/PageviewsChart.tsx
@@ -38,7 +38,7 @@ export function PageviewsChart({ data, unit, isLoading, ...props }: PageviewsCha
         },
       ],
     };
-  }, [data]);
+  }, [data, locale]);
 
   return (
     <BarChart
diff --git a/src/tracker/index.js b/src/tracker/index.js
index 36110537..43a51501 100644
--- a/src/tracker/index.js
+++ b/src/tracker/index.js
@@ -63,6 +63,7 @@
     title: encode(title),
     url: encode(currentUrl),
     referrer: encode(currentRef),
+    tag: tag ? tag : undefined,
   });
 
   /* Event handlers */
@@ -217,7 +218,6 @@
         ...getPayload(),
         name: obj,
         data: typeof data === 'object' ? data : undefined,
-        tag,
       });
     } else if (typeof obj === 'object') {
       return send(obj);