diff --git a/plugins/CoreHome/DataTableRowAction/RowEvolution.php b/plugins/CoreHome/DataTableRowAction/RowEvolution.php
index 05a8e9f04fac9746fa23973d91bee5e987c3c661..0a2605acf1ec533e97a8987b3c70f70108a7b7bd 100644
--- a/plugins/CoreHome/DataTableRowAction/RowEvolution.php
+++ b/plugins/CoreHome/DataTableRowAction/RowEvolution.php
@@ -167,7 +167,7 @@ class Piwik_CoreHome_DataTableRowAction_RowEvolution
 	protected function extractEvolutionReport($report)
 	{
 		$this->dataTable = $report['reportData'];
-		$this->rowLabel = $report['label'];
+		$this->rowLabel = Piwik_Common::sanitizeInputValue($report['label']);
 		$this->rowIcon = $report['logo'];
 		$this->availableMetrics = $report['metadata']['metrics'];
 		$this->dimension = $report['metadata']['dimension'];
diff --git a/plugins/CoreHome/templates/datatable.tpl b/plugins/CoreHome/templates/datatable.tpl
index b8c8711bfdfb2963ac55552d2af9b9955d0caa31..b06744621632d19616dea8ea8a2a8366a217b8df 100644
--- a/plugins/CoreHome/templates/datatable.tpl
+++ b/plugins/CoreHome/templates/datatable.tpl
@@ -8,7 +8,7 @@
 		{$arrayDataTable.message}
 	{else}
 		{if count($arrayDataTable) == 0}
-			{if $showReportDataWasPurgedMessage}
+			{if isset($showReportDataWasPurgedMessage) && $showReportDataWasPurgedMessage}
 			<div class="pk-emptyDataTable">{'CoreHome_DataForThisReportHasBeenPurged'|translate:$deleteReportsOlderThan}</div>
 			{else}
 			<div class="pk-emptyDataTable">{'CoreHome_ThereIsNoDataForThisReport'|translate}</div>
diff --git a/plugins/CoreHome/templates/datatable_rowactions.js b/plugins/CoreHome/templates/datatable_rowactions.js
index 492983865938c0bfaecd77af7ab02e87a7e2daba..240c88f5e26807bc28da707aeafb9fb75f84181f 100644
--- a/plugins/CoreHome/templates/datatable_rowactions.js
+++ b/plugins/CoreHome/templates/datatable_rowactions.js
@@ -230,7 +230,8 @@ DataTable_RowActions_RowEvolution.prototype.showRowEvolution = function(tr, labe
 		date: request.data.date,
 		idSite: request.data.idSite,
 		period: request.data.period,
-		label: requestLabel
+		label: requestLabel,
+		segment: request.data.segment
 	};
 
 	if (metric) {
diff --git a/plugins/CoreHome/templates/popover_rowevolution.tpl b/plugins/CoreHome/templates/popover_rowevolution.tpl
index 9182e855a98be77a03dd133770edb5ae9fc2cbcc..c3f6599ca4e38bef032bd1099aab278d38ee3aa6 100644
--- a/plugins/CoreHome/templates/popover_rowevolution.tpl
+++ b/plugins/CoreHome/templates/popover_rowevolution.tpl
@@ -1,10 +1,10 @@
 <div class="rowevolution">
-	<div class="popover-title">{$popoverTitle|escape}</div>
+	<div class="popover-title">{$popoverTitle}</div>
 	<div class="graph">
 		{$graph}
 	</div>
 	<div class="metrics-container">
-		<h2>{$availableMetricsText|escape}</h2>
+		<h2>{$availableMetricsText}</h2>
 		<div class="rowevolution-documentation">
 			{'RowEvolution_Documentation'|translate}
 		</div>
diff --git a/plugins/Dashboard/templates/dashboardObject.js b/plugins/Dashboard/templates/dashboardObject.js
index d890885a17625d511153f111552e75f33fbe208d..370cbc531be277ac62f8c369cd964949003c53d5 100644
--- a/plugins/Dashboard/templates/dashboardObject.js
+++ b/plugins/Dashboard/templates/dashboardObject.js
@@ -86,12 +86,12 @@
          */
         loadDashboard: function(dashboardIdToLoad) {
 
+        	fetchLayout(generateLayout);
             $(dashboardElement).empty();
             dashboardName   = '';
             dashboardLayout = null;
             dashboardId     = dashboardIdToLoad;
             piwikHelper.showAjaxLoading();
-            fetchLayout(generateLayout);
             buildMenu();
             return this;
         },
@@ -444,7 +444,7 @@
             },
             error: piwikHelper.ajaxHandleError
         };
-        $.ajax(ajaxRequest);
+        piwikHelper.queueAjaxRequest( $.ajax(ajaxRequest) );
     }
 
     /**
@@ -461,6 +461,10 @@
             var items = $('[widgetId]', this);
             for (var j=0; j<items.size(); j++) {
                 columns[columnNumber][j] = $(items[j]).dashboardWidget('getWidgetObject');
+                
+                // Do not store segment in the dashboard layout
+                delete columns[columnNumber][j].parameters.segment;
+                
             }
             columnNumber++;
         });