Fixes #2667

 * Stop aggregating visits for Custom variables of scope "page"
  * still OK for scope "visit" since there is supposed to be one custom var value per custom variable name for a given visit
 * Now we always display the Actions columns so that these rows with no visit still show the number of Actions
 * cleaned up from custom var output report, removed some "price_viewed" column left out

UI Change (future FAQ maybe...)
 * When there is a "Visits" column for the Custom Variable report with a value of "-" (hyphen) then it means this custom variable was used with scope=page. 

Fixes #2662
 * Added integration tests testing getPageUrl with multiple periods and websites 
 * fixed a bug when idSite=all or 1,2,3

git-svn-id: http://dev.piwik.org/svn/trunk@5235 59fd770c-687e-43c8-a1e3-f5a4ff64c105

97 files changed, 2389 insertions, 334 deletions

diff --git a/core/ArchiveProcessing/Day.php b/core/ArchiveProcessing/Day.php
index 02e3064fcb..00961cc8e8 100644
--- a/core/ArchiveProcessing/Day.php
+++ b/core/ArchiveProcessing/Day.php
@@ -536,15 +536,19 @@ class Piwik_ArchiveProcessing_Day extends Piwik_ArchiveProcessing
 	 *
 	 * @return array
 	 */
-	public function getNewInterestRow($onlyMetricsAvailableInActionsTable = false)
+	public function getNewInterestRow($onlyMetricsAvailableInActionsTable = false, $doNotSumVisits = false)
 	{
 		if($onlyMetricsAvailableInActionsTable)
 		{
-			return array(	Piwik_Archive::INDEX_NB_UNIQ_VISITORS 	=> 0,
+			if($doNotSumVisits)
+			{
+					return array(Piwik_Archive::INDEX_NB_ACTIONS => 0 );
+			}
+			return array(	
+					Piwik_Archive::INDEX_NB_UNIQ_VISITORS 	=> 0,
 					Piwik_Archive::INDEX_NB_VISITS 			=> 0,
 					Piwik_Archive::INDEX_NB_ACTIONS 		=> 0 );
 		}
-		
 		return array(	Piwik_Archive::INDEX_NB_UNIQ_VISITORS 	=> 0,
 						Piwik_Archive::INDEX_NB_VISITS 			=> 0,
 						Piwik_Archive::INDEX_NB_ACTIONS 		=> 0,
@@ -552,7 +556,7 @@ class Piwik_ArchiveProcessing_Day extends Piwik_ArchiveProcessing
 						Piwik_Archive::INDEX_SUM_VISIT_LENGTH 	=> 0,
 						Piwik_Archive::INDEX_BOUNCE_COUNT 		=> 0,
 						Piwik_Archive::INDEX_NB_VISITS_CONVERTED=> 0,
-						);
+		);
 	}
 	
 	
@@ -581,15 +585,18 @@ class Piwik_ArchiveProcessing_Day extends Piwik_ArchiveProcessing
 	 * @param array $newRowToAdd
 	 * @param array $oldRowToUpdate
 	 */
-	public function updateInterestStats( $newRowToAdd, &$oldRowToUpdate, $onlyMetricsAvailableInActionsTable = false)
+	public function updateInterestStats( $newRowToAdd, &$oldRowToUpdate, $onlyMetricsAvailableInActionsTable = false, $doNotSumVisits = false)
 	{
 		// Pre 1.2 format: string indexed rows are returned from the DB
 		// Left here for Backward compatibility with plugins doing custom SQL queries using these metrics as string
 		if(!isset($newRowToAdd[Piwik_Archive::INDEX_NB_VISITS]))
 		{
-    		$oldRowToUpdate[Piwik_Archive::INDEX_NB_UNIQ_VISITORS]		+= $newRowToAdd['nb_uniq_visitors'];
-    		$oldRowToUpdate[Piwik_Archive::INDEX_NB_VISITS] 			+= $newRowToAdd['nb_visits'];
-    		$oldRowToUpdate[Piwik_Archive::INDEX_NB_ACTIONS] 			+= $newRowToAdd['nb_actions'];
+			if(!$doNotSumVisits)
+			{
+	    		$oldRowToUpdate[Piwik_Archive::INDEX_NB_UNIQ_VISITORS]		+= $newRowToAdd['nb_uniq_visitors'];
+	    		$oldRowToUpdate[Piwik_Archive::INDEX_NB_VISITS] 			+= $newRowToAdd['nb_visits'];
+			}
+			$oldRowToUpdate[Piwik_Archive::INDEX_NB_ACTIONS] 			+= $newRowToAdd['nb_actions'];
     		if($onlyMetricsAvailableInActionsTable)
     		{
     			return;
@@ -600,16 +607,17 @@ class Piwik_ArchiveProcessing_Day extends Piwik_ArchiveProcessing
     		$oldRowToUpdate[Piwik_Archive::INDEX_NB_VISITS_CONVERTED] 	+= $newRowToAdd['nb_visits_converted'];
     		return;
 		}
-		
-		$oldRowToUpdate[Piwik_Archive::INDEX_NB_UNIQ_VISITORS]		+= $newRowToAdd[Piwik_Archive::INDEX_NB_UNIQ_VISITORS];
-		$oldRowToUpdate[Piwik_Archive::INDEX_NB_VISITS] 			+= $newRowToAdd[Piwik_Archive::INDEX_NB_VISITS];
+		if(!$doNotSumVisits)
+		{
+			$oldRowToUpdate[Piwik_Archive::INDEX_NB_UNIQ_VISITORS]		+= $newRowToAdd[Piwik_Archive::INDEX_NB_UNIQ_VISITORS];
+			$oldRowToUpdate[Piwik_Archive::INDEX_NB_VISITS] 			+= $newRowToAdd[Piwik_Archive::INDEX_NB_VISITS];
+		}
 		$oldRowToUpdate[Piwik_Archive::INDEX_NB_ACTIONS] 			+= $newRowToAdd[Piwik_Archive::INDEX_NB_ACTIONS];
 		
 		// Hack for Price tracking on Ecommerce product/category pages
 		// The price is not summed, but AVG is taken in the SQL query 
 		$index = Piwik_Archive::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED;
-		if(isset($newRowToAdd[$index])
-			&& !empty($newRowToAdd[$index]))
+		if(!empty($newRowToAdd[$index]))
 		{
 			$oldRowToUpdate[$index] = (float)$newRowToAdd[$index];
 		}
diff --git a/core/DataTable/Filter/AddColumnsProcessedMetrics.php b/core/DataTable/Filter/AddColumnsProcessedMetrics.php
index 4b7b99b1cb..a101c649d7 100644
--- a/core/DataTable/Filter/AddColumnsProcessedMetrics.php
+++ b/core/DataTable/Filter/AddColumnsProcessedMetrics.php
@@ -38,7 +38,9 @@ class Piwik_DataTable_Filter_AddColumnsProcessedMetrics extends Piwik_DataTable_
 		foreach($table->getRows() as $key => $row)
 		{
 			$nbVisits = $this->getColumn($row, Piwik_Archive::INDEX_NB_VISITS);
+			$nbActions = $this->getColumn($row, Piwik_Archive::INDEX_NB_ACTIONS);
 			if($nbVisits == 0
+				&& $nbActions == 0
 				&& $this->deleteRowsWithNoVisit)
 			{
 				// case of keyword/website/campaign with a conversion for this day, 
@@ -48,7 +50,7 @@ class Piwik_DataTable_Filter_AddColumnsProcessedMetrics extends Piwik_DataTable_
 			}
 			
 			$nbVisitsConverted = (int)$this->getColumn($row, Piwik_Archive::INDEX_NB_VISITS_CONVERTED);
-			if($nbVisitsConverted != 0)
+			if($nbVisitsConverted > 0)
 			{
 				$conversionRate = round(100 * $nbVisitsConverted / $nbVisits, $this->roundPrecision);
 				$row->addColumn('conversion_rate', $conversionRate."%");
@@ -63,7 +65,7 @@ class Piwik_DataTable_Filter_AddColumnsProcessedMetrics extends Piwik_DataTable_
 				// nb_actions / nb_visits => Actions/visit
 				// sum_visit_length / nb_visits => Avg. Time on Site 
 				// bounce_count / nb_visits => Bounce Rate
-				$actionsPerVisit = round($this->getColumn($row, Piwik_Archive::INDEX_NB_ACTIONS) / $nbVisits, $this->roundPrecision);
+				$actionsPerVisit = round($nbActions / $nbVisits, $this->roundPrecision);
 				$averageTimeOnSite = round($this->getColumn($row, Piwik_Archive::INDEX_SUM_VISIT_LENGTH) / $nbVisits, $rounding = 0);
 				$bounceRate = round(100 * $this->getColumn($row, Piwik_Archive::INDEX_BOUNCE_COUNT) / $nbVisits, $this->roundPrecision);
 			}
diff --git a/core/ViewDataTable/HtmlTable/AllColumns.php b/core/ViewDataTable/HtmlTable/AllColumns.php
index 3c1ea0a846..e025e5561a 100644
--- a/core/ViewDataTable/HtmlTable/AllColumns.php
+++ b/core/ViewDataTable/HtmlTable/AllColumns.php
@@ -53,6 +53,7 @@ class Piwik_ViewDataTable_HtmlTable_AllColumns extends Piwik_ViewDataTable_HtmlT
 		$this->setColumnsToDisplay(array('label', 
 										'nb_visits', 
 										$columnUniqueVisitors, 
+										'nb_actions',
 										'nb_actions_per_visit', 
 										'avg_time_on_site', 
 										'bounce_rate',
diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php
index d028b4026d..ed76c4c504 100644
--- a/plugins/Actions/API.php
+++ b/plugins/Actions/API.php
@@ -129,7 +129,11 @@ class Piwik_Actions_API
     		else
     		{
 				$idSite = $callBackParameters[1];
-    			$searchedString = Piwik_Tracker_Action::excludeQueryParametersFromUrl($search, $idSite);
+				try {
+					$searchedString = Piwik_Tracker_Action::excludeQueryParametersFromUrl($search, $idSite);
+				} catch(Exception $e) {
+					$searchedString = $search;
+				}
     		}
 			$searchTree = Piwik_Actions::getActionExplodedNames($searchedString, $actionType);
 		}
@@ -146,6 +150,7 @@ class Piwik_Actions_API
 				// if an array occurs inside the nested table, we only look for the first match (see below)
 				$newTableArray = new Piwik_DataTable_Array;
 				$newTableArray->metadata = $table->metadata;
+				$newTableArray->setKeyName($table->getKeyName());
 				
 				foreach ($table->getArray() as $label => $subTable)
 				{
diff --git a/plugins/CustomVariables/API.php b/plugins/CustomVariables/API.php
index c879ef3c1a..8f425df320 100644
--- a/plugins/CustomVariables/API.php
+++ b/plugins/CustomVariables/API.php
@@ -77,15 +77,24 @@ class Piwik_CustomVariables_API
 	/**
 	 * @return Piwik_DataTable
 	 */
-	public function getCustomVariablesValuesFromNameId($idSite, $period, $date, $idSubtable, $segment = false)
+	public function getCustomVariablesValuesFromNameId($idSite, $period, $date, $idSubtable, $segment = false, $_leavePriceViewedColumn = false)
 	{
 	    $dataTable = $this->getDataTable($idSite, $period, $date, $segment, $expanded = false, $idSubtable);
 	    
-	    // Hack Ecommerce product price tracking to display correctly
-	    $dataTable->renameColumn('price_viewed', 'price');
-    	$dataTable->queueFilter('ColumnCallbackReplace', 
-    		array('label', create_function('$label', 'return $label == Piwik_CustomVariables::LABEL_CUSTOM_VALUE_NOT_DEFINED ? "'. Piwik_Translate( 'General_NotDefined', Piwik_Translate('CustomVariables_ColumnCustomVariableValue')) .'" : $label;')));
 	    
+    	if(!$_leavePriceViewedColumn)
+    	{
+    		$dataTable->deleteColumn('price_viewed');
+    	}
+    	else
+    	{
+		    // Hack Ecommerce product price tracking to display correctly
+		    $dataTable->renameColumn('price_viewed', 'price');
+    	}
+    	$dataTable->queueFilter('ColumnCallbackReplace', array('label', create_function('$label', '
+    					return $label == Piwik_CustomVariables::LABEL_CUSTOM_VALUE_NOT_DEFINED 
+    						? "'. Piwik_Translate( 'General_NotDefined', Piwik_Translate('CustomVariables_ColumnCustomVariableValue')) .'" 
+    						: $label;')));
 		return $dataTable;
 	}
 }
diff --git a/plugins/CustomVariables/Controller.php b/plugins/CustomVariables/Controller.php
index c12b7df640..83f206ae02 100644
--- a/plugins/CustomVariables/Controller.php
+++ b/plugins/CustomVariables/Controller.php
@@ -32,7 +32,7 @@ class Piwik_CustomVariables_Controller extends Piwik_Controller
 		$this->setPeriodVariablesView($view);
 		$view->enableShowGoals();
 		
-		$view->setColumnsToDisplay( array('label','nb_visits') );
+		$view->setColumnsToDisplay( array('label','nb_visits', 'nb_actions') );
 		$view->setColumnTranslation('label', Piwik_Translate('CustomVariables_ColumnCustomVariableName'));
 		$view->setSortedColumn( 'nb_visits'	 );
 		$view->setLimit( 10 );
@@ -46,8 +46,9 @@ class Piwik_CustomVariables_Controller extends Piwik_Controller
 		$view->init( $this->pluginName, __FUNCTION__, 'CustomVariables.getCustomVariablesValuesFromNameId' );
 
 		$view->disableSearchBox();
+		$view->enableShowGoals();
 		$view->disableExcludeLowPopulation();
-		$view->setColumnsToDisplay( array('label','nb_visits') );
+		$view->setColumnsToDisplay( array('label','nb_visits', 'nb_actions') );
 		$view->setColumnTranslation('label', Piwik_Translate('CustomVariables_ColumnCustomVariableValue'));
 
 		return $this->renderView($view, $fetch);
diff --git a/plugins/CustomVariables/CustomVariables.php b/plugins/CustomVariables/CustomVariables.php
index 1ae0e29fea..dc83830216 100644
--- a/plugins/CustomVariables/CustomVariables.php
+++ b/plugins/CustomVariables/CustomVariables.php
@@ -198,6 +198,12 @@ class Piwik_CustomVariables extends Piwik_Plugin
 								
 				$label = $row[$valueField];
 				
+				// Remove price tracked if it's zero or we if we are not currently tracking an ecommerce var
+				if(!in_array($row[$keyField], array('_pks', '_pkn', '_pkc')))
+				{
+					unset($row[Piwik_Archive::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED]);
+				}
+				
 				// when custom variable value is a JSON array of categories
 				// possibly JSON value
 				$mustInsertCustomVariableValue = true;
@@ -234,12 +240,16 @@ class Piwik_CustomVariables extends Piwik_Plugin
 					$archiveProcessing->updateInterestStats( $row, $this->interestByCustomVariablesAndValue[$row[$keyField]][$row[$valueField]], $onlyMetricsAvailableInActionsTable);
 				}
 				
-				// Hack: when tracking Ecommerce product page view, we do not wish 
-				// to track the "price" in the Custom Variable name report, only in the values report
+				// Do not report on Price viewed for the Custom Variable names 
 				unset($row[Piwik_Archive::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED]);
 				
-				if(!isset($this->interestByCustomVariables[$row[$keyField]])) $this->interestByCustomVariables[$row[$keyField]]= $archiveProcessing->getNewInterestRow($onlyMetricsAvailableInActionsTable);
-				$archiveProcessing->updateInterestStats( $row, $this->interestByCustomVariables[$row[$keyField]], $onlyMetricsAvailableInActionsTable);
+				// When tracking Custom Variables with scope=page we do not add up visits numbers
+				// as it is incorrect to sum visits this way
+				// for scope=visit this is allowed, since there is supposed to be one custom var value per custom variable name for a given visit
+				$doNotSumVisits = true;
+
+				if(!isset($this->interestByCustomVariables[$row[$keyField]])) $this->interestByCustomVariables[$row[$keyField]]= $archiveProcessing->getNewInterestRow($onlyMetricsAvailableInActionsTable, $doNotSumVisits);
+				$archiveProcessing->updateInterestStats( $row, $this->interestByCustomVariables[$row[$keyField]], $onlyMetricsAvailableInActionsTable, $doNotSumVisits);
 			}
 			 
 			// Custom Vars names and values metrics for Goals
diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php
index 88acb3b2f9..0ce4212a13 100644
--- a/plugins/Goals/API.php
+++ b/plugins/Goals/API.php
@@ -295,7 +295,7 @@ class Piwik_Goals_API
 	
 	protected function enrichItemsDataTableWithItemsViewMetrics($dataTable, $idSite, $period, $date, $idSubtable)
 	{
-		$ecommerceViews = Piwik_CustomVariables_API::getInstance()->getCustomVariablesValuesFromNameId($idSite, $period, $date, $idSubtable);
+		$ecommerceViews = Piwik_CustomVariables_API::getInstance()->getCustomVariablesValuesFromNameId($idSite, $period, $date, $idSubtable, $segment = false, $_leavePriceViewedColumn = true);
 	
 		// For Product names and SKU reports, and for Category report 
 		// Use the Price (tracked on page views) 
diff --git a/tests/integration/Integration.php b/tests/integration/Integration.php
index d72cbeddca..a7e79f3b80 100644
--- a/tests/integration/Integration.php
+++ b/tests/integration/Integration.php
@@ -364,10 +364,10 @@ abstract class Test_Integration extends Test_Database
 			// Used in Actions.getPageUrl, .getDownload, etc.
 			// tied to Main.test.php doTest_oneVisitorTwoVisits
 			// will need refactoring when these same API functions are tested in a new function
-			'downloadUrl' 	=> 'http://piwik.org/path/again/latest.zip?phpsessid=this is ignored when searching',
-			'outlinkUrl' 	=> 'http://dev.piwik.org/svn',
-			'pageUrl' 		=> 'http://example.org/index.htm?sessionid=this is also ignored by default',
-			'pageName' 		=> ' Checkout / Purchasing... ',
+			'downloadUrl' 	=> urlencode('http://piwik.org/path/again/latest.zip?phpsessid=this is ignored when searching'),
+			'outlinkUrl' 	=> urlencode('http://dev.piwik.org/svn'),
+			'pageUrl' 		=> urlencode('http://example.org/index.htm?sessionid=this is also ignored by default'),
+			'pageName' 		=> urlencode(' Checkout / Purchasing... '),
 		
 			// do not show the millisec timer in response or tests would always fail as value is changing
 			'showTimer'     => 0,
@@ -396,7 +396,7 @@ abstract class Test_Integration extends Test_Database
 		{
 			$parametersToSet['idGoal'] = $idGoal;
 		}
-		// Give it enough time for the current API test to finish (call all get* APIs)
+		
 		Zend_Registry::get('config')->General->time_before_today_archive_considered_outdated = 10;
 		
 		$requestUrls = $this->generateUrlsApi($parametersToSet, $formats, $periods, $setDateLastN, $language, $segment);
diff --git a/tests/integration/Main.test.php b/tests/integration/Main.test.php
index fabbc84a50..5e93edf495 100644
--- a/tests/integration/Main.test.php
+++ b/tests/integration/Main.test.php
@@ -399,7 +399,7 @@ class Test_Piwik_Integration_Main extends Test_Integration
 		// test with excluded IP
 		$t->setUserAgent('Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.9.2.6) Gecko/20100625 Firefox/3.6.6 (.NET CLR 3.5.30729)'); // restore normal user agent	
 		$excludedIp = '154.1.12.34';
-		Piwik_SitesManager_API::getInstance()->updateSite($idSite, 'new site name', $url=array('http://site.com'), $ecommerce = 0, $excludedIp . ',1.2.3.4');
+		Piwik_SitesManager_API::getInstance()->updateSite($idSite, 'new site name', $url=array('http://site.com'),$ecommerce = 0, $excludedIp . ',1.2.3.4');
 		$t->setIp($excludedIp);
 		$this->checkResponse($t->doTrackPageView('visit from IP excluded'));
 		
@@ -474,7 +474,7 @@ class Test_Piwik_Integration_Main extends Test_Integration
     	
     	// Testing URL excluded parameters
     	$parameterToExclude = 'excluded_parameter';
-    	Piwik_SitesManager_API::getInstance()->updateSite($idSite, 'new name', $url=array('http://site.com'), $ecommerce = 0, null, $parameterToExclude . ',anotherParameter');
+    	Piwik_SitesManager_API::getInstance()->updateSite($idSite, 'new name', $url=array('http://site.com'),$ecommerce = 0, $excludedIps = null, $parameterToExclude . ',anotherParameter');
 
     	// Record 1st page view
     	$urlPage1 = 'http://example.org/index.htm?excluded_Parameter=SHOULD_NOT_DISPLAY&parameter=Should display';
@@ -550,14 +550,17 @@ class Test_Piwik_Integration_Main extends Test_Integration
 							'Referers.getWebsites',
 							'Actions.getPageUrls',
 							'Actions.getPageTitles',
-							'Actions.getOutlinks');
+							'Actions.getOutlinks',
+							'Actions.getPageTitle',
+							'Actions.getPageUrl'
+		);
     	$this->setApiToCall($apiToCall);
     	// -
     	// First visitor on Idsite 1: two page views
     	$datetimeSpanOverTwoDays = '2010-01-03 23:55:00'; 
         $visitorA = $this->getTracker($idSite, $datetimeSpanOverTwoDays, $defaultInit = true);
         $visitorA->setUrlReferrer( 'http://referer.com/page.htm?param=valuewith some spaces');
-        $visitorA->setUrl('http://example.org/homepage');
+        $visitorA->setUrl('http://example.org/index.htm');
         $this->checkResponse($visitorA->doTrackPageView('first page view'));
     	$visitorA->setForceVisitDateTime(Piwik_Date::factory($datetimeSpanOverTwoDays)->addHour(0.1)->getDatetime());
     	// Testing with empty URL and empty page title
@@ -583,7 +586,7 @@ class Test_Piwik_Integration_Main extends Test_Integration
         $visitorB->DEBUG_APPEND_URL = '&_idvc=2';
 
     	$visitorB->setUrlReferrer( 'http://referer.com/Other_Page.htm' );
-    	$visitorB->setUrl('http://example.org/homepage');
+    	$visitorB->setUrl('http://example.org/index.htm');
     	$this->checkResponse($visitorB->doTrackPageView('second visitor/two days later/a new visit'));
     	// Second page view 6 minutes later
     	$visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(48)->addHour(0.1)->getDatetime());
@@ -596,6 +599,10 @@ class Test_Piwik_Integration_Main extends Test_Integration
     	$visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(48)->addHour(0.25)->getDatetime());
     	$this->checkResponse($visitorB->doTrackAction('mailto:test@example.org/strangelink', 'link'));
     	
+    	// Actions.getPageTitle tested with this title
+    	$visitorB->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(48)->addHour(0.25)->getDatetime());
+    	$this->checkResponse($visitorB->doTrackPageView('Checkout / Purchasing...'));
+    	
     	// -
     	// First visitor on Idsite 2: one page view, with Website referer
         $visitorAsite2 = $this->getTracker($idSite2, Piwik_Date::factory($dateTime)->addHour(24)->getDatetime(), $defaultInit = true);
@@ -611,9 +618,12 @@ class Test_Piwik_Integration_Main extends Test_Integration
 //        $this->checkResponse($t2->doTrackPageView('I\'m a returning visitor...'));
         
     	$periods = array('day', 'week', 'month', 'year');
-    	// Request data for the last 6 periods
+    	// Request data for the last 6 periods and idSite=all
         $this->callGetApiCompareOutput(__FUNCTION__, 'xml', $allSites = 'all', $dateTime, $periods, $setDateLastN = true);
         
+    	// Request data for the last 6 periods and idSite=1
+        $this->callGetApiCompareOutput(__FUNCTION__.'_idSiteOne_', 'xml', $idSite, $dateTime, array('day','month'), $setDateLastN = true);
+        
         // We also test a single period to check that this use case (Reports per idSite in the response) works
     	$this->setApiToCall(array('VisitsSummary.get', 'Goals.get'));
     	$this->callGetApiCompareOutput(__FUNCTION__ . '_NotLastNPeriods', 'xml', $allSites = 'all', $dateTime, array('day', 'month'), $setDateLastN = false);
@@ -621,6 +631,7 @@ class Test_Piwik_Integration_Main extends Test_Integration
 		// testing metadata API for multiple periods
 		$this->setApiNotToCall(array());
 		$this->setApiToCall( array('API.getProcessedReport'	) );
+		$apiToCall = array_diff($apiToCall, array('Actions.getPageTitle', 'Actions.getPageUrl'));
 		foreach($apiToCall as $api)
 		{
 			list($apiModule, $apiAction) = explode(".", $api);
@@ -664,9 +675,14 @@ class Test_Piwik_Integration_Main extends Test_Integration
         $visitorA->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.2)->getDatetime());
     	$visitorA->setUrl('http://example.org/user/profile');
     	$visitorA->setCustomVariable($id = 1, $name = 'VisitorType', $value = 'LoggedIn');
+    	$visitorA->setCustomVariable($id = 4, $name = 'Status user', $value = 'Loggedin', $scope = 'page');
+    	$visitorA->setCustomVariable($id = 5, $name = 'Status user', $value = 'looking at profile page', $scope = 'page');
         $this->checkResponse($visitorA->doTrackPageView('Profile page'));
         
     	$visitorA->setCustomVariable($id = 2, $name = 'SET WITH EMPTY VALUE', $value = '');
+    	$visitorA->setCustomVariable($id = 1, $name = 'Language', $value = 'FR', $scope = 'page');
+    	$visitorA->setCustomVariable($id = 2, $name = 'SET WITH EMPTY VALUE PAGE SCOPE', $value = '', $scope = 'page');
+    	$visitorA->setCustomVariable($id = 4, $name = 'Status user', $value = 'looking at profile page', $scope = 'page');
     	$visitorA->setCustomVariable($id = 3, $name = 'Value will be VERY long and truncated', $value = 'abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----');
         $this->checkResponse($visitorA->doTrackPageView('Profile page'));
     	$this->checkResponse($visitorA->doTrackGoal($idGoal));
@@ -755,14 +771,14 @@ class Test_Piwik_Integration_Main extends Test_Integration
         
 		$tests = array(
 	        // 1) CHECK 'day' archive stored in January
-	        // We expect 2 segments * (2 custom variable name + 2 ref metrics + 2 subtable for the custom var values + 5 Referers blob)
-			'archive_blob_2010_01' => 22,
-			// This contains all 'last N' weeks & days, (6 metrics + 2 referer metrics + 1 done flag ) * 2 segments + 1 Done flag per Plugin, for each "Last N" date
+	        // We expect 2 segments * (1 custom variable name + 2 ref metrics + 6 subtable for the custom var values + 5 Referers blob)
+			'archive_blob_2010_01' => 28,
+			// This contains all 'last N' weeks & days, (1 metrics + 2 referer metrics + 3 done flag ) * 2 segments + 1 Done flag per Plugin, for each "Last N" date
 			'archive_numeric_2010_01' => 138,
 		
 	        // 2) CHECK 'week' archive stored in December (week starts the month before)
-	        // We expect 2 segments * (2 custom variable name + 2 ref metrics + 2 subtable for the values of the name + 5 referers blob)
-			'archive_blob_2009_12' => 22,
+	        // We expect 2 segments * (1 custom variable name + 2 ref metrics + 6 subtable for the values of the name + 5 referers blob)
+			'archive_blob_2009_12' => 28,
 	        // 6 metrics, 
 	        // 2 Referer metrics (Referers_distinctSearchEngines/Referers_distinctKeywords), 
 	        // 3 done flag (referers, CustomVar, VisitsSummary), 
@@ -773,7 +789,7 @@ class Test_Piwik_Integration_Main extends Test_Integration
 		{
 	        $sql = "SELECT count(*) FROM " . Piwik_Common::prefixTable($table) ;
 	        $countBlobs = Zend_Registry::get('db')->fetchOne($sql);
-	        $this->assertEqual( $expectedRows, $countBlobs);
+	        $this->assertEqual( $expectedRows, $countBlobs, "$table: %s");
 		}
 	}
 	
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
index d8b1396f50..4427230a86 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
@@ -77,6 +77,16 @@
 				<exit_rate>0%</exit_rate>
 				<exit_nb_visits>0</exit_nb_visits>
 			</row>
+			<row>
+				<label>Checkout</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>1</nb_hits>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>00:00:00</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<entry_nb_visits>0</entry_nb_visits>
+			</row>
 		</result>
 		<result prettyDate="Wednesday 6 January 2010" />
 		<result prettyDate="Thursday 7 January 2010" />
@@ -90,6 +100,9 @@
 			<row>
 				
 			</row>
+			<row>
+				
+			</row>
 		</result>
 		<result prettyDate="Wednesday 6 January 2010" />
 		<result prettyDate="Thursday 7 January 2010" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
index d606b027c6..366349e67f 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageUrls_firstSite_lastN__API.getProcessedReport_day.xml
@@ -44,7 +44,7 @@
 	<reportData>
 		<result prettyDate="Sunday 3 January 2010">
 			<row>
-				<label>/homepage</label>
+				<label>/index.htm</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<avg_time_on_page>00:00:00</avg_time_on_page>
@@ -78,7 +78,7 @@
 		</result>
 		<result prettyDate="Tuesday 5 January 2010">
 			<row>
-				<label>/homepage</label>
+				<label>/index.htm</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<entry_nb_visits>1</entry_nb_visits>
@@ -90,12 +90,12 @@
 			<row>
 				<label>/thankyou</label>
 				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
+				<nb_hits>2</nb_hits>
+				<exit_nb_visits>1</exit_nb_visits>
 				<avg_time_on_page>00:06:00</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
-				<exit_rate>0%</exit_rate>
+				<exit_rate>100%</exit_rate>
 				<entry_nb_visits>0</entry_nb_visits>
-				<exit_nb_visits>0</exit_nb_visits>
 			</row>
 		</result>
 		<result prettyDate="Wednesday 6 January 2010" />
@@ -106,7 +106,7 @@
 	<reportMetadata>
 		<result prettyDate="Sunday 3 January 2010">
 			<row>
-				<url>http://example.org/homepage</url>
+				<url>http://example.org/index.htm</url>
 			</row>
 			<row>
 				<url>http://example.org/products</url>
@@ -119,7 +119,7 @@
 		</result>
 		<result prettyDate="Tuesday 5 January 2010">
 			<row>
-				<url>http://example.org/homepage</url>
+				<url>http://example.org/index.htm</url>
 			</row>
 			<row>
 				<url>http://example.org/thankyou</url>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml
index 40c1940495..62e81ba401 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_NotLastNPeriods__VisitsSummary.get_month.xml
@@ -2,13 +2,13 @@
 <results>
 	<result idSite="1">
 		<bounce_count>1</bounce_count>
-		<max_actions>4</max_actions>
-		<nb_actions>7</nb_actions>
+		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
 		<nb_uniq_visitors>2</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
 		<sum_visit_length>1262</sum_visit_length>
 		<bounce_rate>33%</bounce_rate>
-		<nb_actions_per_visit>2.3</nb_actions_per_visit>
+		<nb_actions_per_visit>2.7</nb_actions_per_visit>
 		<avg_time_on_site>421</avg_time_on_site>
 	</result>
 	<result idSite="2">
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
index 45f57b1ef7..1815473139 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
@@ -76,8 +76,8 @@
 				<label>referer.com</label>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
-				<nb_actions>4</nb_actions>
-				<nb_actions_per_visit>4</nb_actions_per_visit>
+				<nb_actions>5</nb_actions>
+				<nb_actions_per_visit>5</nb_actions_per_visit>
 				<avg_time_on_site>00:15:01</avg_time_on_site>
 				<bounce_rate>0%</bounce_rate>
 				<revenue>$ 0</revenue>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml
index e085e5353a..a199813f7b 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitFrequency.get_firstSite_lastN__API.getProcessedReport_day.xml
@@ -43,10 +43,10 @@
 		<result prettyDate="Sunday 3 January 2010" />
 		<result prettyDate="Monday 4 January 2010" />
 		<result prettyDate="Tuesday 5 January 2010">
-			<nb_actions_returning>4</nb_actions_returning>
+			<nb_actions_returning>5</nb_actions_returning>
 			<nb_visits_returning>1</nb_visits_returning>
 			<bounce_rate_returning>0%</bounce_rate_returning>
-			<nb_actions_per_visit_returning>4</nb_actions_per_visit_returning>
+			<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
 			<avg_time_on_site_returning>00:15:01</avg_time_on_site_returning>
 		</result>
 		<result prettyDate="Wednesday 6 January 2010" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml
index 997a8b0b7d..40975802ab 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml
@@ -63,12 +63,12 @@
 			<avg_time_on_site>00:06:01</avg_time_on_site>
 		</result>
 		<result prettyDate="Tuesday 5 January 2010">
-			<max_actions>4</max_actions>
-			<nb_actions>4</nb_actions>
+			<max_actions>5</max_actions>
+			<nb_actions>5</nb_actions>
 			<nb_uniq_visitors>1</nb_uniq_visitors>
 			<nb_visits>1</nb_visits>
 			<bounce_rate>0%</bounce_rate>
-			<nb_actions_per_visit>4</nb_actions_per_visit>
+			<nb_actions_per_visit>5</nb_actions_per_visit>
 			<avg_time_on_site>00:15:01</avg_time_on_site>
 		</result>
 		<result prettyDate="Wednesday 6 January 2010" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_day.xml
index 3ae15d19fe..639d0bbb37 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_day.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_day.xml
@@ -17,7 +17,6 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<exit_nb_visits>1</exit_nb_visits>
 				<subtable>
 					<row>
 						<label>/strangelink</label>
@@ -25,8 +24,6 @@
 						<nb_uniq_visitors>1</nb_uniq_visitors>
 						<nb_hits>1</nb_hits>
 						<sum_time_spent>0</sum_time_spent>
-						<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
-						<exit_nb_visits>1</exit_nb_visits>
 						<url>mailto:test@example.org/strangelink</url>
 					</row>
 				</subtable>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_month.xml
index 81af46ca4d..36207de586 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_month.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_month.xml
@@ -15,16 +15,13 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<exit_nb_visits>1</exit_nb_visits>
 				<subtable>
 					<row>
 						<label>/strangelink</label>
 						<nb_visits>1</nb_visits>
 						<nb_hits>1</nb_hits>
 						<sum_time_spent>0</sum_time_spent>
-						<exit_nb_visits>1</exit_nb_visits>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 						<url>mailto:test@example.org/strangelink</url>
 					</row>
 				</subtable>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_week.xml
index 0423744ff2..20c8c95a37 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_week.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_week.xml
@@ -16,16 +16,13 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<exit_nb_visits>1</exit_nb_visits>
 				<subtable>
 					<row>
 						<label>/strangelink</label>
 						<nb_visits>1</nb_visits>
 						<nb_hits>1</nb_hits>
 						<sum_time_spent>0</sum_time_spent>
-						<exit_nb_visits>1</exit_nb_visits>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 						<url>mailto:test@example.org/strangelink</url>
 					</row>
 				</subtable>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_year.xml
index aba3c0a521..c6c429ab92 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_year.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getOutlinks_year.xml
@@ -15,16 +15,13 @@
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
-				<exit_nb_visits>1</exit_nb_visits>
 				<subtable>
 					<row>
 						<label>/strangelink</label>
 						<nb_visits>1</nb_visits>
 						<nb_hits>1</nb_hits>
 						<sum_time_spent>0</sum_time_spent>
-						<exit_nb_visits>1</exit_nb_visits>
 						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
-						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 						<url>mailto:test@example.org/strangelink</url>
 					</row>
 				</subtable>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_day.xml
new file mode 100644
index 0000000000..01e4fb8c20
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_day.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result idSite="1">
+		<row>
+			<label> Purchasing...</label>
+			<nb_visits>1</nb_visits>
+			<nb_uniq_visitors>1</nb_uniq_visitors>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
+			<exit_nb_visits>1</exit_nb_visits>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>100%</exit_rate>
+		</row>
+	</result>
+	<result idSite="2" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_month.xml
new file mode 100644
index 0000000000..a41e4a2bb4
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_month.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result idSite="1">
+		<row>
+			<label> Purchasing...</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>100%</exit_rate>
+		</row>
+	</result>
+	<result idSite="2" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_week.xml
new file mode 100644
index 0000000000..a41e4a2bb4
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_week.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result idSite="1">
+		<row>
+			<label> Purchasing...</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>100%</exit_rate>
+		</row>
+	</result>
+	<result idSite="2" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_year.xml
new file mode 100644
index 0000000000..a41e4a2bb4
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitle_year.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result idSite="1">
+		<row>
+			<label> Purchasing...</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>100%</exit_rate>
+		</row>
+	</result>
+	<result idSite="2" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml
index ac2d573ffb..b9a446f324 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml
@@ -39,7 +39,7 @@
 				<nb_hits>2</nb_hits>
 				<sum_time_spent>720</sum_time_spent>
 				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>4</entry_nb_actions>
+				<entry_nb_actions>5</entry_nb_actions>
 				<entry_sum_visit_length>901</entry_sum_visit_length>
 				<entry_bounce_count>0</entry_bounce_count>
 				<avg_time_on_page>360</avg_time_on_page>
@@ -52,7 +52,7 @@
 						<nb_hits>2</nb_hits>
 						<sum_time_spent>720</sum_time_spent>
 						<entry_nb_visits>1</entry_nb_visits>
-						<entry_nb_actions>4</entry_nb_actions>
+						<entry_nb_actions>5</entry_nb_actions>
 						<entry_sum_visit_length>901</entry_sum_visit_length>
 						<entry_bounce_count>0</entry_bounce_count>
 						<avg_time_on_page>360</avg_time_on_page>
@@ -67,7 +67,7 @@
 								<sum_time_spent>360</sum_time_spent>
 								<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
 								<entry_nb_visits>1</entry_nb_visits>
-								<entry_nb_actions>4</entry_nb_actions>
+								<entry_nb_actions>5</entry_nb_actions>
 								<entry_sum_visit_length>901</entry_sum_visit_length>
 								<entry_bounce_count>0</entry_bounce_count>
 								<avg_time_on_page>360</avg_time_on_page>
@@ -88,6 +88,30 @@
 					</row>
 				</subtable>
 			</row>
+			<row>
+				<label>Checkout</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<subtable>
+					<row>
+						<label> Purchasing...</label>
+						<nb_visits>1</nb_visits>
+						<nb_uniq_visitors>1</nb_uniq_visitors>
+						<nb_hits>1</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
+						<exit_nb_visits>1</exit_nb_visits>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>0%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+					</row>
+				</subtable>
+			</row>
 		</result>
 		<result date="2010-01-06" />
 		<result date="2010-01-07" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml
index 56cf340c9c..e25bd4e74f 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml
@@ -25,7 +25,7 @@
 				<nb_hits>2</nb_hits>
 				<sum_time_spent>720</sum_time_spent>
 				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>4</entry_nb_actions>
+				<entry_nb_actions>5</entry_nb_actions>
 				<entry_sum_visit_length>901</entry_sum_visit_length>
 				<entry_bounce_count>0</entry_bounce_count>
 				<avg_time_on_page>360</avg_time_on_page>
@@ -38,7 +38,7 @@
 						<nb_hits>2</nb_hits>
 						<sum_time_spent>720</sum_time_spent>
 						<entry_nb_visits>1</entry_nb_visits>
-						<entry_nb_actions>4</entry_nb_actions>
+						<entry_nb_actions>5</entry_nb_actions>
 						<entry_sum_visit_length>901</entry_sum_visit_length>
 						<entry_bounce_count>0</entry_bounce_count>
 						<avg_time_on_page>360</avg_time_on_page>
@@ -51,7 +51,7 @@
 								<nb_hits>1</nb_hits>
 								<sum_time_spent>360</sum_time_spent>
 								<entry_nb_visits>1</entry_nb_visits>
-								<entry_nb_actions>4</entry_nb_actions>
+								<entry_nb_actions>5</entry_nb_actions>
 								<entry_sum_visit_length>901</entry_sum_visit_length>
 								<entry_bounce_count>0</entry_bounce_count>
 								<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
@@ -75,6 +75,30 @@
 				</subtable>
 			</row>
 			<row>
+				<label>Checkout</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<subtable>
+					<row>
+						<label> Purchasing...</label>
+						<nb_visits>1</nb_visits>
+						<nb_hits>1</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<exit_nb_visits>1</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>0%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+					</row>
+				</subtable>
+			</row>
+			<row>
 				<label>Page Name not defined</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml
index d39b05b46e..cde6f74b45 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml
@@ -27,7 +27,7 @@
 				<nb_hits>2</nb_hits>
 				<sum_time_spent>720</sum_time_spent>
 				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>4</entry_nb_actions>
+				<entry_nb_actions>5</entry_nb_actions>
 				<entry_sum_visit_length>901</entry_sum_visit_length>
 				<entry_bounce_count>0</entry_bounce_count>
 				<avg_time_on_page>360</avg_time_on_page>
@@ -40,7 +40,7 @@
 						<nb_hits>2</nb_hits>
 						<sum_time_spent>720</sum_time_spent>
 						<entry_nb_visits>1</entry_nb_visits>
-						<entry_nb_actions>4</entry_nb_actions>
+						<entry_nb_actions>5</entry_nb_actions>
 						<entry_sum_visit_length>901</entry_sum_visit_length>
 						<entry_bounce_count>0</entry_bounce_count>
 						<avg_time_on_page>360</avg_time_on_page>
@@ -53,7 +53,7 @@
 								<nb_hits>1</nb_hits>
 								<sum_time_spent>360</sum_time_spent>
 								<entry_nb_visits>1</entry_nb_visits>
-								<entry_nb_actions>4</entry_nb_actions>
+								<entry_nb_actions>5</entry_nb_actions>
 								<entry_sum_visit_length>901</entry_sum_visit_length>
 								<entry_bounce_count>0</entry_bounce_count>
 								<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
@@ -77,6 +77,30 @@
 				</subtable>
 			</row>
 			<row>
+				<label>Checkout</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<subtable>
+					<row>
+						<label> Purchasing...</label>
+						<nb_visits>1</nb_visits>
+						<nb_hits>1</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<exit_nb_visits>1</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>0%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+					</row>
+				</subtable>
+			</row>
+			<row>
 				<label>Page Name not defined</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml
index 35c34cd3e6..e19a7859b2 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml
@@ -25,7 +25,7 @@
 				<nb_hits>2</nb_hits>
 				<sum_time_spent>720</sum_time_spent>
 				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>4</entry_nb_actions>
+				<entry_nb_actions>5</entry_nb_actions>
 				<entry_sum_visit_length>901</entry_sum_visit_length>
 				<entry_bounce_count>0</entry_bounce_count>
 				<avg_time_on_page>360</avg_time_on_page>
@@ -38,7 +38,7 @@
 						<nb_hits>2</nb_hits>
 						<sum_time_spent>720</sum_time_spent>
 						<entry_nb_visits>1</entry_nb_visits>
-						<entry_nb_actions>4</entry_nb_actions>
+						<entry_nb_actions>5</entry_nb_actions>
 						<entry_sum_visit_length>901</entry_sum_visit_length>
 						<entry_bounce_count>0</entry_bounce_count>
 						<avg_time_on_page>360</avg_time_on_page>
@@ -51,7 +51,7 @@
 								<nb_hits>1</nb_hits>
 								<sum_time_spent>360</sum_time_spent>
 								<entry_nb_visits>1</entry_nb_visits>
-								<entry_nb_actions>4</entry_nb_actions>
+								<entry_nb_actions>5</entry_nb_actions>
 								<entry_sum_visit_length>901</entry_sum_visit_length>
 								<entry_bounce_count>0</entry_bounce_count>
 								<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
@@ -75,6 +75,30 @@
 				</subtable>
 			</row>
 			<row>
+				<label>Checkout</label>
+				<nb_visits>1</nb_visits>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>0</sum_time_spent>
+				<exit_nb_visits>1</exit_nb_visits>
+				<avg_time_on_page>0</avg_time_on_page>
+				<bounce_rate>0%</bounce_rate>
+				<exit_rate>100%</exit_rate>
+				<subtable>
+					<row>
+						<label> Purchasing...</label>
+						<nb_visits>1</nb_visits>
+						<nb_hits>1</nb_hits>
+						<sum_time_spent>0</sum_time_spent>
+						<exit_nb_visits>1</exit_nb_visits>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+						<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+						<avg_time_on_page>0</avg_time_on_page>
+						<bounce_rate>0%</bounce_rate>
+						<exit_rate>100%</exit_rate>
+					</row>
+				</subtable>
+			</row>
+			<row>
 				<label>Page Name not defined</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_day.xml
new file mode 100644
index 0000000000..1c7f2179e5
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_day.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result idSite="1" />
+	<result idSite="2" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_month.xml
new file mode 100644
index 0000000000..1c7f2179e5
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_month.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result idSite="1" />
+	<result idSite="2" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_week.xml
new file mode 100644
index 0000000000..1c7f2179e5
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_week.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result idSite="1" />
+	<result idSite="2" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_year.xml
new file mode 100644
index 0000000000..1c7f2179e5
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrl_year.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result idSite="1" />
+	<result idSite="2" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
index 7e7eceac76..385c391131 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
@@ -3,7 +3,7 @@
 	<result idSite="1">
 		<result date="2010-01-03">
 			<row>
-				<label>/homepage</label>
+				<label>/index.htm</label>
 				<nb_visits>1</nb_visits>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
@@ -11,7 +11,7 @@
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
-				<url>http://example.org/homepage</url>
+				<url>http://example.org/index.htm</url>
 			</row>
 			<row>
 				<label>/products</label>
@@ -47,30 +47,32 @@
 		</result>
 		<result date="2010-01-05">
 			<row>
-				<label>/homepage</label>
+				<label>/index.htm</label>
 				<nb_visits>1</nb_visits>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>360</sum_time_spent>
 				<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
 				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>4</entry_nb_actions>
+				<entry_nb_actions>5</entry_nb_actions>
 				<entry_sum_visit_length>901</entry_sum_visit_length>
 				<entry_bounce_count>0</entry_bounce_count>
 				<avg_time_on_page>360</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
-				<url>http://example.org/homepage</url>
+				<url>http://example.org/index.htm</url>
 			</row>
 			<row>
 				<label>/thankyou</label>
 				<nb_visits>1</nb_visits>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
-				<nb_hits>1</nb_hits>
+				<nb_hits>2</nb_hits>
 				<sum_time_spent>360</sum_time_spent>
+				<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
+				<exit_nb_visits>1</exit_nb_visits>
 				<avg_time_on_page>360</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
-				<exit_rate>0%</exit_rate>
+				<exit_rate>100%</exit_rate>
 				<url>http://example.org/thankyou</url>
 			</row>
 		</result>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
index 55bfe31927..676132eb44 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
@@ -3,12 +3,12 @@
 	<result idSite="1">
 		<result date="2010-01">
 			<row>
-				<label>/homepage</label>
+				<label>/index.htm</label>
 				<nb_visits>2</nb_visits>
 				<nb_hits>2</nb_hits>
 				<sum_time_spent>360</sum_time_spent>
 				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>4</entry_nb_actions>
+				<entry_nb_actions>5</entry_nb_actions>
 				<entry_sum_visit_length>901</entry_sum_visit_length>
 				<entry_bounce_count>0</entry_bounce_count>
 				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
@@ -16,7 +16,7 @@
 				<avg_time_on_page>180</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
-				<url>http://example.org/homepage</url>
+				<url>http://example.org/index.htm</url>
 			</row>
 			<row>
 				<label>/products</label>
@@ -39,12 +39,14 @@
 			<row>
 				<label>/thankyou</label>
 				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
+				<nb_hits>2</nb_hits>
 				<sum_time_spent>360</sum_time_spent>
+				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>360</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
-				<exit_rate>0%</exit_rate>
+				<exit_rate>100%</exit_rate>
 				<url>http://example.org/thankyou</url>
 			</row>
 			<row>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
index 52a01f4ff6..3a7a65f34a 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
@@ -3,7 +3,7 @@
 	<result idSite="1">
 		<result date="2009-12-28 to 2010-01-03">
 			<row>
-				<label>/homepage</label>
+				<label>/index.htm</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>0</sum_time_spent>
@@ -11,7 +11,7 @@
 				<avg_time_on_page>0</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
-				<url>http://example.org/homepage</url>
+				<url>http://example.org/index.htm</url>
 			</row>
 			<row>
 				<label>/products</label>
@@ -34,12 +34,12 @@
 		</result>
 		<result date="2010-01-04 to 2010-01-10">
 			<row>
-				<label>/homepage</label>
+				<label>/index.htm</label>
 				<nb_visits>1</nb_visits>
 				<nb_hits>1</nb_hits>
 				<sum_time_spent>360</sum_time_spent>
 				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>4</entry_nb_actions>
+				<entry_nb_actions>5</entry_nb_actions>
 				<entry_sum_visit_length>901</entry_sum_visit_length>
 				<entry_bounce_count>0</entry_bounce_count>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
@@ -47,17 +47,19 @@
 				<avg_time_on_page>360</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
-				<url>http://example.org/homepage</url>
+				<url>http://example.org/index.htm</url>
 			</row>
 			<row>
 				<label>/thankyou</label>
 				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
+				<nb_hits>2</nb_hits>
 				<sum_time_spent>360</sum_time_spent>
+				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>360</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
-				<exit_rate>0%</exit_rate>
+				<exit_rate>100%</exit_rate>
 				<url>http://example.org/thankyou</url>
 			</row>
 			<row>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
index f47782a971..e898de588d 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
@@ -3,12 +3,12 @@
 	<result idSite="1">
 		<result date="2010">
 			<row>
-				<label>/homepage</label>
+				<label>/index.htm</label>
 				<nb_visits>2</nb_visits>
 				<nb_hits>2</nb_hits>
 				<sum_time_spent>360</sum_time_spent>
 				<entry_nb_visits>1</entry_nb_visits>
-				<entry_nb_actions>4</entry_nb_actions>
+				<entry_nb_actions>5</entry_nb_actions>
 				<entry_sum_visit_length>901</entry_sum_visit_length>
 				<entry_bounce_count>0</entry_bounce_count>
 				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
@@ -16,7 +16,7 @@
 				<avg_time_on_page>180</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
 				<exit_rate>0%</exit_rate>
-				<url>http://example.org/homepage</url>
+				<url>http://example.org/index.htm</url>
 			</row>
 			<row>
 				<label>/products</label>
@@ -39,12 +39,14 @@
 			<row>
 				<label>/thankyou</label>
 				<nb_visits>1</nb_visits>
-				<nb_hits>1</nb_hits>
+				<nb_hits>2</nb_hits>
 				<sum_time_spent>360</sum_time_spent>
+				<exit_nb_visits>1</exit_nb_visits>
 				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
 				<avg_time_on_page>360</avg_time_on_page>
 				<bounce_rate>0%</bounce_rate>
-				<exit_rate>0%</exit_rate>
+				<exit_rate>100%</exit_rate>
 				<url>http://example.org/thankyou</url>
 			</row>
 			<row>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_day.xml
index e5132a2ab5..13b96979bd 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_day.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_day.xml
@@ -31,8 +31,8 @@
 				<label>referer.com</label>
 				<nb_uniq_visitors>1</nb_uniq_visitors>
 				<nb_visits>1</nb_visits>
-				<nb_actions>4</nb_actions>
-				<max_actions>4</max_actions>
+				<nb_actions>5</nb_actions>
+				<max_actions>5</max_actions>
 				<sum_visit_length>901</sum_visit_length>
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
@@ -41,8 +41,8 @@
 						<label>http://referer.com/Other_Page.htm</label>
 						<nb_uniq_visitors>1</nb_uniq_visitors>
 						<nb_visits>1</nb_visits>
-						<nb_actions>4</nb_actions>
-						<max_actions>4</max_actions>
+						<nb_actions>5</nb_actions>
+						<max_actions>5</max_actions>
 						<sum_visit_length>901</sum_visit_length>
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_month.xml
index f74a681f74..02f0affebb 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_month.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_month.xml
@@ -5,8 +5,8 @@
 			<row>
 				<label>referer.com</label>
 				<nb_visits>2</nb_visits>
-				<nb_actions>6</nb_actions>
-				<max_actions>4</max_actions>
+				<nb_actions>7</nb_actions>
+				<max_actions>5</max_actions>
 				<sum_visit_length>1262</sum_visit_length>
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
@@ -15,8 +15,8 @@
 					<row>
 						<label>http://referer.com/Other_Page.htm</label>
 						<nb_visits>1</nb_visits>
-						<nb_actions>4</nb_actions>
-						<max_actions>4</max_actions>
+						<nb_actions>5</nb_actions>
+						<max_actions>5</max_actions>
 						<sum_visit_length>901</sum_visit_length>
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_week.xml
index 937b1833c4..107c1ec4a9 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_week.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_week.xml
@@ -6,8 +6,8 @@
 			<row>
 				<label>referer.com</label>
 				<nb_visits>2</nb_visits>
-				<nb_actions>6</nb_actions>
-				<max_actions>4</max_actions>
+				<nb_actions>7</nb_actions>
+				<max_actions>5</max_actions>
 				<sum_visit_length>1262</sum_visit_length>
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
@@ -16,8 +16,8 @@
 					<row>
 						<label>http://referer.com/Other_Page.htm</label>
 						<nb_visits>1</nb_visits>
-						<nb_actions>4</nb_actions>
-						<max_actions>4</max_actions>
+						<nb_actions>5</nb_actions>
+						<max_actions>5</max_actions>
 						<sum_visit_length>901</sum_visit_length>
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_year.xml
index 682d2bff99..457ff90a4f 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_year.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referers.getWebsites_year.xml
@@ -5,8 +5,8 @@
 			<row>
 				<label>referer.com</label>
 				<nb_visits>2</nb_visits>
-				<nb_actions>6</nb_actions>
-				<max_actions>4</max_actions>
+				<nb_actions>7</nb_actions>
+				<max_actions>5</max_actions>
 				<sum_visit_length>1262</sum_visit_length>
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>0</nb_visits_converted>
@@ -15,8 +15,8 @@
 					<row>
 						<label>http://referer.com/Other_Page.htm</label>
 						<nb_visits>1</nb_visits>
-						<nb_actions>4</nb_actions>
-						<max_actions>4</max_actions>
+						<nb_actions>5</nb_actions>
+						<max_actions>5</max_actions>
 						<sum_visit_length>901</sum_visit_length>
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>0</nb_visits_converted>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
index 324911514d..b40dd75842 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_day.xml
@@ -4,13 +4,13 @@
 		<result date="2010-01-03" />
 		<result date="2010-01-04" />
 		<result date="2010-01-05">
-			<max_actions_returning>4</max_actions_returning>
-			<nb_actions_returning>4</nb_actions_returning>
+			<max_actions_returning>5</max_actions_returning>
+			<nb_actions_returning>5</nb_actions_returning>
 			<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
 			<nb_visits_returning>1</nb_visits_returning>
 			<sum_visit_length_returning>901</sum_visit_length_returning>
 			<bounce_rate_returning>0%</bounce_rate_returning>
-			<nb_actions_per_visit_returning>4</nb_actions_per_visit_returning>
+			<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
 			<avg_time_on_site_returning>901</avg_time_on_site_returning>
 		</result>
 		<result date="2010-01-06" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
index 82a4d35046..ca1b4d4aea 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_month.xml
@@ -2,12 +2,12 @@
 <results>
 	<result idSite="1">
 		<result date="2010-01">
-			<max_actions_returning>4</max_actions_returning>
-			<nb_actions_returning>4</nb_actions_returning>
+			<max_actions_returning>5</max_actions_returning>
+			<nb_actions_returning>5</nb_actions_returning>
 			<nb_visits_returning>1</nb_visits_returning>
 			<sum_visit_length_returning>901</sum_visit_length_returning>
 			<bounce_rate_returning>0%</bounce_rate_returning>
-			<nb_actions_per_visit_returning>4</nb_actions_per_visit_returning>
+			<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
 			<avg_time_on_site_returning>901</avg_time_on_site_returning>
 		</result>
 		<result date="2010-02" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
index 8392876c38..1246b430af 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_week.xml
@@ -3,12 +3,12 @@
 	<result idSite="1">
 		<result date="2009-12-28 to 2010-01-03" />
 		<result date="2010-01-04 to 2010-01-10">
-			<max_actions_returning>4</max_actions_returning>
-			<nb_actions_returning>4</nb_actions_returning>
+			<max_actions_returning>5</max_actions_returning>
+			<nb_actions_returning>5</nb_actions_returning>
 			<nb_visits_returning>1</nb_visits_returning>
 			<sum_visit_length_returning>901</sum_visit_length_returning>
 			<bounce_rate_returning>0%</bounce_rate_returning>
-			<nb_actions_per_visit_returning>4</nb_actions_per_visit_returning>
+			<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
 			<avg_time_on_site_returning>901</avg_time_on_site_returning>
 		</result>
 		<result date="2010-01-11 to 2010-01-17" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml
index 3d288d7a28..c7f6af5563 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitFrequency.get_year.xml
@@ -2,12 +2,12 @@
 <results>
 	<result idSite="1">
 		<result date="2010">
-			<max_actions_returning>4</max_actions_returning>
-			<nb_actions_returning>4</nb_actions_returning>
+			<max_actions_returning>5</max_actions_returning>
+			<nb_actions_returning>5</nb_actions_returning>
 			<nb_visits_returning>1</nb_visits_returning>
 			<sum_visit_length_returning>901</sum_visit_length_returning>
 			<bounce_rate_returning>0%</bounce_rate_returning>
-			<nb_actions_per_visit_returning>4</nb_actions_per_visit_returning>
+			<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
 			<avg_time_on_site_returning>901</avg_time_on_site_returning>
 		</result>
 		<result date="2011" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml
index d3da0bc6e3..dfbd086bad 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_day.xml
@@ -22,13 +22,13 @@
 			<avg_time_on_site>361</avg_time_on_site>
 		</result>
 		<result date="2010-01-05">
-			<max_actions>4</max_actions>
-			<nb_actions>4</nb_actions>
+			<max_actions>5</max_actions>
+			<nb_actions>5</nb_actions>
 			<nb_uniq_visitors>1</nb_uniq_visitors>
 			<nb_visits>1</nb_visits>
 			<sum_visit_length>901</sum_visit_length>
 			<bounce_rate>0%</bounce_rate>
-			<nb_actions_per_visit>4</nb_actions_per_visit>
+			<nb_actions_per_visit>5</nb_actions_per_visit>
 			<avg_time_on_site>901</avg_time_on_site>
 		</result>
 		<result date="2010-01-06" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml
index 472a1900e5..39db872931 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml
@@ -3,13 +3,13 @@
 	<result idSite="1">
 		<result date="2010-01">
 			<bounce_count>1</bounce_count>
-			<max_actions>4</max_actions>
-			<nb_actions>7</nb_actions>
+			<max_actions>5</max_actions>
+			<nb_actions>8</nb_actions>
 			<nb_uniq_visitors>2</nb_uniq_visitors>
 			<nb_visits>3</nb_visits>
 			<sum_visit_length>1262</sum_visit_length>
 			<bounce_rate>33%</bounce_rate>
-			<nb_actions_per_visit>2.3</nb_actions_per_visit>
+			<nb_actions_per_visit>2.7</nb_actions_per_visit>
 			<avg_time_on_site>421</avg_time_on_site>
 		</result>
 		<result date="2010-02" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml
index 689e94d0d8..81222eb286 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml
@@ -12,13 +12,13 @@
 			<avg_time_on_site>0</avg_time_on_site>
 		</result>
 		<result date="2010-01-04 to 2010-01-10">
-			<max_actions>4</max_actions>
-			<nb_actions>6</nb_actions>
+			<max_actions>5</max_actions>
+			<nb_actions>7</nb_actions>
 			<nb_uniq_visitors>2</nb_uniq_visitors>
 			<nb_visits>2</nb_visits>
 			<sum_visit_length>1262</sum_visit_length>
 			<bounce_rate>0%</bounce_rate>
-			<nb_actions_per_visit>3</nb_actions_per_visit>
+			<nb_actions_per_visit>3.5</nb_actions_per_visit>
 			<avg_time_on_site>631</avg_time_on_site>
 		</result>
 		<result date="2010-01-11 to 2010-01-17" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml
index 2c627256f9..c05ee35200 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_year.xml
@@ -3,12 +3,12 @@
 	<result idSite="1">
 		<result date="2010">
 			<bounce_count>1</bounce_count>
-			<max_actions>4</max_actions>
-			<nb_actions>7</nb_actions>
+			<max_actions>5</max_actions>
+			<nb_actions>8</nb_actions>
 			<nb_visits>3</nb_visits>
 			<sum_visit_length>1262</sum_visit_length>
 			<bounce_rate>33%</bounce_rate>
-			<nb_actions_per_visit>2.3</nb_actions_per_visit>
+			<nb_actions_per_visit>2.7</nb_actions_per_visit>
 			<avg_time_on_site>421</avg_time_on_site>
 		</result>
 		<result date="2011" />
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_day.xml
new file mode 100644
index 0000000000..201b4ac829
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_day.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010-01-03" />
+	<result date="2010-01-04" />
+	<result date="2010-01-05">
+		<row>
+			<label>/mailto:test@example.org</label>
+			<nb_visits>1</nb_visits>
+			<nb_uniq_visitors>1</nb_uniq_visitors>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>180</sum_time_spent>
+			<url>mailto:test@example.org</url>
+		</row>
+		<row>
+			<label>mailto:test@example.org</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<subtable>
+				<row>
+					<label>/strangelink</label>
+					<nb_visits>1</nb_visits>
+					<nb_uniq_visitors>1</nb_uniq_visitors>
+					<nb_hits>1</nb_hits>
+					<sum_time_spent>0</sum_time_spent>
+					<url>mailto:test@example.org/strangelink</url>
+				</row>
+			</subtable>
+		</row>
+	</result>
+	<result date="2010-01-06" />
+	<result date="2010-01-07" />
+	<result date="2010-01-08" />
+	<result date="2010-01-09" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_month.xml
new file mode 100644
index 0000000000..a2c256a114
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_month.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010-01">
+		<row>
+			<label>/mailto:test@example.org</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>180</sum_time_spent>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<url>mailto:test@example.org</url>
+		</row>
+		<row>
+			<label>mailto:test@example.org</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<subtable>
+				<row>
+					<label>/strangelink</label>
+					<nb_visits>1</nb_visits>
+					<nb_hits>1</nb_hits>
+					<sum_time_spent>0</sum_time_spent>
+					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					<url>mailto:test@example.org/strangelink</url>
+				</row>
+			</subtable>
+		</row>
+	</result>
+	<result date="2010-02" />
+	<result date="2010-03" />
+	<result date="2010-04" />
+	<result date="2010-05" />
+	<result date="2010-06" />
+	<result date="2010-07" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_week.xml
new file mode 100644
index 0000000000..fc5cd9bc3e
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_week.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2009-12-28 to 2010-01-03" />
+	<result date="2010-01-04 to 2010-01-10">
+		<row>
+			<label>/mailto:test@example.org</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>180</sum_time_spent>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<url>mailto:test@example.org</url>
+		</row>
+		<row>
+			<label>mailto:test@example.org</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<subtable>
+				<row>
+					<label>/strangelink</label>
+					<nb_visits>1</nb_visits>
+					<nb_hits>1</nb_hits>
+					<sum_time_spent>0</sum_time_spent>
+					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					<url>mailto:test@example.org/strangelink</url>
+				</row>
+			</subtable>
+		</row>
+	</result>
+	<result date="2010-01-11 to 2010-01-17" />
+	<result date="2010-01-18 to 2010-01-24" />
+	<result date="2010-01-25 to 2010-01-31" />
+	<result date="2010-02-01 to 2010-02-07" />
+	<result date="2010-02-08 to 2010-02-14" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_year.xml
new file mode 100644
index 0000000000..e6d2352cfd
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getOutlinks_year.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010">
+		<row>
+			<label>/mailto:test@example.org</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>180</sum_time_spent>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<url>mailto:test@example.org</url>
+		</row>
+		<row>
+			<label>mailto:test@example.org</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<subtable>
+				<row>
+					<label>/strangelink</label>
+					<nb_visits>1</nb_visits>
+					<nb_hits>1</nb_hits>
+					<sum_time_spent>0</sum_time_spent>
+					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					<url>mailto:test@example.org/strangelink</url>
+				</row>
+			</subtable>
+		</row>
+	</result>
+	<result date="2011" />
+	<result date="2012" />
+	<result date="2013" />
+	<result date="2014" />
+	<result date="2015" />
+	<result date="2016" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_day.xml
new file mode 100644
index 0000000000..f5f93d373d
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_day.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010-01-03" />
+	<result date="2010-01-04" />
+	<result date="2010-01-05">
+		<row>
+			<label> Purchasing...</label>
+			<nb_visits>1</nb_visits>
+			<nb_uniq_visitors>1</nb_uniq_visitors>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
+			<exit_nb_visits>1</exit_nb_visits>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>100%</exit_rate>
+		</row>
+	</result>
+	<result date="2010-01-06" />
+	<result date="2010-01-07" />
+	<result date="2010-01-08" />
+	<result date="2010-01-09" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_month.xml
new file mode 100644
index 0000000000..debbb85c81
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_month.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010-01">
+		<row>
+			<label> Purchasing...</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>100%</exit_rate>
+		</row>
+	</result>
+	<result date="2010-02" />
+	<result date="2010-03" />
+	<result date="2010-04" />
+	<result date="2010-05" />
+	<result date="2010-06" />
+	<result date="2010-07" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_week.xml
new file mode 100644
index 0000000000..2d01feeff1
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_week.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2009-12-28 to 2010-01-03" />
+	<result date="2010-01-04 to 2010-01-10">
+		<row>
+			<label> Purchasing...</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>100%</exit_rate>
+		</row>
+	</result>
+	<result date="2010-01-11 to 2010-01-17" />
+	<result date="2010-01-18 to 2010-01-24" />
+	<result date="2010-01-25 to 2010-01-31" />
+	<result date="2010-02-01 to 2010-02-07" />
+	<result date="2010-02-08 to 2010-02-14" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_year.xml
new file mode 100644
index 0000000000..8d67dcde61
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitle_year.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010">
+		<row>
+			<label> Purchasing...</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>100%</exit_rate>
+		</row>
+	</result>
+	<result date="2011" />
+	<result date="2012" />
+	<result date="2013" />
+	<result date="2014" />
+	<result date="2015" />
+	<result date="2016" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_day.xml
new file mode 100644
index 0000000000..f8df8e7753
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_day.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010-01-03">
+		<row>
+			<label> first page view</label>
+			<nb_visits>2</nb_visits>
+			<nb_uniq_visitors>2</nb_uniq_visitors>
+			<nb_hits>2</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>1</entry_nb_actions>
+			<entry_sum_visit_length>0</entry_sum_visit_length>
+			<entry_bounce_count>1</entry_bounce_count>
+			<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
+			<exit_nb_visits>1</exit_nb_visits>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>100%</bounce_rate>
+			<exit_rate>50%</exit_rate>
+		</row>
+	</result>
+	<result date="2010-01-04">
+		<row>
+			<label>Page Name not defined</label>
+			<nb_visits>1</nb_visits>
+			<nb_uniq_visitors>1</nb_uniq_visitors>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+		</row>
+	</result>
+	<result date="2010-01-05">
+		<row>
+			<label>second visitor</label>
+			<nb_visits>2</nb_visits>
+			<nb_hits>2</nb_hits>
+			<sum_time_spent>720</sum_time_spent>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>5</entry_nb_actions>
+			<entry_sum_visit_length>901</entry_sum_visit_length>
+			<entry_bounce_count>0</entry_bounce_count>
+			<avg_time_on_page>360</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+			<subtable>
+				<row>
+					<label>two days later</label>
+					<nb_visits>2</nb_visits>
+					<nb_hits>2</nb_hits>
+					<sum_time_spent>720</sum_time_spent>
+					<entry_nb_visits>1</entry_nb_visits>
+					<entry_nb_actions>5</entry_nb_actions>
+					<entry_sum_visit_length>901</entry_sum_visit_length>
+					<entry_bounce_count>0</entry_bounce_count>
+					<avg_time_on_page>360</avg_time_on_page>
+					<bounce_rate>0%</bounce_rate>
+					<exit_rate>0%</exit_rate>
+					<subtable>
+						<row>
+							<label> a new visit</label>
+							<nb_visits>1</nb_visits>
+							<nb_uniq_visitors>1</nb_uniq_visitors>
+							<nb_hits>1</nb_hits>
+							<sum_time_spent>360</sum_time_spent>
+							<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
+							<entry_nb_visits>1</entry_nb_visits>
+							<entry_nb_actions>5</entry_nb_actions>
+							<entry_sum_visit_length>901</entry_sum_visit_length>
+							<entry_bounce_count>0</entry_bounce_count>
+							<avg_time_on_page>360</avg_time_on_page>
+							<bounce_rate>0%</bounce_rate>
+							<exit_rate>0%</exit_rate>
+						</row>
+						<row>
+							<label> second page view</label>
+							<nb_visits>1</nb_visits>
+							<nb_uniq_visitors>1</nb_uniq_visitors>
+							<nb_hits>1</nb_hits>
+							<sum_time_spent>360</sum_time_spent>
+							<avg_time_on_page>360</avg_time_on_page>
+							<bounce_rate>0%</bounce_rate>
+							<exit_rate>0%</exit_rate>
+						</row>
+					</subtable>
+				</row>
+			</subtable>
+		</row>
+		<row>
+			<label>Checkout</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<exit_nb_visits>1</exit_nb_visits>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>100%</exit_rate>
+			<subtable>
+				<row>
+					<label> Purchasing...</label>
+					<nb_visits>1</nb_visits>
+					<nb_uniq_visitors>1</nb_uniq_visitors>
+					<nb_hits>1</nb_hits>
+					<sum_time_spent>0</sum_time_spent>
+					<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
+					<exit_nb_visits>1</exit_nb_visits>
+					<avg_time_on_page>0</avg_time_on_page>
+					<bounce_rate>0%</bounce_rate>
+					<exit_rate>100%</exit_rate>
+				</row>
+			</subtable>
+		</row>
+	</result>
+	<result date="2010-01-06" />
+	<result date="2010-01-07" />
+	<result date="2010-01-08" />
+	<result date="2010-01-09" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml
new file mode 100644
index 0000000000..a09dd95cc5
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_month.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010-01">
+		<row>
+			<label> first page view</label>
+			<nb_visits>2</nb_visits>
+			<nb_hits>2</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>1</entry_nb_actions>
+			<entry_sum_visit_length>0</entry_sum_visit_length>
+			<entry_bounce_count>1</entry_bounce_count>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>100%</bounce_rate>
+			<exit_rate>50%</exit_rate>
+		</row>
+		<row>
+			<label>second visitor</label>
+			<nb_visits>2</nb_visits>
+			<nb_hits>2</nb_hits>
+			<sum_time_spent>720</sum_time_spent>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>5</entry_nb_actions>
+			<entry_sum_visit_length>901</entry_sum_visit_length>
+			<entry_bounce_count>0</entry_bounce_count>
+			<avg_time_on_page>360</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+			<subtable>
+				<row>
+					<label>two days later</label>
+					<nb_visits>2</nb_visits>
+					<nb_hits>2</nb_hits>
+					<sum_time_spent>720</sum_time_spent>
+					<entry_nb_visits>1</entry_nb_visits>
+					<entry_nb_actions>5</entry_nb_actions>
+					<entry_sum_visit_length>901</entry_sum_visit_length>
+					<entry_bounce_count>0</entry_bounce_count>
+					<avg_time_on_page>360</avg_time_on_page>
+					<bounce_rate>0%</bounce_rate>
+					<exit_rate>0%</exit_rate>
+					<subtable>
+						<row>
+							<label> a new visit</label>
+							<nb_visits>1</nb_visits>
+							<nb_hits>1</nb_hits>
+							<sum_time_spent>360</sum_time_spent>
+							<entry_nb_visits>1</entry_nb_visits>
+							<entry_nb_actions>5</entry_nb_actions>
+							<entry_sum_visit_length>901</entry_sum_visit_length>
+							<entry_bounce_count>0</entry_bounce_count>
+							<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+							<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+							<avg_time_on_page>360</avg_time_on_page>
+							<bounce_rate>0%</bounce_rate>
+							<exit_rate>0%</exit_rate>
+						</row>
+						<row>
+							<label> second page view</label>
+							<nb_visits>1</nb_visits>
+							<nb_hits>1</nb_hits>
+							<sum_time_spent>360</sum_time_spent>
+							<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+							<avg_time_on_page>360</avg_time_on_page>
+							<bounce_rate>0%</bounce_rate>
+							<exit_rate>0%</exit_rate>
+						</row>
+					</subtable>
+				</row>
+			</subtable>
+		</row>
+		<row>
+			<label>Checkout</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<exit_nb_visits>1</exit_nb_visits>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>100%</exit_rate>
+			<subtable>
+				<row>
+					<label> Purchasing...</label>
+					<nb_visits>1</nb_visits>
+					<nb_hits>1</nb_hits>
+					<sum_time_spent>0</sum_time_spent>
+					<exit_nb_visits>1</exit_nb_visits>
+					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+					<avg_time_on_page>0</avg_time_on_page>
+					<bounce_rate>0%</bounce_rate>
+					<exit_rate>100%</exit_rate>
+				</row>
+			</subtable>
+		</row>
+		<row>
+			<label>Page Name not defined</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+		</row>
+	</result>
+	<result date="2010-02" />
+	<result date="2010-03" />
+	<result date="2010-04" />
+	<result date="2010-05" />
+	<result date="2010-06" />
+	<result date="2010-07" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml
new file mode 100644
index 0000000000..f6cfb936ac
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_week.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2009-12-28 to 2010-01-03">
+		<row>
+			<label> first page view</label>
+			<nb_visits>2</nb_visits>
+			<nb_hits>2</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>1</entry_nb_actions>
+			<entry_sum_visit_length>0</entry_sum_visit_length>
+			<entry_bounce_count>1</entry_bounce_count>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>100%</bounce_rate>
+			<exit_rate>50%</exit_rate>
+		</row>
+	</result>
+	<result date="2010-01-04 to 2010-01-10">
+		<row>
+			<label>second visitor</label>
+			<nb_visits>2</nb_visits>
+			<nb_hits>2</nb_hits>
+			<sum_time_spent>720</sum_time_spent>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>5</entry_nb_actions>
+			<entry_sum_visit_length>901</entry_sum_visit_length>
+			<entry_bounce_count>0</entry_bounce_count>
+			<avg_time_on_page>360</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+			<subtable>
+				<row>
+					<label>two days later</label>
+					<nb_visits>2</nb_visits>
+					<nb_hits>2</nb_hits>
+					<sum_time_spent>720</sum_time_spent>
+					<entry_nb_visits>1</entry_nb_visits>
+					<entry_nb_actions>5</entry_nb_actions>
+					<entry_sum_visit_length>901</entry_sum_visit_length>
+					<entry_bounce_count>0</entry_bounce_count>
+					<avg_time_on_page>360</avg_time_on_page>
+					<bounce_rate>0%</bounce_rate>
+					<exit_rate>0%</exit_rate>
+					<subtable>
+						<row>
+							<label> a new visit</label>
+							<nb_visits>1</nb_visits>
+							<nb_hits>1</nb_hits>
+							<sum_time_spent>360</sum_time_spent>
+							<entry_nb_visits>1</entry_nb_visits>
+							<entry_nb_actions>5</entry_nb_actions>
+							<entry_sum_visit_length>901</entry_sum_visit_length>
+							<entry_bounce_count>0</entry_bounce_count>
+							<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+							<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+							<avg_time_on_page>360</avg_time_on_page>
+							<bounce_rate>0%</bounce_rate>
+							<exit_rate>0%</exit_rate>
+						</row>
+						<row>
+							<label> second page view</label>
+							<nb_visits>1</nb_visits>
+							<nb_hits>1</nb_hits>
+							<sum_time_spent>360</sum_time_spent>
+							<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+							<avg_time_on_page>360</avg_time_on_page>
+							<bounce_rate>0%</bounce_rate>
+							<exit_rate>0%</exit_rate>
+						</row>
+					</subtable>
+				</row>
+			</subtable>
+		</row>
+		<row>
+			<label>Checkout</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<exit_nb_visits>1</exit_nb_visits>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>100%</exit_rate>
+			<subtable>
+				<row>
+					<label> Purchasing...</label>
+					<nb_visits>1</nb_visits>
+					<nb_hits>1</nb_hits>
+					<sum_time_spent>0</sum_time_spent>
+					<exit_nb_visits>1</exit_nb_visits>
+					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+					<avg_time_on_page>0</avg_time_on_page>
+					<bounce_rate>0%</bounce_rate>
+					<exit_rate>100%</exit_rate>
+				</row>
+			</subtable>
+		</row>
+		<row>
+			<label>Page Name not defined</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+		</row>
+	</result>
+	<result date="2010-01-11 to 2010-01-17" />
+	<result date="2010-01-18 to 2010-01-24" />
+	<result date="2010-01-25 to 2010-01-31" />
+	<result date="2010-02-01 to 2010-02-07" />
+	<result date="2010-02-08 to 2010-02-14" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml
new file mode 100644
index 0000000000..4c29113251
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageTitles_year.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010">
+		<row>
+			<label> first page view</label>
+			<nb_visits>2</nb_visits>
+			<nb_hits>2</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>1</entry_nb_actions>
+			<entry_sum_visit_length>0</entry_sum_visit_length>
+			<entry_bounce_count>1</entry_bounce_count>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>100%</bounce_rate>
+			<exit_rate>50%</exit_rate>
+		</row>
+		<row>
+			<label>second visitor</label>
+			<nb_visits>2</nb_visits>
+			<nb_hits>2</nb_hits>
+			<sum_time_spent>720</sum_time_spent>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>5</entry_nb_actions>
+			<entry_sum_visit_length>901</entry_sum_visit_length>
+			<entry_bounce_count>0</entry_bounce_count>
+			<avg_time_on_page>360</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+			<subtable>
+				<row>
+					<label>two days later</label>
+					<nb_visits>2</nb_visits>
+					<nb_hits>2</nb_hits>
+					<sum_time_spent>720</sum_time_spent>
+					<entry_nb_visits>1</entry_nb_visits>
+					<entry_nb_actions>5</entry_nb_actions>
+					<entry_sum_visit_length>901</entry_sum_visit_length>
+					<entry_bounce_count>0</entry_bounce_count>
+					<avg_time_on_page>360</avg_time_on_page>
+					<bounce_rate>0%</bounce_rate>
+					<exit_rate>0%</exit_rate>
+					<subtable>
+						<row>
+							<label> a new visit</label>
+							<nb_visits>1</nb_visits>
+							<nb_hits>1</nb_hits>
+							<sum_time_spent>360</sum_time_spent>
+							<entry_nb_visits>1</entry_nb_visits>
+							<entry_nb_actions>5</entry_nb_actions>
+							<entry_sum_visit_length>901</entry_sum_visit_length>
+							<entry_bounce_count>0</entry_bounce_count>
+							<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+							<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+							<avg_time_on_page>360</avg_time_on_page>
+							<bounce_rate>0%</bounce_rate>
+							<exit_rate>0%</exit_rate>
+						</row>
+						<row>
+							<label> second page view</label>
+							<nb_visits>1</nb_visits>
+							<nb_hits>1</nb_hits>
+							<sum_time_spent>360</sum_time_spent>
+							<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+							<avg_time_on_page>360</avg_time_on_page>
+							<bounce_rate>0%</bounce_rate>
+							<exit_rate>0%</exit_rate>
+						</row>
+					</subtable>
+				</row>
+			</subtable>
+		</row>
+		<row>
+			<label>Checkout</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<exit_nb_visits>1</exit_nb_visits>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>100%</exit_rate>
+			<subtable>
+				<row>
+					<label> Purchasing...</label>
+					<nb_visits>1</nb_visits>
+					<nb_hits>1</nb_hits>
+					<sum_time_spent>0</sum_time_spent>
+					<exit_nb_visits>1</exit_nb_visits>
+					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+					<avg_time_on_page>0</avg_time_on_page>
+					<bounce_rate>0%</bounce_rate>
+					<exit_rate>100%</exit_rate>
+				</row>
+			</subtable>
+		</row>
+		<row>
+			<label>Page Name not defined</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+		</row>
+	</result>
+	<result date="2011" />
+	<result date="2012" />
+	<result date="2013" />
+	<result date="2014" />
+	<result date="2015" />
+	<result date="2016" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_day.xml
new file mode 100644
index 0000000000..ec8112ff61
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_day.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010-01-03">
+		<row>
+			<label>/index.htm</label>
+			<nb_visits>1</nb_visits>
+			<nb_uniq_visitors>1</nb_uniq_visitors>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+			<url>http://example.org/index.htm</url>
+		</row>
+	</result>
+	<result date="2010-01-04" />
+	<result date="2010-01-05">
+		<row>
+			<label>/index.htm</label>
+			<nb_visits>1</nb_visits>
+			<nb_uniq_visitors>1</nb_uniq_visitors>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>360</sum_time_spent>
+			<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>5</entry_nb_actions>
+			<entry_sum_visit_length>901</entry_sum_visit_length>
+			<entry_bounce_count>0</entry_bounce_count>
+			<avg_time_on_page>360</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+			<url>http://example.org/index.htm</url>
+		</row>
+	</result>
+	<result date="2010-01-06" />
+	<result date="2010-01-07" />
+	<result date="2010-01-08" />
+	<result date="2010-01-09" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_month.xml
new file mode 100644
index 0000000000..f4556b0023
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_month.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010-01">
+		<row>
+			<label>/index.htm</label>
+			<nb_visits>2</nb_visits>
+			<nb_hits>2</nb_hits>
+			<sum_time_spent>360</sum_time_spent>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>5</entry_nb_actions>
+			<entry_sum_visit_length>901</entry_sum_visit_length>
+			<entry_bounce_count>0</entry_bounce_count>
+			<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+			<avg_time_on_page>180</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+			<url>http://example.org/index.htm</url>
+		</row>
+	</result>
+	<result date="2010-02" />
+	<result date="2010-03" />
+	<result date="2010-04" />
+	<result date="2010-05" />
+	<result date="2010-06" />
+	<result date="2010-07" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_week.xml
new file mode 100644
index 0000000000..7ef8c11406
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_week.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2009-12-28 to 2010-01-03">
+		<row>
+			<label>/index.htm</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+			<url>http://example.org/index.htm</url>
+		</row>
+	</result>
+	<result date="2010-01-04 to 2010-01-10">
+		<row>
+			<label>/index.htm</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>360</sum_time_spent>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>5</entry_nb_actions>
+			<entry_sum_visit_length>901</entry_sum_visit_length>
+			<entry_bounce_count>0</entry_bounce_count>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+			<avg_time_on_page>360</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+			<url>http://example.org/index.htm</url>
+		</row>
+	</result>
+	<result date="2010-01-11 to 2010-01-17" />
+	<result date="2010-01-18 to 2010-01-24" />
+	<result date="2010-01-25 to 2010-01-31" />
+	<result date="2010-02-01 to 2010-02-07" />
+	<result date="2010-02-08 to 2010-02-14" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_year.xml
new file mode 100644
index 0000000000..dc464d51d3
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrl_year.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010">
+		<row>
+			<label>/index.htm</label>
+			<nb_visits>2</nb_visits>
+			<nb_hits>2</nb_hits>
+			<sum_time_spent>360</sum_time_spent>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>5</entry_nb_actions>
+			<entry_sum_visit_length>901</entry_sum_visit_length>
+			<entry_bounce_count>0</entry_bounce_count>
+			<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+			<avg_time_on_page>180</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+			<url>http://example.org/index.htm</url>
+		</row>
+	</result>
+	<result date="2011" />
+	<result date="2012" />
+	<result date="2013" />
+	<result date="2014" />
+	<result date="2015" />
+	<result date="2016" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
new file mode 100644
index 0000000000..dddd4d74d1
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_day.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010-01-03">
+		<row>
+			<label>/index.htm</label>
+			<nb_visits>1</nb_visits>
+			<nb_uniq_visitors>1</nb_uniq_visitors>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+			<url>http://example.org/index.htm</url>
+		</row>
+		<row>
+			<label>/products</label>
+			<nb_visits>1</nb_visits>
+			<nb_uniq_visitors>1</nb_uniq_visitors>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>1</entry_nb_actions>
+			<entry_sum_visit_length>0</entry_sum_visit_length>
+			<entry_bounce_count>1</entry_bounce_count>
+			<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
+			<exit_nb_visits>1</exit_nb_visits>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>100%</bounce_rate>
+			<exit_rate>100%</exit_rate>
+			<url>http://example.org/products</url>
+		</row>
+	</result>
+	<result date="2010-01-04">
+		<row>
+			<label>Page URL not defined</label>
+			<nb_visits>1</nb_visits>
+			<nb_uniq_visitors>1</nb_uniq_visitors>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+			<url />
+		</row>
+	</result>
+	<result date="2010-01-05">
+		<row>
+			<label>/index.htm</label>
+			<nb_visits>1</nb_visits>
+			<nb_uniq_visitors>1</nb_uniq_visitors>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>360</sum_time_spent>
+			<entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>5</entry_nb_actions>
+			<entry_sum_visit_length>901</entry_sum_visit_length>
+			<entry_bounce_count>0</entry_bounce_count>
+			<avg_time_on_page>360</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+			<url>http://example.org/index.htm</url>
+		</row>
+		<row>
+			<label>/thankyou</label>
+			<nb_visits>1</nb_visits>
+			<nb_uniq_visitors>1</nb_uniq_visitors>
+			<nb_hits>2</nb_hits>
+			<sum_time_spent>360</sum_time_spent>
+			<exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
+			<exit_nb_visits>1</exit_nb_visits>
+			<avg_time_on_page>360</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>100%</exit_rate>
+			<url>http://example.org/thankyou</url>
+		</row>
+	</result>
+	<result date="2010-01-06" />
+	<result date="2010-01-07" />
+	<result date="2010-01-08" />
+	<result date="2010-01-09" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
new file mode 100644
index 0000000000..5634e51a28
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_month.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010-01">
+		<row>
+			<label>/index.htm</label>
+			<nb_visits>2</nb_visits>
+			<nb_hits>2</nb_hits>
+			<sum_time_spent>360</sum_time_spent>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>5</entry_nb_actions>
+			<entry_sum_visit_length>901</entry_sum_visit_length>
+			<entry_bounce_count>0</entry_bounce_count>
+			<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+			<avg_time_on_page>180</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+			<url>http://example.org/index.htm</url>
+		</row>
+		<row>
+			<label>/products</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>1</entry_nb_actions>
+			<entry_sum_visit_length>0</entry_sum_visit_length>
+			<entry_bounce_count>1</entry_bounce_count>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>100%</bounce_rate>
+			<exit_rate>100%</exit_rate>
+			<url>http://example.org/products</url>
+		</row>
+		<row>
+			<label>/thankyou</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>2</nb_hits>
+			<sum_time_spent>360</sum_time_spent>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+			<avg_time_on_page>360</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>100%</exit_rate>
+			<url>http://example.org/thankyou</url>
+		</row>
+		<row>
+			<label>Page URL not defined</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+			<url />
+		</row>
+	</result>
+	<result date="2010-02" />
+	<result date="2010-03" />
+	<result date="2010-04" />
+	<result date="2010-05" />
+	<result date="2010-06" />
+	<result date="2010-07" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
new file mode 100644
index 0000000000..bf24c591bf
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_week.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2009-12-28 to 2010-01-03">
+		<row>
+			<label>/index.htm</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+			<url>http://example.org/index.htm</url>
+		</row>
+		<row>
+			<label>/products</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>1</entry_nb_actions>
+			<entry_sum_visit_length>0</entry_sum_visit_length>
+			<entry_bounce_count>1</entry_bounce_count>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>100%</bounce_rate>
+			<exit_rate>100%</exit_rate>
+			<url>http://example.org/products</url>
+		</row>
+	</result>
+	<result date="2010-01-04 to 2010-01-10">
+		<row>
+			<label>/index.htm</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>360</sum_time_spent>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>5</entry_nb_actions>
+			<entry_sum_visit_length>901</entry_sum_visit_length>
+			<entry_bounce_count>0</entry_bounce_count>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+			<avg_time_on_page>360</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+			<url>http://example.org/index.htm</url>
+		</row>
+		<row>
+			<label>/thankyou</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>2</nb_hits>
+			<sum_time_spent>360</sum_time_spent>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+			<avg_time_on_page>360</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>100%</exit_rate>
+			<url>http://example.org/thankyou</url>
+		</row>
+		<row>
+			<label>Page URL not defined</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+			<url />
+		</row>
+	</result>
+	<result date="2010-01-11 to 2010-01-17" />
+	<result date="2010-01-18 to 2010-01-24" />
+	<result date="2010-01-25 to 2010-01-31" />
+	<result date="2010-02-01 to 2010-02-07" />
+	<result date="2010-02-08 to 2010-02-14" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
new file mode 100644
index 0000000000..2e4bba682d
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Actions.getPageUrls_year.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010">
+		<row>
+			<label>/index.htm</label>
+			<nb_visits>2</nb_visits>
+			<nb_hits>2</nb_hits>
+			<sum_time_spent>360</sum_time_spent>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>5</entry_nb_actions>
+			<entry_sum_visit_length>901</entry_sum_visit_length>
+			<entry_bounce_count>0</entry_bounce_count>
+			<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+			<avg_time_on_page>180</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+			<url>http://example.org/index.htm</url>
+		</row>
+		<row>
+			<label>/products</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<entry_nb_visits>1</entry_nb_visits>
+			<entry_nb_actions>1</entry_nb_actions>
+			<entry_sum_visit_length>0</entry_sum_visit_length>
+			<entry_bounce_count>1</entry_bounce_count>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>100%</bounce_rate>
+			<exit_rate>100%</exit_rate>
+			<url>http://example.org/products</url>
+		</row>
+		<row>
+			<label>/thankyou</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>2</nb_hits>
+			<sum_time_spent>360</sum_time_spent>
+			<exit_nb_visits>1</exit_nb_visits>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+			<avg_time_on_page>360</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>100%</exit_rate>
+			<url>http://example.org/thankyou</url>
+		</row>
+		<row>
+			<label>Page URL not defined</label>
+			<nb_visits>1</nb_visits>
+			<nb_hits>1</nb_hits>
+			<sum_time_spent>0</sum_time_spent>
+			<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			<avg_time_on_page>0</avg_time_on_page>
+			<bounce_rate>0%</bounce_rate>
+			<exit_rate>0%</exit_rate>
+			<url />
+		</row>
+	</result>
+	<result date="2011" />
+	<result date="2012" />
+	<result date="2013" />
+	<result date="2014" />
+	<result date="2015" />
+	<result date="2016" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referers.getWebsites_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referers.getWebsites_day.xml
new file mode 100644
index 0000000000..390a6a5749
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referers.getWebsites_day.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010-01-03" />
+	<result date="2010-01-04">
+		<row>
+			<label>referer.com</label>
+			<nb_uniq_visitors>1</nb_uniq_visitors>
+			<nb_visits>1</nb_visits>
+			<nb_actions>2</nb_actions>
+			<max_actions>2</max_actions>
+			<sum_visit_length>361</sum_visit_length>
+			<bounce_count>0</bounce_count>
+			<nb_visits_converted>0</nb_visits_converted>
+			<subtable>
+				<row>
+					<label>http://referer.com/page.htm?param=valuewith some spaces</label>
+					<nb_uniq_visitors>1</nb_uniq_visitors>
+					<nb_visits>1</nb_visits>
+					<nb_actions>2</nb_actions>
+					<max_actions>2</max_actions>
+					<sum_visit_length>361</sum_visit_length>
+					<bounce_count>0</bounce_count>
+					<nb_visits_converted>0</nb_visits_converted>
+				</row>
+			</subtable>
+		</row>
+	</result>
+	<result date="2010-01-05">
+		<row>
+			<label>referer.com</label>
+			<nb_uniq_visitors>1</nb_uniq_visitors>
+			<nb_visits>1</nb_visits>
+			<nb_actions>5</nb_actions>
+			<max_actions>5</max_actions>
+			<sum_visit_length>901</sum_visit_length>
+			<bounce_count>0</bounce_count>
+			<nb_visits_converted>0</nb_visits_converted>
+			<subtable>
+				<row>
+					<label>http://referer.com/Other_Page.htm</label>
+					<nb_uniq_visitors>1</nb_uniq_visitors>
+					<nb_visits>1</nb_visits>
+					<nb_actions>5</nb_actions>
+					<max_actions>5</max_actions>
+					<sum_visit_length>901</sum_visit_length>
+					<bounce_count>0</bounce_count>
+					<nb_visits_converted>0</nb_visits_converted>
+				</row>
+			</subtable>
+		</row>
+	</result>
+	<result date="2010-01-06" />
+	<result date="2010-01-07" />
+	<result date="2010-01-08" />
+	<result date="2010-01-09" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referers.getWebsites_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referers.getWebsites_month.xml
new file mode 100644
index 0000000000..87fc736ba0
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referers.getWebsites_month.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010-01">
+		<row>
+			<label>referer.com</label>
+			<nb_visits>2</nb_visits>
+			<nb_actions>7</nb_actions>
+			<max_actions>5</max_actions>
+			<sum_visit_length>1262</sum_visit_length>
+			<bounce_count>0</bounce_count>
+			<nb_visits_converted>0</nb_visits_converted>
+			<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+			<subtable>
+				<row>
+					<label>http://referer.com/Other_Page.htm</label>
+					<nb_visits>1</nb_visits>
+					<nb_actions>5</nb_actions>
+					<max_actions>5</max_actions>
+					<sum_visit_length>901</sum_visit_length>
+					<bounce_count>0</bounce_count>
+					<nb_visits_converted>0</nb_visits_converted>
+					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				</row>
+				<row>
+					<label>http://referer.com/page.htm?param=valuewith some spaces</label>
+					<nb_visits>1</nb_visits>
+					<nb_actions>2</nb_actions>
+					<max_actions>2</max_actions>
+					<sum_visit_length>361</sum_visit_length>
+					<bounce_count>0</bounce_count>
+					<nb_visits_converted>0</nb_visits_converted>
+					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				</row>
+			</subtable>
+		</row>
+	</result>
+	<result date="2010-02" />
+	<result date="2010-03" />
+	<result date="2010-04" />
+	<result date="2010-05" />
+	<result date="2010-06" />
+	<result date="2010-07" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referers.getWebsites_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referers.getWebsites_week.xml
new file mode 100644
index 0000000000..d195113692
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referers.getWebsites_week.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2009-12-28 to 2010-01-03" />
+	<result date="2010-01-04 to 2010-01-10">
+		<row>
+			<label>referer.com</label>
+			<nb_visits>2</nb_visits>
+			<nb_actions>7</nb_actions>
+			<max_actions>5</max_actions>
+			<sum_visit_length>1262</sum_visit_length>
+			<bounce_count>0</bounce_count>
+			<nb_visits_converted>0</nb_visits_converted>
+			<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+			<subtable>
+				<row>
+					<label>http://referer.com/Other_Page.htm</label>
+					<nb_visits>1</nb_visits>
+					<nb_actions>5</nb_actions>
+					<max_actions>5</max_actions>
+					<sum_visit_length>901</sum_visit_length>
+					<bounce_count>0</bounce_count>
+					<nb_visits_converted>0</nb_visits_converted>
+					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				</row>
+				<row>
+					<label>http://referer.com/page.htm?param=valuewith some spaces</label>
+					<nb_visits>1</nb_visits>
+					<nb_actions>2</nb_actions>
+					<max_actions>2</max_actions>
+					<sum_visit_length>361</sum_visit_length>
+					<bounce_count>0</bounce_count>
+					<nb_visits_converted>0</nb_visits_converted>
+					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				</row>
+			</subtable>
+		</row>
+	</result>
+	<result date="2010-01-11 to 2010-01-17" />
+	<result date="2010-01-18 to 2010-01-24" />
+	<result date="2010-01-25 to 2010-01-31" />
+	<result date="2010-02-01 to 2010-02-07" />
+	<result date="2010-02-08 to 2010-02-14" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referers.getWebsites_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referers.getWebsites_year.xml
new file mode 100644
index 0000000000..23e808e1e3
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referers.getWebsites_year.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010">
+		<row>
+			<label>referer.com</label>
+			<nb_visits>2</nb_visits>
+			<nb_actions>7</nb_actions>
+			<max_actions>5</max_actions>
+			<sum_visit_length>1262</sum_visit_length>
+			<bounce_count>0</bounce_count>
+			<nb_visits_converted>0</nb_visits_converted>
+			<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+			<subtable>
+				<row>
+					<label>http://referer.com/Other_Page.htm</label>
+					<nb_visits>1</nb_visits>
+					<nb_actions>5</nb_actions>
+					<max_actions>5</max_actions>
+					<sum_visit_length>901</sum_visit_length>
+					<bounce_count>0</bounce_count>
+					<nb_visits_converted>0</nb_visits_converted>
+					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				</row>
+				<row>
+					<label>http://referer.com/page.htm?param=valuewith some spaces</label>
+					<nb_visits>1</nb_visits>
+					<nb_actions>2</nb_actions>
+					<max_actions>2</max_actions>
+					<sum_visit_length>361</sum_visit_length>
+					<bounce_count>0</bounce_count>
+					<nb_visits_converted>0</nb_visits_converted>
+					<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+				</row>
+			</subtable>
+		</row>
+	</result>
+	<result date="2011" />
+	<result date="2012" />
+	<result date="2013" />
+	<result date="2014" />
+	<result date="2015" />
+	<result date="2016" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
new file mode 100644
index 0000000000..bf273ff429
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_day.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010-01-03" />
+	<result date="2010-01-04" />
+	<result date="2010-01-05">
+		<max_actions_returning>5</max_actions_returning>
+		<nb_actions_returning>5</nb_actions_returning>
+		<nb_uniq_visitors_returning>1</nb_uniq_visitors_returning>
+		<nb_visits_returning>1</nb_visits_returning>
+		<sum_visit_length_returning>901</sum_visit_length_returning>
+		<bounce_rate_returning>0%</bounce_rate_returning>
+		<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
+		<avg_time_on_site_returning>901</avg_time_on_site_returning>
+	</result>
+	<result date="2010-01-06" />
+	<result date="2010-01-07" />
+	<result date="2010-01-08" />
+	<result date="2010-01-09" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
new file mode 100644
index 0000000000..bedaee43c4
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_month.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010-01">
+		<max_actions_returning>5</max_actions_returning>
+		<nb_actions_returning>5</nb_actions_returning>
+		<nb_visits_returning>1</nb_visits_returning>
+		<sum_visit_length_returning>901</sum_visit_length_returning>
+		<bounce_rate_returning>0%</bounce_rate_returning>
+		<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
+		<avg_time_on_site_returning>901</avg_time_on_site_returning>
+	</result>
+	<result date="2010-02" />
+	<result date="2010-03" />
+	<result date="2010-04" />
+	<result date="2010-05" />
+	<result date="2010-06" />
+	<result date="2010-07" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
new file mode 100644
index 0000000000..50da602c21
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_week.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2009-12-28 to 2010-01-03" />
+	<result date="2010-01-04 to 2010-01-10">
+		<max_actions_returning>5</max_actions_returning>
+		<nb_actions_returning>5</nb_actions_returning>
+		<nb_visits_returning>1</nb_visits_returning>
+		<sum_visit_length_returning>901</sum_visit_length_returning>
+		<bounce_rate_returning>0%</bounce_rate_returning>
+		<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
+		<avg_time_on_site_returning>901</avg_time_on_site_returning>
+	</result>
+	<result date="2010-01-11 to 2010-01-17" />
+	<result date="2010-01-18 to 2010-01-24" />
+	<result date="2010-01-25 to 2010-01-31" />
+	<result date="2010-02-01 to 2010-02-07" />
+	<result date="2010-02-08 to 2010-02-14" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml
new file mode 100644
index 0000000000..ee9bc5d62b
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitFrequency.get_year.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010">
+		<max_actions_returning>5</max_actions_returning>
+		<nb_actions_returning>5</nb_actions_returning>
+		<nb_visits_returning>1</nb_visits_returning>
+		<sum_visit_length_returning>901</sum_visit_length_returning>
+		<bounce_rate_returning>0%</bounce_rate_returning>
+		<nb_actions_per_visit_returning>5</nb_actions_per_visit_returning>
+		<avg_time_on_site_returning>901</avg_time_on_site_returning>
+	</result>
+	<result date="2011" />
+	<result date="2012" />
+	<result date="2013" />
+	<result date="2014" />
+	<result date="2015" />
+	<result date="2016" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml
new file mode 100644
index 0000000000..be1c6c3f05
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_day.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010-01-03">
+		<bounce_count>1</bounce_count>
+		<max_actions>1</max_actions>
+		<nb_actions>1</nb_actions>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<bounce_rate>100%</bounce_rate>
+		<nb_actions_per_visit>1</nb_actions_per_visit>
+		<avg_time_on_site>0</avg_time_on_site>
+	</result>
+	<result date="2010-01-04">
+		<max_actions>2</max_actions>
+		<nb_actions>2</nb_actions>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<sum_visit_length>361</sum_visit_length>
+		<bounce_rate>0%</bounce_rate>
+		<nb_actions_per_visit>2</nb_actions_per_visit>
+		<avg_time_on_site>361</avg_time_on_site>
+	</result>
+	<result date="2010-01-05">
+		<max_actions>5</max_actions>
+		<nb_actions>5</nb_actions>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<sum_visit_length>901</sum_visit_length>
+		<bounce_rate>0%</bounce_rate>
+		<nb_actions_per_visit>5</nb_actions_per_visit>
+		<avg_time_on_site>901</avg_time_on_site>
+	</result>
+	<result date="2010-01-06" />
+	<result date="2010-01-07" />
+	<result date="2010-01-08" />
+	<result date="2010-01-09" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml
new file mode 100644
index 0000000000..97dcf9402d
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010-01">
+		<bounce_count>1</bounce_count>
+		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<nb_uniq_visitors>2</nb_uniq_visitors>
+		<nb_visits>3</nb_visits>
+		<sum_visit_length>1262</sum_visit_length>
+		<bounce_rate>33%</bounce_rate>
+		<nb_actions_per_visit>2.7</nb_actions_per_visit>
+		<avg_time_on_site>421</avg_time_on_site>
+	</result>
+	<result date="2010-02" />
+	<result date="2010-03" />
+	<result date="2010-04" />
+	<result date="2010-05" />
+	<result date="2010-06" />
+	<result date="2010-07" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml
new file mode 100644
index 0000000000..fc87cc3c73
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2009-12-28 to 2010-01-03">
+		<bounce_count>1</bounce_count>
+		<max_actions>1</max_actions>
+		<nb_actions>1</nb_actions>
+		<nb_uniq_visitors>1</nb_uniq_visitors>
+		<nb_visits>1</nb_visits>
+		<bounce_rate>100%</bounce_rate>
+		<nb_actions_per_visit>1</nb_actions_per_visit>
+		<avg_time_on_site>0</avg_time_on_site>
+	</result>
+	<result date="2010-01-04 to 2010-01-10">
+		<max_actions>5</max_actions>
+		<nb_actions>7</nb_actions>
+		<nb_uniq_visitors>2</nb_uniq_visitors>
+		<nb_visits>2</nb_visits>
+		<sum_visit_length>1262</sum_visit_length>
+		<bounce_rate>0%</bounce_rate>
+		<nb_actions_per_visit>3.5</nb_actions_per_visit>
+		<avg_time_on_site>631</avg_time_on_site>
+	</result>
+	<result date="2010-01-11 to 2010-01-17" />
+	<result date="2010-01-18 to 2010-01-24" />
+	<result date="2010-01-25 to 2010-01-31" />
+	<result date="2010-02-01 to 2010-02-07" />
+	<result date="2010-02-08 to 2010-02-14" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_year.xml
new file mode 100644
index 0000000000..11f73e549f
--- /dev/null
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_year.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<results>
+	<result date="2010">
+		<bounce_count>1</bounce_count>
+		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<nb_visits>3</nb_visits>
+		<sum_visit_length>1262</sum_visit_length>
+		<bounce_rate>33%</bounce_rate>
+		<nb_actions_per_visit>2.7</nb_actions_per_visit>
+		<avg_time_on_site>421</avg_time_on_site>
+	</result>
+	<result date="2011" />
+	<result date="2012" />
+	<result date="2013" />
+	<result date="2014" />
+	<result date="2015" />
+	<result date="2016" />
+</results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml b/tests/integration/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml
index 1c2fe9653a..e45ee1e2f5 100644
--- a/tests/integration/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml
+++ b/tests/integration/expected/test_ecommerceOrderWithItems__CustomVariables.getCustomVariables_day.xml
@@ -1,114 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
 	<row>
-		<label>Product Category</label>
-		<nb_uniq_visitors>4</nb_uniq_visitors>
-		<nb_visits>8</nb_visits>
-		<nb_actions>13</nb_actions>
-		<subtable>
-			<row>
-				<label>Electronics &amp; Cameras</label>
-				<nb_uniq_visitors>2</nb_uniq_visitors>
-				<nb_visits>3</nb_visits>
-				<nb_actions>6</nb_actions>
-				<price_viewed>814.37</price_viewed>
-			</row>
-			<row>
-				<label>Value not defined</label>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
-				<nb_visits>3</nb_visits>
-				<nb_actions>5</nb_actions>
-				<price_viewed>666</price_viewed>
-			</row>
-			<row>
-				<label>Category TWO LEFT in cart</label>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
-				<nb_visits>2</nb_visits>
-				<nb_actions>2</nb_actions>
-			</row>
-			<row>
-				<label>Multiple Category 1</label>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
-				<nb_visits>1</nb_visits>
-				<nb_actions>1</nb_actions>
-			</row>
-			<row>
-				<label>Multiple Category 2</label>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
-				<nb_visits>1</nb_visits>
-				<nb_actions>1</nb_actions>
-			</row>
-			<row>
-				<label>Multiple Category 4</label>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
-				<nb_visits>1</nb_visits>
-				<nb_actions>1</nb_actions>
-			</row>
-			<row>
-				<label>Multiple Category 5</label>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
-				<nb_visits>1</nb_visits>
-				<nb_actions>1</nb_actions>
-			</row>
-		</subtable>
-	</row>
-	<row>
-		<label>Product Name</label>
-		<nb_uniq_visitors>3</nb_uniq_visitors>
-		<nb_visits>6</nb_visits>
-		<nb_actions>11</nb_actions>
-		<subtable>
-			<row>
-				<label>PRODUCT name</label>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
-				<nb_visits>2</nb_visits>
-				<nb_actions>5</nb_actions>
-				<price_viewed>814.37</price_viewed>
-			</row>
-			<row>
-				<label>PRODUCT THREE LEFT in cart</label>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
-				<nb_visits>2</nb_visits>
-				<nb_actions>4</nb_actions>
-				<price_viewed>666</price_viewed>
-			</row>
-			<row>
-				<label>PRODUCT TWO LEFT in cart</label>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
-				<nb_visits>2</nb_visits>
-				<nb_actions>2</nb_actions>
-			</row>
-		</subtable>
-	</row>
-	<row>
-		<label>Product SKU</label>
-		<nb_uniq_visitors>3</nb_uniq_visitors>
-		<nb_visits>6</nb_visits>
-		<nb_actions>11</nb_actions>
-		<subtable>
-			<row>
-				<label>SKU VERY nice indeed</label>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
-				<nb_visits>3</nb_visits>
-				<nb_actions>8</nb_actions>
-				<price_viewed>666</price_viewed>
-			</row>
-			<row>
-				<label>SKU IN ABANDONED CART TWO</label>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
-				<nb_visits>2</nb_visits>
-				<nb_actions>2</nb_actions>
-			</row>
-			<row>
-				<label>SKU2</label>
-				<nb_uniq_visitors>1</nb_uniq_visitors>
-				<nb_visits>1</nb_visits>
-				<nb_actions>1</nb_actions>
-				<price_viewed>1111.11</price_viewed>
-			</row>
-		</subtable>
-	</row>
-	<row>
 		<label>VisitorType</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>3</nb_visits>
@@ -238,4 +130,106 @@
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>Product Category</label>
+		<nb_actions>13</nb_actions>
+		<subtable>
+			<row>
+				<label>Value not defined</label>
+				<nb_uniq_visitors>1</nb_uniq_visitors>
+				<nb_visits>3</nb_visits>
+				<nb_actions>5</nb_actions>
+				<price_viewed>666</price_viewed>
+			</row>
+			<row>
+				<label>Electronics &amp; Cameras</label>
+				<nb_uniq_visitors>2</nb_uniq_visitors>
+				<nb_visits>3</nb_visits>
+				<nb_actions>6</nb_actions>
+				<price_viewed>814.37</price_viewed>
+			</row>
+			<row>
+				<label>Category TWO LEFT in cart</label>
+				<nb_uniq_visitors>1</nb_uniq_visitors>
+				<nb_visits>2</nb_visits>
+				<nb_actions>2</nb_actions>
+			</row>
+			<row>
+				<label>Multiple Category 5</label>
+				<nb_uniq_visitors>1</nb_uniq_visitors>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+			<row>
+				<label>Multiple Category 4</label>
+				<nb_uniq_visitors>1</nb_uniq_visitors>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+			<row>
+				<label>Multiple Category 1</label>
+				<nb_uniq_visitors>1</nb_uniq_visitors>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+			<row>
+				<label>Multiple Category 2</label>
+				<nb_uniq_visitors>1</nb_uniq_visitors>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Product SKU</label>
+		<nb_actions>11</nb_actions>
+		<subtable>
+			<row>
+				<label>SKU VERY nice indeed</label>
+				<nb_uniq_visitors>1</nb_uniq_visitors>
+				<nb_visits>3</nb_visits>
+				<nb_actions>8</nb_actions>
+				<price_viewed>666</price_viewed>
+			</row>
+			<row>
+				<label>SKU IN ABANDONED CART TWO</label>
+				<nb_uniq_visitors>1</nb_uniq_visitors>
+				<nb_visits>2</nb_visits>
+				<nb_actions>2</nb_actions>
+			</row>
+			<row>
+				<label>SKU2</label>
+				<nb_uniq_visitors>1</nb_uniq_visitors>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<price_viewed>1111.11</price_viewed>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Product Name</label>
+		<nb_actions>11</nb_actions>
+		<subtable>
+			<row>
+				<label>PRODUCT TWO LEFT in cart</label>
+				<nb_uniq_visitors>1</nb_uniq_visitors>
+				<nb_visits>2</nb_visits>
+				<nb_actions>2</nb_actions>
+			</row>
+			<row>
+				<label>PRODUCT THREE LEFT in cart</label>
+				<nb_uniq_visitors>1</nb_uniq_visitors>
+				<nb_visits>2</nb_visits>
+				<nb_actions>4</nb_actions>
+				<price_viewed>666</price_viewed>
+			</row>
+			<row>
+				<label>PRODUCT name</label>
+				<nb_uniq_visitors>1</nb_uniq_visitors>
+				<nb_visits>2</nb_visits>
+				<nb_actions>5</nb_actions>
+				<price_viewed>814.37</price_viewed>
+			</row>
+		</subtable>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getDownload_day.xml b/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getDownload_day.xml
index 1c598ec49c..106f23f16b 100644
--- a/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getDownload_day.xml
+++ b/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getDownload_day.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
-	<result defaultKeyName="2009-01-04" />
-	<result defaultKeyName="2009-01-05" />
-	<result defaultKeyName="2009-01-06" />
-	<result defaultKeyName="2009-01-07" />
-	<result defaultKeyName="2009-01-08" />
-	<result defaultKeyName="2009-01-09" />
-	<result defaultKeyName="2009-01-10" />
+	<result date="2009-01-04" />
+	<result date="2009-01-05" />
+	<result date="2009-01-06" />
+	<result date="2009-01-07" />
+	<result date="2009-01-08" />
+	<result date="2009-01-09" />
+	<result date="2009-01-10" />
 </results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getDownload_week.xml b/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getDownload_week.xml
index 7fd44d3e50..915e319c6e 100644
--- a/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getDownload_week.xml
+++ b/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getDownload_week.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
-	<result defaultKeyName="2008-12-29 to 2009-01-04" />
-	<result defaultKeyName="2009-01-05 to 2009-01-11" />
-	<result defaultKeyName="2009-01-12 to 2009-01-18" />
-	<result defaultKeyName="2009-01-19 to 2009-01-25" />
-	<result defaultKeyName="2009-01-26 to 2009-02-01" />
-	<result defaultKeyName="2009-02-02 to 2009-02-08" />
-	<result defaultKeyName="2009-02-09 to 2009-02-15" />
+	<result date="2008-12-29 to 2009-01-04" />
+	<result date="2009-01-05 to 2009-01-11" />
+	<result date="2009-01-12 to 2009-01-18" />
+	<result date="2009-01-19 to 2009-01-25" />
+	<result date="2009-01-26 to 2009-02-01" />
+	<result date="2009-02-02 to 2009-02-08" />
+	<result date="2009-02-09 to 2009-02-15" />
 </results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlink_day.xml b/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlink_day.xml
index 1c598ec49c..106f23f16b 100644
--- a/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlink_day.xml
+++ b/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlink_day.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
-	<result defaultKeyName="2009-01-04" />
-	<result defaultKeyName="2009-01-05" />
-	<result defaultKeyName="2009-01-06" />
-	<result defaultKeyName="2009-01-07" />
-	<result defaultKeyName="2009-01-08" />
-	<result defaultKeyName="2009-01-09" />
-	<result defaultKeyName="2009-01-10" />
+	<result date="2009-01-04" />
+	<result date="2009-01-05" />
+	<result date="2009-01-06" />
+	<result date="2009-01-07" />
+	<result date="2009-01-08" />
+	<result date="2009-01-09" />
+	<result date="2009-01-10" />
 </results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlink_week.xml b/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlink_week.xml
index 7fd44d3e50..915e319c6e 100644
--- a/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlink_week.xml
+++ b/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getOutlink_week.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
-	<result defaultKeyName="2008-12-29 to 2009-01-04" />
-	<result defaultKeyName="2009-01-05 to 2009-01-11" />
-	<result defaultKeyName="2009-01-12 to 2009-01-18" />
-	<result defaultKeyName="2009-01-19 to 2009-01-25" />
-	<result defaultKeyName="2009-01-26 to 2009-02-01" />
-	<result defaultKeyName="2009-02-02 to 2009-02-08" />
-	<result defaultKeyName="2009-02-09 to 2009-02-15" />
+	<result date="2008-12-29 to 2009-01-04" />
+	<result date="2009-01-05 to 2009-01-11" />
+	<result date="2009-01-12 to 2009-01-18" />
+	<result date="2009-01-19 to 2009-01-25" />
+	<result date="2009-01-26 to 2009-02-01" />
+	<result date="2009-02-02 to 2009-02-08" />
+	<result date="2009-02-09 to 2009-02-15" />
 </results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitle_day.xml b/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitle_day.xml
index 1c598ec49c..106f23f16b 100644
--- a/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitle_day.xml
+++ b/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitle_day.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
-	<result defaultKeyName="2009-01-04" />
-	<result defaultKeyName="2009-01-05" />
-	<result defaultKeyName="2009-01-06" />
-	<result defaultKeyName="2009-01-07" />
-	<result defaultKeyName="2009-01-08" />
-	<result defaultKeyName="2009-01-09" />
-	<result defaultKeyName="2009-01-10" />
+	<result date="2009-01-04" />
+	<result date="2009-01-05" />
+	<result date="2009-01-06" />
+	<result date="2009-01-07" />
+	<result date="2009-01-08" />
+	<result date="2009-01-09" />
+	<result date="2009-01-10" />
 </results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitle_week.xml b/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitle_week.xml
index 7fd44d3e50..915e319c6e 100644
--- a/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitle_week.xml
+++ b/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getPageTitle_week.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
-	<result defaultKeyName="2008-12-29 to 2009-01-04" />
-	<result defaultKeyName="2009-01-05 to 2009-01-11" />
-	<result defaultKeyName="2009-01-12 to 2009-01-18" />
-	<result defaultKeyName="2009-01-19 to 2009-01-25" />
-	<result defaultKeyName="2009-01-26 to 2009-02-01" />
-	<result defaultKeyName="2009-02-02 to 2009-02-08" />
-	<result defaultKeyName="2009-02-09 to 2009-02-15" />
+	<result date="2008-12-29 to 2009-01-04" />
+	<result date="2009-01-05 to 2009-01-11" />
+	<result date="2009-01-12 to 2009-01-18" />
+	<result date="2009-01-19 to 2009-01-25" />
+	<result date="2009-01-26 to 2009-02-01" />
+	<result date="2009-02-02 to 2009-02-08" />
+	<result date="2009-02-09 to 2009-02-15" />
 </results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrl_day.xml b/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrl_day.xml
index 1c598ec49c..106f23f16b 100644
--- a/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrl_day.xml
+++ b/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrl_day.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
-	<result defaultKeyName="2009-01-04" />
-	<result defaultKeyName="2009-01-05" />
-	<result defaultKeyName="2009-01-06" />
-	<result defaultKeyName="2009-01-07" />
-	<result defaultKeyName="2009-01-08" />
-	<result defaultKeyName="2009-01-09" />
-	<result defaultKeyName="2009-01-10" />
+	<result date="2009-01-04" />
+	<result date="2009-01-05" />
+	<result date="2009-01-06" />
+	<result date="2009-01-07" />
+	<result date="2009-01-08" />
+	<result date="2009-01-09" />
+	<result date="2009-01-10" />
 </results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrl_week.xml b/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrl_week.xml
index 7fd44d3e50..915e319c6e 100644
--- a/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrl_week.xml
+++ b/tests/integration/expected/test_noVisit_PeriodIsLast__Actions.getPageUrl_week.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <results>
-	<result defaultKeyName="2008-12-29 to 2009-01-04" />
-	<result defaultKeyName="2009-01-05 to 2009-01-11" />
-	<result defaultKeyName="2009-01-12 to 2009-01-18" />
-	<result defaultKeyName="2009-01-19 to 2009-01-25" />
-	<result defaultKeyName="2009-01-26 to 2009-02-01" />
-	<result defaultKeyName="2009-02-02 to 2009-02-08" />
-	<result defaultKeyName="2009-02-09 to 2009-02-15" />
+	<result date="2008-12-29 to 2009-01-04" />
+	<result date="2009-01-05 to 2009-01-11" />
+	<result date="2009-01-12 to 2009-01-18" />
+	<result date="2009-01-19 to 2009-01-25" />
+	<result date="2009-01-26 to 2009-02-01" />
+	<result date="2009-02-02 to 2009-02-08" />
+	<result date="2009-02-09 to 2009-02-15" />
 </results>
\ No newline at end of file
diff --git a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
index b8d19de225..943746aadb 100644
--- a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
+++ b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
@@ -10,18 +10,18 @@
 		<goals>
 			<row idgoal='1'>
 				<nb_conversions>2</nb_conversions>
-				
+				<nb_visits_converted>2</nb_visits_converted>
 				<revenue>1000</revenue>
 			</row>
 			<row idgoal='2'>
 				<nb_conversions>1</nb_conversions>
-				
+				<nb_visits_converted>1</nb_visits_converted>
 				<revenue>0</revenue>
 			</row>
 		</goals>
 		<nb_conversions>3</nb_conversions>
 		<revenue>1000</revenue>
-		
+		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<subtable>
 			<row>
 				<label>LoggedOut</label>
@@ -33,18 +33,18 @@
 				<goals>
 					<row idgoal='1'>
 						<nb_conversions>1</nb_conversions>
-						
+						<nb_visits_converted>1</nb_visits_converted>
 						<revenue>1000</revenue>
 					</row>
 					<row idgoal='2'>
 						<nb_conversions>1</nb_conversions>
-						
+						<nb_visits_converted>1</nb_visits_converted>
 						<revenue>0</revenue>
 					</row>
 				</goals>
 				<nb_conversions>2</nb_conversions>
 				<revenue>1000</revenue>
-				
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			</row>
 			<row>
 				<label>LoggedIn</label>
@@ -56,13 +56,13 @@
 				<goals>
 					<row idgoal='1'>
 						<nb_conversions>1</nb_conversions>
-						
+						<nb_visits_converted>1</nb_visits_converted>
 						<revenue>0</revenue>
 					</row>
 				</goals>
 				<nb_conversions>1</nb_conversions>
 				<revenue>0</revenue>
-				
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			</row>
 		</subtable>
 	</row>
@@ -76,13 +76,13 @@
 		<goals>
 			<row idgoal='1'>
 				<nb_conversions>1</nb_conversions>
-				
+				<nb_visits_converted>1</nb_visits_converted>
 				<revenue>1000</revenue>
 			</row>
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>1000</revenue>
-		
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<subtable>
 			<row>
 				<label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label>
@@ -94,13 +94,13 @@
 				<goals>
 					<row idgoal='1'>
 						<nb_conversions>1</nb_conversions>
-						
+						<nb_visits_converted>1</nb_visits_converted>
 						<revenue>1000</revenue>
 					</row>
 				</goals>
 				<nb_conversions>1</nb_conversions>
 				<revenue>1000</revenue>
-				
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			</row>
 		</subtable>
 	</row>
@@ -114,13 +114,13 @@
 		<goals>
 			<row idgoal='1'>
 				<nb_conversions>1</nb_conversions>
-				
+				<nb_visits_converted>1</nb_visits_converted>
 				<revenue>0</revenue>
 			</row>
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>0</revenue>
-		
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<subtable>
 			<row>
 				<label>Value not defined</label>
@@ -132,13 +132,13 @@
 				<goals>
 					<row idgoal='1'>
 						<nb_conversions>1</nb_conversions>
-						
+						<nb_visits_converted>1</nb_visits_converted>
 						<revenue>0</revenue>
 					</row>
 				</goals>
 				<nb_conversions>1</nb_conversions>
 				<revenue>0</revenue>
-				
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			</row>
 		</subtable>
 	</row>
@@ -152,13 +152,13 @@
 		<goals>
 			<row idgoal='1'>
 				<nb_conversions>1</nb_conversions>
-				
+				<nb_visits_converted>1</nb_visits_converted>
 				<revenue>0</revenue>
 			</row>
 		</goals>
 		<nb_conversions>1</nb_conversions>
 		<revenue>0</revenue>
-		
+		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<subtable>
 			<row>
 				<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
@@ -170,13 +170,55 @@
 				<goals>
 					<row idgoal='1'>
 						<nb_conversions>1</nb_conversions>
-						
+						<nb_visits_converted>1</nb_visits_converted>
 						<revenue>0</revenue>
 					</row>
 				</goals>
 				<nb_conversions>1</nb_conversions>
 				<revenue>0</revenue>
-				
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Status user</label>
+		<nb_actions>3</nb_actions>
+		<subtable>
+			<row>
+				<label>looking at profile page</label>
+				<nb_visits>2</nb_visits>
+				<nb_actions>2</nb_actions>
+				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+			</row>
+			<row>
+				<label>Loggedin</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
+		<nb_actions>1</nb_actions>
+		<subtable>
+			<row>
+				<label>Value not defined</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+			</row>
+		</subtable>
+	</row>
+	<row>
+		<label>Language</label>
+		<nb_actions>1</nb_actions>
+		<subtable>
+			<row>
+				<label>FR</label>
+				<nb_visits>1</nb_visits>
+				<nb_actions>1</nb_actions>
+				<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 			</row>
 		</subtable>
 	</row>
diff --git a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
index 8d99e44fb8..014329e271 100644
--- a/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
+++ b/tests/integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
@@ -221,6 +221,16 @@
 				<pageIdAction>4</pageIdAction>
 				<pageId>3</pageId>
 				
+				<customVariables>
+					<row>
+						<customVariableName1>Language</customVariableName1>
+						<customVariableValue1>FR</customVariableValue1>
+					</row>
+					<row>
+						<customVariableName4>Status user</customVariableName4>
+						<customVariableValue4>looking at profile page</customVariableValue4>
+					</row>
+				</customVariables>
 				<icon />
 			</row>
 			<row>
@@ -230,6 +240,16 @@
 				<pageIdAction>4</pageIdAction>
 				<pageId>2</pageId>
 				
+				<customVariables>
+					<row>
+						<customVariableName4>Status user</customVariableName4>
+						<customVariableValue4>Loggedin</customVariableValue4>
+					</row>
+					<row>
+						<customVariableName5>Status user</customVariableName5>
+						<customVariableValue5>looking at profile page</customVariableValue5>
+					</row>
+				</customVariables>
 				<icon />
 			</row>
 		</actionDetails>
diff --git a/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml b/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml
index 28d186c979..5b4e18c03d 100644
--- a/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml
+++ b/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml
@@ -182,6 +182,48 @@
 					</row>
 				</subtable>
 			</row>
+			<row>
+				<label>Status user</label>
+				<nb_actions>3</nb_actions>
+				<subtable>
+					<row>
+						<label>looking at profile page</label>
+						<nb_uniq_visitors>2</nb_uniq_visitors>
+						<nb_visits>2</nb_visits>
+						<nb_actions>2</nb_actions>
+					</row>
+					<row>
+						<label>Loggedin</label>
+						<nb_uniq_visitors>1</nb_uniq_visitors>
+						<nb_visits>1</nb_visits>
+						<nb_actions>1</nb_actions>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
+				<nb_actions>1</nb_actions>
+				<subtable>
+					<row>
+						<label>Value not defined</label>
+						<nb_uniq_visitors>1</nb_uniq_visitors>
+						<nb_visits>1</nb_visits>
+						<nb_actions>1</nb_actions>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>Language</label>
+				<nb_actions>1</nb_actions>
+				<subtable>
+					<row>
+						<label>FR</label>
+						<nb_uniq_visitors>1</nb_uniq_visitors>
+						<nb_visits>1</nb_visits>
+						<nb_actions>1</nb_actions>
+					</row>
+				</subtable>
+			</row>
 		</result>
 		<result date="2010-01-04" />
 		<result date="2010-01-05" />
diff --git a/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml b/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml
index 2b25ac4bcb..ac3f3fd3fc 100644
--- a/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml
+++ b/tests/integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml
@@ -182,6 +182,48 @@
 					</row>
 				</subtable>
 			</row>
+			<row>
+				<label>Status user</label>
+				<nb_actions>3</nb_actions>
+				<subtable>
+					<row>
+						<label>looking at profile page</label>
+						<nb_visits>2</nb_visits>
+						<nb_actions>2</nb_actions>
+						<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+					</row>
+					<row>
+						<label>Loggedin</label>
+						<nb_visits>1</nb_visits>
+						<nb_actions>1</nb_actions>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
+				<nb_actions>1</nb_actions>
+				<subtable>
+					<row>
+						<label>Value not defined</label>
+						<nb_visits>1</nb_visits>
+						<nb_actions>1</nb_actions>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>Language</label>
+				<nb_actions>1</nb_actions>
+				<subtable>
+					<row>
+						<label>FR</label>
+						<nb_visits>1</nb_visits>
+						<nb_actions>1</nb_actions>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					</row>
+				</subtable>
+			</row>
 		</result>
 		<result date="2010-01-04 to 2010-01-10" />
 		<result date="2010-01-11 to 2010-01-17" />
diff --git a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
index 28d186c979..5b4e18c03d 100644
--- a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
+++ b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
@@ -182,6 +182,48 @@
 					</row>
 				</subtable>
 			</row>
+			<row>
+				<label>Status user</label>
+				<nb_actions>3</nb_actions>
+				<subtable>
+					<row>
+						<label>looking at profile page</label>
+						<nb_uniq_visitors>2</nb_uniq_visitors>
+						<nb_visits>2</nb_visits>
+						<nb_actions>2</nb_actions>
+					</row>
+					<row>
+						<label>Loggedin</label>
+						<nb_uniq_visitors>1</nb_uniq_visitors>
+						<nb_visits>1</nb_visits>
+						<nb_actions>1</nb_actions>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
+				<nb_actions>1</nb_actions>
+				<subtable>
+					<row>
+						<label>Value not defined</label>
+						<nb_uniq_visitors>1</nb_uniq_visitors>
+						<nb_visits>1</nb_visits>
+						<nb_actions>1</nb_actions>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>Language</label>
+				<nb_actions>1</nb_actions>
+				<subtable>
+					<row>
+						<label>FR</label>
+						<nb_uniq_visitors>1</nb_uniq_visitors>
+						<nb_visits>1</nb_visits>
+						<nb_actions>1</nb_actions>
+					</row>
+				</subtable>
+			</row>
 		</result>
 		<result date="2010-01-04" />
 		<result date="2010-01-05" />
diff --git a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
index 2b25ac4bcb..ac3f3fd3fc 100644
--- a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
+++ b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
@@ -182,6 +182,48 @@
 					</row>
 				</subtable>
 			</row>
+			<row>
+				<label>Status user</label>
+				<nb_actions>3</nb_actions>
+				<subtable>
+					<row>
+						<label>looking at profile page</label>
+						<nb_visits>2</nb_visits>
+						<nb_actions>2</nb_actions>
+						<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+					</row>
+					<row>
+						<label>Loggedin</label>
+						<nb_visits>1</nb_visits>
+						<nb_actions>1</nb_actions>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
+				<nb_actions>1</nb_actions>
+				<subtable>
+					<row>
+						<label>Value not defined</label>
+						<nb_visits>1</nb_visits>
+						<nb_actions>1</nb_actions>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>Language</label>
+				<nb_actions>1</nb_actions>
+				<subtable>
+					<row>
+						<label>FR</label>
+						<nb_visits>1</nb_visits>
+						<nb_actions>1</nb_actions>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					</row>
+				</subtable>
+			</row>
 		</result>
 		<result date="2010-01-04 to 2010-01-10" />
 		<result date="2010-01-11 to 2010-01-17" />
diff --git a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
index cd0a713ac9..0d96c8759e 100644
--- a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
+++ b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
@@ -133,6 +133,48 @@
 					</row>
 				</subtable>
 			</row>
+			<row>
+				<label>Status user</label>
+				<nb_actions>3</nb_actions>
+				<subtable>
+					<row>
+						<label>looking at profile page</label>
+						<nb_uniq_visitors>2</nb_uniq_visitors>
+						<nb_visits>2</nb_visits>
+						<nb_actions>2</nb_actions>
+					</row>
+					<row>
+						<label>Loggedin</label>
+						<nb_uniq_visitors>1</nb_uniq_visitors>
+						<nb_visits>1</nb_visits>
+						<nb_actions>1</nb_actions>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
+				<nb_actions>1</nb_actions>
+				<subtable>
+					<row>
+						<label>Value not defined</label>
+						<nb_uniq_visitors>1</nb_uniq_visitors>
+						<nb_visits>1</nb_visits>
+						<nb_actions>1</nb_actions>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>Language</label>
+				<nb_actions>1</nb_actions>
+				<subtable>
+					<row>
+						<label>FR</label>
+						<nb_uniq_visitors>1</nb_uniq_visitors>
+						<nb_visits>1</nb_visits>
+						<nb_actions>1</nb_actions>
+					</row>
+				</subtable>
+			</row>
 		</result>
 		<result date="2010-01-04" />
 		<result date="2010-01-05" />
diff --git a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
index 52fae48742..f809f87888 100644
--- a/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
+++ b/tests/integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
@@ -133,6 +133,48 @@
 					</row>
 				</subtable>
 			</row>
+			<row>
+				<label>Status user</label>
+				<nb_actions>3</nb_actions>
+				<subtable>
+					<row>
+						<label>looking at profile page</label>
+						<nb_visits>2</nb_visits>
+						<nb_actions>2</nb_actions>
+						<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+					</row>
+					<row>
+						<label>Loggedin</label>
+						<nb_visits>1</nb_visits>
+						<nb_actions>1</nb_actions>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
+				<nb_actions>1</nb_actions>
+				<subtable>
+					<row>
+						<label>Value not defined</label>
+						<nb_visits>1</nb_visits>
+						<nb_actions>1</nb_actions>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					</row>
+				</subtable>
+			</row>
+			<row>
+				<label>Language</label>
+				<nb_actions>1</nb_actions>
+				<subtable>
+					<row>
+						<label>FR</label>
+						<nb_visits>1</nb_visits>
+						<nb_actions>1</nb_actions>
+						<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+					</row>
+				</subtable>
+			</row>
 		</result>
 		<result date="2010-01-04 to 2010-01-10" />
 		<result date="2010-01-11 to 2010-01-17" />