diff --git a/core/DataTable/Renderer/Csv.php b/core/DataTable/Renderer/Csv.php
index 41d13c99628125100a423c0ce9ac6b69a2ec7e16..01cea0e5c23551427970cc330237847008f5c60d 100644
--- a/core/DataTable/Renderer/Csv.php
+++ b/core/DataTable/Renderer/Csv.php
@@ -93,25 +93,16 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer
 		$this->separator = $separator;
 	}
 	
-	protected function renderTable($table)
+	protected function renderTable($table, &$allColumns = array() )
 	{
 		if($table instanceof Piwik_DataTable_Array)
 		{
-			$str = $header = '';
-			$keyName = $table->getKeyName();
-			if ($this->translateColumnNames)
-			{
-				$keyName = $this->translateColumnName($keyName);
-			}
-			$prefixColumns = $keyName . $this->separator;
+			$str = '';
 			foreach($table->getArray() as $currentLinePrefix => $dataTable)
 			{
-				$returned = explode("\n",$this->renderTable($dataTable));
-				// get the columns names
-				if(empty($header))
-				{
-					$header = $returned[0];
-				}
+				$returned = explode("\n",$this->renderTable($dataTable, $allColumns));
+				
+				// get rid of the columns names
 				$returned = array_slice($returned,1);
 				
 				// case empty datatable we dont print anything in the CSV export
@@ -125,19 +116,21 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer
 					$str .= "\n" .  implode("\n", $returned);
 				}
 			}
-			if(!empty($header))
-			{
-				$str = $prefixColumns . $header . $str;
-			}
+			
+			// prepend table key to column list
+			$allColumns = array_merge(array($table->getKeyName() => true), $allColumns);
+			
+			// add header to output string
+			$str = $this->getHeaderLine(array_keys($allColumns)).$str;
 		}
 		else
 		{
-			$str = $this->renderDataTable($table);
+			$str = $this->renderDataTable($table, $allColumns);
 		}
 		return $str;
 	}
 	
-	protected function renderDataTable( $table )
+	protected function renderDataTable( $table, &$allColumns = array() )
 	{	
 		if($table instanceof Piwik_DataTable_Simple)
 		{
@@ -147,13 +140,16 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer
 				$columnNameToValue = $row->getColumns();
 				if(count($columnNameToValue) == 1)
 				{
+					// simple tables should only have one column, the value
+					$allColumns['value'] = true;
+					
 					$value = array_values($columnNameToValue);
 					$str = 'value' . $this->lineEnd . $this->formatValue($value[0]);
 					return $str;
 				}
 			}
 		}
-		$csv = $allColumns = array();
+		$csv = array();
 		foreach($table->getRows() as $row)
 		{
 			$csvRow = array();
@@ -256,13 +252,7 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer
 		else
 		{
 			// render row names
-			$keys = array_keys($allColumns);
-			if ($this->translateColumnNames)
-			{
-				$keys = $this->translateColumnNames($keys);
-			}
-			$str .= implode($this->separator, $keys);
-			$str .= $this->lineEnd;
+			$str .= $this->getHeaderLine(array_keys($allColumns)).$this->lineEnd;
 		}
 		
 		// we render the CSV
@@ -280,6 +270,21 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer
 		$str = substr($str, 0, -strlen($this->lineEnd));
 		return $str;
 	}
+	
+	/**
+	 * Returns the CSV header line for a set of metrics. Will translate columns if desired.
+	 * 
+	 * @param array $columnMetrics
+	 * @return array
+	 */
+	private function getHeaderLine( $columnMetrics )
+	{
+		if ($this->translateColumnNames)
+		{
+			$columnMetrics = $this->translateColumnNames($columnMetrics);
+		}
+		return implode($this->separator, $columnMetrics);
+	}
 
 	protected function formatValue($value)
 	{
diff --git a/tests/integration/OneVisitorTwoVisits.test.php b/tests/integration/OneVisitorTwoVisits.test.php
index 78a3c9ffc8870ed6748e4ac2c6a8fb61db56fe1f..30548d9ffc786eb9b43f302367a2d5b51cef2504 100755
--- a/tests/integration/OneVisitorTwoVisits.test.php
+++ b/tests/integration/OneVisitorTwoVisits.test.php
@@ -10,7 +10,7 @@ require_once PIWIK_INCLUDE_PATH . '/tests/integration/Integration.php';
  * This use case covers many simple tracking features.
  * - Tracking Goal by manual trigger, and URL matching, with custom revenue
  * - Tracking the same Goal twice only records it once
- * - Tracks 2 page views, a click and a file download
+ * - Tracks 4 page views: 3 clicks and a file download
  * - URLs parameters exclude is tested
  * - In a returning visit, tracks a Goal conversion 
  *   URL matching, with custom referer and keyword
@@ -24,8 +24,16 @@ class Test_Piwik_Integration_OneVisitorTwoVisits extends Test_Integration_Facade
 
 	public function getApiToTest()
 	{
+		$enExtraParam = array('expanded' => 1, 'flat' => 1, 'include_aggregate_rows' => 0, 'translateColumnNames' => 1);
 		return array(
 			array('all', array('idSite' => $this->idSite, 'date' => $this->dateTime)),
+			
+			// test API.get (for bug that incorrectly reorders columns of CSV output)
+			//   note: bug only affects rows after first
+			array('API.get', array('idSite' => $this->idSite, 'date' => '2009-10-01', 'format' => 'csv',
+								   'periods' => array('month'), 'setDateLastN' => true,
+								   'otherRequestParameters' => $enExtraParam, 'language' => 'en',
+								   'testSuffix' => '_csv')),
 		);
 	}
 
@@ -84,6 +92,12 @@ class Test_Piwik_Integration_OneVisitorTwoVisits extends Test_Integration_Facade
 		$t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.2)->getDatetime());
 		$this->checkResponse($t->doTrackAction( 'http://piwik.org/path/again/latest.zip', 'download' ));
 		
+		// Click on two more external links, one the same as before (5th & 6th actions)
+		$t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.22)->getDateTime());
+		$this->checkResponse($t->doTrackAction('http://outlinks.org/other_outlink', 'link'));
+		$t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.25)->getDateTime());
+		$this->checkResponse($t->doTrackAction('http://dev.piwik.org/svn', 'link'));
+		
 		// Create Goal 1: Triggered by JS, after 18 minutes
 		$idGoal = Piwik_Goals_API::getInstance()->addGoal($idSite, 'triggered js', 'manually', '', '');
 		$t->setForceVisitDateTime(Piwik_Date::factory($dateTime)->addHour(0.3)->getDatetime());
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getDownload_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getDownload_day.xml
index d4805af2153be483184f57e9f29d4f6b3668369b..32470e4bcbcbbfa7a9938fdc630fc1ae8665a2f2 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getDownload_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getDownload_day.xml
@@ -5,7 +5,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>1</nb_hits>
-		<sum_time_spent>180</sum_time_spent>
+		<sum_time_spent>72</sum_time_spent>
 		<url>http://piwik.org/path/again/latest.zip</url>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getDownloads_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getDownloads_day.xml
index 59eee28a17afa06a1558e01d88dae711c7fb351e..c064136f4346ff3daf2406ccf7e51ea9d6ec4f62 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getDownloads_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getDownloads_day.xml
@@ -4,14 +4,14 @@
 		<label>piwik.org</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
-		<sum_time_spent>180</sum_time_spent>
+		<sum_time_spent>72</sum_time_spent>
 		<subtable>
 			<row>
 				<label>/path/again/latest.zip</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>
+				<sum_time_spent>72</sum_time_spent>
 				<url>http://piwik.org/path/again/latest.zip</url>
 			</row>
 		</subtable>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml
index 724b463fc9928b2f8bbacc9207f2ffeb821ecf08..838606a12ec31674138ac048bb7b3d3b974012a6 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml
@@ -32,7 +32,7 @@
 		<sum_time_spent>180</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_nb_actions>7</entry_nb_actions>
 		<entry_sum_visit_length>1621</entry_sum_visit_length>
 		<entry_bounce_count>0</entry_bounce_count>
 		<avg_time_on_page>180</avg_time_on_page>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml
index 724b463fc9928b2f8bbacc9207f2ffeb821ecf08..838606a12ec31674138ac048bb7b3d3b974012a6 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml
@@ -32,7 +32,7 @@
 		<sum_time_spent>180</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_nb_actions>7</entry_nb_actions>
 		<entry_sum_visit_length>1621</entry_sum_visit_length>
 		<entry_bounce_count>0</entry_bounce_count>
 		<avg_time_on_page>180</avg_time_on_page>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getOutlink_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getOutlink_day.xml
index f079748c3736b2c6e007e8483b8a59f1916e0973..597186332640a8a2e7868a5db30cd75fad63eafe 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getOutlink_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getOutlink_day.xml
@@ -4,8 +4,8 @@
 		<label>/svn</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>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>540</sum_time_spent>
 		<url>http://dev.piwik.org/svn</url>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getOutlinks_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getOutlinks_day.xml
index cfb9e890ea1e53db6f0d969ba9cfe4d0f105aab6..539d798e9bc884d4c0babe52bd864ff99aeda36f 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getOutlinks_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getOutlinks_day.xml
@@ -3,17 +3,33 @@
 	<row>
 		<label>dev.piwik.org</label>
 		<nb_visits>1</nb_visits>
-		<nb_hits>1</nb_hits>
-		<sum_time_spent>360</sum_time_spent>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>540</sum_time_spent>
 		<subtable>
 			<row>
 				<label>/svn</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>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>540</sum_time_spent>
 				<url>http://dev.piwik.org/svn</url>
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>outlinks.org</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>1</nb_hits>
+		<sum_time_spent>108</sum_time_spent>
+		<subtable>
+			<row>
+				<label>/other_outlink</label>
+				<nb_visits>1</nb_visits>
+				<nb_uniq_visitors>1</nb_uniq_visitors>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>108</sum_time_spent>
+				<url>http://outlinks.org/other_outlink</url>
+			</row>
+		</subtable>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml
index e57dd376e5563a8c46631af372c7d02272cd34f8..4aff330ec5933d16c453c3f3a0885e8b4beaf278 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml
@@ -41,7 +41,7 @@
 		<sum_time_spent>180</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_nb_actions>7</entry_nb_actions>
 		<entry_sum_visit_length>1621</entry_sum_visit_length>
 		<entry_bounce_count>0</entry_bounce_count>
 		<avg_time_on_page>180</avg_time_on_page>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml
index 724b463fc9928b2f8bbacc9207f2ffeb821ecf08..838606a12ec31674138ac048bb7b3d3b974012a6 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml
@@ -32,7 +32,7 @@
 		<sum_time_spent>180</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_nb_actions>7</entry_nb_actions>
 		<entry_sum_visit_length>1621</entry_sum_visit_length>
 		<entry_bounce_count>0</entry_bounce_count>
 		<avg_time_on_page>180</avg_time_on_page>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.get_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.get_day.xml
index c8ea778d2dcfaac8315a26013a0781746bf555c9..e0f88f84f4fabf538a6398409dcfdd6aee348180 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__Actions.get_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__Actions.get_day.xml
@@ -4,6 +4,6 @@
 	<nb_uniq_pageviews>4</nb_uniq_pageviews>
 	<nb_downloads>1</nb_downloads>
 	<nb_uniq_downloads>1</nb_uniq_downloads>
-	<nb_outlinks>1</nb_outlinks>
-	<nb_uniq_outlinks>1</nb_uniq_outlinks>
+	<nb_outlinks>3</nb_outlinks>
+	<nb_uniq_outlinks>2</nb_uniq_outlinks>
 </result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml
index 4fa2d13b1ecc436c4bdbc453a6713aed8103ccd3..4ed44e2fa991cc5b3b04f44ea11f905ff8c0293f 100755
--- a/tests/integration/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml
@@ -3,7 +3,7 @@
 	<row>
 		<label>new name</label>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
+		<nb_actions>8</nb_actions>
 		<revenue>43</revenue>
 		<visits_evolution>100%</visits_evolution>
 		<actions_evolution>100%</actions_evolution>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Provider.getProvider_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Provider.getProvider_day.xml
index 7ecac0736b7b2bc77e83dbac4444a84911fa1f6d..7b9b086c4412c46d38e01d6d37e68ab3fe539fe2 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__Provider.getProvider_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__Provider.getProvider_day.xml
@@ -4,8 +4,8 @@
 		<label>Unknown</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getRefererType_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getRefererType_day.xml
index f0f56862c2f4b2e14e5e13b9af6e5d54941b0cf3..720d7da20870a2ca41939ba7a54ae87ad67830d1 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getRefererType_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getRefererType_day.xml
@@ -22,8 +22,8 @@
 		<label>Websites</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
-		<nb_actions>5</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>7</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<goals>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getWebsites_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getWebsites_day.xml
index ed6b1a09d863bb3fd3605041e0fd6b6825e1d505..2450421efd9d7231121db4bfbd577409992a85e5 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getWebsites_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__Referers.getWebsites_day.xml
@@ -4,8 +4,8 @@
 		<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>
+		<nb_actions>7</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<goals>
@@ -22,8 +22,8 @@
 				<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>5</nb_actions>
-				<max_actions>5</max_actions>
+				<nb_actions>7</nb_actions>
+				<max_actions>7</max_actions>
 				<sum_visit_length>1621</sum_visit_length>
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml
index c24824e4edc3549977cd934f0e74956b744831bd..280b7fd6fcdaf46d3158ea1835faf5788e0f2bf5 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml
@@ -4,8 +4,8 @@
 		<label>Europe</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<goals>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml
index ff7c8cc86748c2b4ee98e83f39bff58caab1d563..d85b8bf99b99e6896e1830faaf2b90fe60628210 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml
@@ -4,8 +4,8 @@
 		<label>France</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<goals>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml
index af2ac9416610587e04f1010f30547de1c58005ed..6d13aaf7365e5e3525a2c24d2b76c6b0e944c85d 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowserType_day.xml
@@ -4,8 +4,8 @@
 		<label>Gecko (Firefox)</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml
index c313b3c92d6d5e637d10e767238f7cb0a751deb2..82104979100442c661edb2a4a1f8d9e07ca9b9e9 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml
@@ -4,8 +4,8 @@
 		<label>Firefox 3.6</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getConfiguration_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getConfiguration_day.xml
index 03655ef142417573878ed6c113c76b94dfd0c565..1a63f1933ae42cc012b38b3c3c2c54a58304f9e9 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getConfiguration_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getConfiguration_day.xml
@@ -4,8 +4,8 @@
 		<label>Windows XP / Firefox / 1024x768</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml
index 423e94d2fd9b2bad39b57af6a1a9253af280b64a..32ec517b60a4f03c6d54c6868519a49f35f83c8f 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getOS_day.xml
@@ -4,8 +4,8 @@
 		<label>Windows XP</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml
index 3036d288711734591538d92eefb35c5f38f8c2e2..ede209680dab5a18a20587e9749b6c1acf1fda05 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getResolution_day.xml
@@ -4,8 +4,8 @@
 		<label>1024x768</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml
index e294734cdc5564a892ed6d4d8a36e47122afdedb..f1acb38cb949dc9c0f8185389a7edd5488ce1b86 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml
@@ -4,8 +4,8 @@
 		<label>Normal</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml
index aad9493139dd33fad203a9387de2ce401563a73f..b95f277bfc12ec5633d4020abcff53dded9dbf21 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml
@@ -124,8 +124,8 @@
 		<label>12h</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml
index c76e43b97aece1f1fdcf833262da843f6c07fd74..5f96c55a5b4b34c000dba56e650a652fa1cd37b5 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml
@@ -114,8 +114,8 @@
 		<label>11h</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
-		<nb_actions>5</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>7</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<goals>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsPerPage_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsPerPage_day.xml
index 1cb496b6ec1b5a1a3e14803ca6680fb2a4ef7c29..30a3a7f161d13acfc7d3ffa7553a912608361943 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsPerPage_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__VisitorInterest.getNumberOfVisitsPerPage_day.xml
@@ -18,11 +18,11 @@
 	</row>
 	<row>
 		<label>5 pages</label>
-		<nb_visits>1</nb_visits>
+		<nb_visits>0</nb_visits>
 	</row>
 	<row>
 		<label>6-7 pages</label>
-		<nb_visits>0</nb_visits>
+		<nb_visits>1</nb_visits>
 	</row>
 	<row>
 		<label>8-10 pages</label>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getActions_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getActions_day.xml
index 3cc2819f51a8d7881edf1d2e4080312a94e2988b..e52ca0ecb15aabd3c0978ada9f4886e6895a47db 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getActions_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getActions_day.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>6</result>
\ No newline at end of file
+<result>8</result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getMaxActions_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getMaxActions_day.xml
index 17feb622cc6b6f76e840497b69c3145b63c35e2b..773871bab0c36700c4796d59d13528a1717a7e8d 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getMaxActions_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getMaxActions_day.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>5</result>
\ No newline at end of file
+<result>7</result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml
index 6437d492e5b50d3ed7fe26c82f39b47b2c6a632c..40498bf45d736fb3ca53e70a6d1cdd748909a8f6 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml
@@ -2,12 +2,12 @@
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
 	<nb_visits>2</nb_visits>
-	<nb_actions>6</nb_actions>
+	<nb_actions>8</nb_actions>
 	<nb_visits_converted>2</nb_visits_converted>
 	<bounce_count>1</bounce_count>
 	<sum_visit_length>1621</sum_visit_length>
-	<max_actions>5</max_actions>
+	<max_actions>7</max_actions>
 	<bounce_rate>50%</bounce_rate>
-	<nb_actions_per_visit>3</nb_actions_per_visit>
+	<nb_actions_per_visit>4</nb_actions_per_visit>
 	<avg_time_on_site>811</avg_time_on_site>
 </result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv b/tests/integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv
new file mode 100755
index 0000000000000000000000000000000000000000..01bc3dbb74b6d0798a458625e7648d5f4ba05771
Binary files /dev/null and b/tests/integration/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv differ
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownload_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownload_day.xml
index d4805af2153be483184f57e9f29d4f6b3668369b..32470e4bcbcbbfa7a9938fdc630fc1ae8665a2f2 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownload_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownload_day.xml
@@ -5,7 +5,7 @@
 		<nb_visits>1</nb_visits>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_hits>1</nb_hits>
-		<sum_time_spent>180</sum_time_spent>
+		<sum_time_spent>72</sum_time_spent>
 		<url>http://piwik.org/path/again/latest.zip</url>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownloads_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownloads_day.xml
index 59eee28a17afa06a1558e01d88dae711c7fb351e..c064136f4346ff3daf2406ccf7e51ea9d6ec4f62 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownloads_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getDownloads_day.xml
@@ -4,14 +4,14 @@
 		<label>piwik.org</label>
 		<nb_visits>1</nb_visits>
 		<nb_hits>1</nb_hits>
-		<sum_time_spent>180</sum_time_spent>
+		<sum_time_spent>72</sum_time_spent>
 		<subtable>
 			<row>
 				<label>/path/again/latest.zip</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>
+				<sum_time_spent>72</sum_time_spent>
 				<url>http://piwik.org/path/again/latest.zip</url>
 			</row>
 		</subtable>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml
index 724b463fc9928b2f8bbacc9207f2ffeb821ecf08..838606a12ec31674138ac048bb7b3d3b974012a6 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml
@@ -32,7 +32,7 @@
 		<sum_time_spent>180</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_nb_actions>7</entry_nb_actions>
 		<entry_sum_visit_length>1621</entry_sum_visit_length>
 		<entry_bounce_count>0</entry_bounce_count>
 		<avg_time_on_page>180</avg_time_on_page>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml
index 724b463fc9928b2f8bbacc9207f2ffeb821ecf08..838606a12ec31674138ac048bb7b3d3b974012a6 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml
@@ -32,7 +32,7 @@
 		<sum_time_spent>180</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_nb_actions>7</entry_nb_actions>
 		<entry_sum_visit_length>1621</entry_sum_visit_length>
 		<entry_bounce_count>0</entry_bounce_count>
 		<avg_time_on_page>180</avg_time_on_page>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlink_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlink_day.xml
index f079748c3736b2c6e007e8483b8a59f1916e0973..597186332640a8a2e7868a5db30cd75fad63eafe 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlink_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlink_day.xml
@@ -4,8 +4,8 @@
 		<label>/svn</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>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>540</sum_time_spent>
 		<url>http://dev.piwik.org/svn</url>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlinks_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlinks_day.xml
index cfb9e890ea1e53db6f0d969ba9cfe4d0f105aab6..539d798e9bc884d4c0babe52bd864ff99aeda36f 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlinks_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getOutlinks_day.xml
@@ -3,17 +3,33 @@
 	<row>
 		<label>dev.piwik.org</label>
 		<nb_visits>1</nb_visits>
-		<nb_hits>1</nb_hits>
-		<sum_time_spent>360</sum_time_spent>
+		<nb_hits>2</nb_hits>
+		<sum_time_spent>540</sum_time_spent>
 		<subtable>
 			<row>
 				<label>/svn</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>
+				<nb_hits>2</nb_hits>
+				<sum_time_spent>540</sum_time_spent>
 				<url>http://dev.piwik.org/svn</url>
 			</row>
 		</subtable>
 	</row>
+	<row>
+		<label>outlinks.org</label>
+		<nb_visits>1</nb_visits>
+		<nb_hits>1</nb_hits>
+		<sum_time_spent>108</sum_time_spent>
+		<subtable>
+			<row>
+				<label>/other_outlink</label>
+				<nb_visits>1</nb_visits>
+				<nb_uniq_visitors>1</nb_uniq_visitors>
+				<nb_hits>1</nb_hits>
+				<sum_time_spent>108</sum_time_spent>
+				<url>http://outlinks.org/other_outlink</url>
+			</row>
+		</subtable>
+	</row>
 </result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml
index e57dd376e5563a8c46631af372c7d02272cd34f8..4aff330ec5933d16c453c3f3a0885e8b4beaf278 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml
@@ -41,7 +41,7 @@
 		<sum_time_spent>180</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_nb_actions>7</entry_nb_actions>
 		<entry_sum_visit_length>1621</entry_sum_visit_length>
 		<entry_bounce_count>0</entry_bounce_count>
 		<avg_time_on_page>180</avg_time_on_page>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml
index 724b463fc9928b2f8bbacc9207f2ffeb821ecf08..838606a12ec31674138ac048bb7b3d3b974012a6 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml
@@ -32,7 +32,7 @@
 		<sum_time_spent>180</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_nb_actions>7</entry_nb_actions>
 		<entry_sum_visit_length>1621</entry_sum_visit_length>
 		<entry_bounce_count>0</entry_bounce_count>
 		<avg_time_on_page>180</avg_time_on_page>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.get_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.get_day.xml
index c8ea778d2dcfaac8315a26013a0781746bf555c9..e0f88f84f4fabf538a6398409dcfdd6aee348180 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.get_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.get_day.xml
@@ -4,6 +4,6 @@
 	<nb_uniq_pageviews>4</nb_uniq_pageviews>
 	<nb_downloads>1</nb_downloads>
 	<nb_uniq_downloads>1</nb_uniq_downloads>
-	<nb_outlinks>1</nb_outlinks>
-	<nb_uniq_outlinks>1</nb_uniq_outlinks>
+	<nb_outlinks>3</nb_outlinks>
+	<nb_uniq_outlinks>2</nb_uniq_outlinks>
 </result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
index 48b191fd4a8950647099ae96c5f52fdc6babc4fa..fffeb83b897b622899d4e484de59736e2f9fdb4c 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
@@ -17,7 +17,7 @@
 				<type>goal</type>
 				<goalName>matching purchase.htm</goalName>
 				<revenue>1</revenue>
-				<goalPageId>6</goalPageId>
+				<goalPageId>8</goalPageId>
 				
 				<url>http://example.org/store/purchase.htm</url>
 				<icon>themes/default/images/goal.png</icon>
@@ -26,8 +26,8 @@
 				<type>action</type>
 				<url>http://example.org/store/purchase.htm</url>
 				<pageTitle>Checkout/Purchasing...</pageTitle>
-				<pageIdAction>10</pageIdAction>
-				<pageId>6</pageId>
+				<pageIdAction>11</pageIdAction>
+				<pageId>8</pageId>
 				
 				<icon />
 			</row>
@@ -99,7 +99,7 @@
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
-		<actions>5</actions>
+		<actions>7</actions>
 		<actionDetails>
 			<row>
 				<type>action</type>
@@ -137,6 +137,24 @@
 				
 				<icon>themes/default/images/download.png</icon>
 			</row>
+			<row>
+				<type>outlink</type>
+				<url>http://outlinks.org/other_outlink</url>
+				<pageTitle />
+				<pageIdAction>7</pageIdAction>
+				<pageId>5</pageId>
+				
+				<icon>themes/default/images/link.gif</icon>
+			</row>
+			<row>
+				<type>outlink</type>
+				<url>http://dev.piwik.org/svn</url>
+				<pageTitle />
+				<pageIdAction>5</pageIdAction>
+				<pageId>6</pageId>
+				
+				<icon>themes/default/images/link.gif</icon>
+			</row>
 			<row>
 				<type>goal</type>
 				<goalName>triggered js</goalName>
@@ -150,8 +168,8 @@
 				<type>action</type>
 				<url>http://example.org/index.htm</url>
 				<pageTitle>Looking at homepage (again)...</pageTitle>
-				<pageIdAction>8</pageIdAction>
-				<pageId>5</pageId>
+				<pageIdAction>9</pageIdAction>
+				<pageId>7</pageId>
 				
 				<icon />
 			</row>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml
index 7ecac0736b7b2bc77e83dbac4444a84911fa1f6d..7b9b086c4412c46d38e01d6d37e68ab3fe539fe2 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Provider.getProvider_day.xml
@@ -4,8 +4,8 @@
 		<label>Unknown</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getRefererType_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getRefererType_day.xml
index f0f56862c2f4b2e14e5e13b9af6e5d54941b0cf3..720d7da20870a2ca41939ba7a54ae87ad67830d1 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getRefererType_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getRefererType_day.xml
@@ -22,8 +22,8 @@
 		<label>Websites</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
-		<nb_actions>5</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>7</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<goals>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getWebsites_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getWebsites_day.xml
index ed6b1a09d863bb3fd3605041e0fd6b6825e1d505..2450421efd9d7231121db4bfbd577409992a85e5 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getWebsites_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Referers.getWebsites_day.xml
@@ -4,8 +4,8 @@
 		<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>
+		<nb_actions>7</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<goals>
@@ -22,8 +22,8 @@
 				<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>5</nb_actions>
-				<max_actions>5</max_actions>
+				<nb_actions>7</nb_actions>
+				<max_actions>7</max_actions>
 				<sum_visit_length>1621</sum_visit_length>
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>1</nb_visits_converted>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml
index c24824e4edc3549977cd934f0e74956b744831bd..280b7fd6fcdaf46d3158ea1835faf5788e0f2bf5 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml
@@ -4,8 +4,8 @@
 		<label>Europe</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<goals>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml
index ff7c8cc86748c2b4ee98e83f39bff58caab1d563..d85b8bf99b99e6896e1830faaf2b90fe60628210 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml
@@ -4,8 +4,8 @@
 		<label>France</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<goals>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml
index af2ac9416610587e04f1010f30547de1c58005ed..6d13aaf7365e5e3525a2c24d2b76c6b0e944c85d 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowserType_day.xml
@@ -4,8 +4,8 @@
 		<label>Gecko (Firefox)</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml
index c313b3c92d6d5e637d10e767238f7cb0a751deb2..82104979100442c661edb2a4a1f8d9e07ca9b9e9 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml
@@ -4,8 +4,8 @@
 		<label>Firefox 3.6</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml
index 03655ef142417573878ed6c113c76b94dfd0c565..1a63f1933ae42cc012b38b3c3c2c54a58304f9e9 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getConfiguration_day.xml
@@ -4,8 +4,8 @@
 		<label>Windows XP / Firefox / 1024x768</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml
index 423e94d2fd9b2bad39b57af6a1a9253af280b64a..32ec517b60a4f03c6d54c6868519a49f35f83c8f 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getOS_day.xml
@@ -4,8 +4,8 @@
 		<label>Windows XP</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml
index 3036d288711734591538d92eefb35c5f38f8c2e2..ede209680dab5a18a20587e9749b6c1acf1fda05 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getResolution_day.xml
@@ -4,8 +4,8 @@
 		<label>1024x768</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml
index e294734cdc5564a892ed6d4d8a36e47122afdedb..f1acb38cb949dc9c0f8185389a7edd5488ce1b86 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml
@@ -4,8 +4,8 @@
 		<label>Normal</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml
index aad9493139dd33fad203a9387de2ce401563a73f..b95f277bfc12ec5633d4020abcff53dded9dbf21 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml
@@ -124,8 +124,8 @@
 		<label>12h</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>2</nb_visits>
-		<nb_actions>6</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>8</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>1</bounce_count>
 		<nb_visits_converted>2</nb_visits_converted>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml
index c76e43b97aece1f1fdcf833262da843f6c07fd74..5f96c55a5b4b34c000dba56e650a652fa1cd37b5 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml
@@ -114,8 +114,8 @@
 		<label>11h</label>
 		<nb_uniq_visitors>1</nb_uniq_visitors>
 		<nb_visits>1</nb_visits>
-		<nb_actions>5</nb_actions>
-		<max_actions>5</max_actions>
+		<nb_actions>7</nb_actions>
+		<max_actions>7</max_actions>
 		<sum_visit_length>1621</sum_visit_length>
 		<bounce_count>0</bounce_count>
 		<goals>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsPerPage_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsPerPage_day.xml
index 1cb496b6ec1b5a1a3e14803ca6680fb2a4ef7c29..30a3a7f161d13acfc7d3ffa7553a912608361943 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsPerPage_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitorInterest.getNumberOfVisitsPerPage_day.xml
@@ -18,11 +18,11 @@
 	</row>
 	<row>
 		<label>5 pages</label>
-		<nb_visits>1</nb_visits>
+		<nb_visits>0</nb_visits>
 	</row>
 	<row>
 		<label>6-7 pages</label>
-		<nb_visits>0</nb_visits>
+		<nb_visits>1</nb_visits>
 	</row>
 	<row>
 		<label>8-10 pages</label>
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getActions_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getActions_day.xml
index 3cc2819f51a8d7881edf1d2e4080312a94e2988b..e52ca0ecb15aabd3c0978ada9f4886e6895a47db 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getActions_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getActions_day.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>6</result>
\ No newline at end of file
+<result>8</result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getMaxActions_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getMaxActions_day.xml
index 17feb622cc6b6f76e840497b69c3145b63c35e2b..773871bab0c36700c4796d59d13528a1717a7e8d 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getMaxActions_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getMaxActions_day.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<result>5</result>
\ No newline at end of file
+<result>7</result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml
index 6437d492e5b50d3ed7fe26c82f39b47b2c6a632c..40498bf45d736fb3ca53e70a6d1cdd748909a8f6 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml
@@ -2,12 +2,12 @@
 <result>
 	<nb_uniq_visitors>1</nb_uniq_visitors>
 	<nb_visits>2</nb_visits>
-	<nb_actions>6</nb_actions>
+	<nb_actions>8</nb_actions>
 	<nb_visits_converted>2</nb_visits_converted>
 	<bounce_count>1</bounce_count>
 	<sum_visit_length>1621</sum_visit_length>
-	<max_actions>5</max_actions>
+	<max_actions>7</max_actions>
 	<bounce_rate>50%</bounce_rate>
-	<nb_actions_per_visit>3</nb_actions_per_visit>
+	<nb_actions_per_visit>4</nb_actions_per_visit>
 	<avg_time_on_site>811</avg_time_on_site>
 </result>
\ No newline at end of file