diff --git a/plugins/Events/Archiver.php b/plugins/Events/Archiver.php
index c928ec318ea94ba2ea0086343e63769a039f870c..76e4c3e677a30e47bb470392d1d10c5011f2a00e 100644
--- a/plugins/Events/Archiver.php
+++ b/plugins/Events/Archiver.php
@@ -98,7 +98,10 @@ class Archiver extends \Piwik\Plugin\Archiver
     public function aggregateMultipleReports()
     {
         $dataTableToSum = $this->getRecordNames();
-        $columnsAggregationOperation = null;
+        $columnsAggregationOperation = array(
+            Metrics::INDEX_EVENT_MIN_EVENT_VALUE => 'min',
+            Metrics::INDEX_EVENT_MAX_EVENT_VALUE => 'max',
+        );
 
         $this->getProcessor()->aggregateDataTableRecords(
             $dataTableToSum,
diff --git a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php b/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php
similarity index 95%
rename from tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php
rename to tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php
index fc3f12d97942fe18094c57686e28be6e10db7e36..3471c3b3e7c9795a9dc7b8144ddd7ffb864b31ec 100644
--- a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomEvents.php
+++ b/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php
@@ -15,7 +15,7 @@ use PiwikTracker;
 /**
  * Tracks custom events
  */
-class TwoVisitsWithCustomEvents extends Fixture
+class ThreeVisitsWithCustomEvents extends Fixture
 {
     public $dateTime = '2010-01-03 11:22:33';
     public $idSite = 1;
@@ -68,6 +68,15 @@ class TwoVisitsWithCustomEvents extends Fixture
         $this->trackMusicRatings($vis2);
         $this->trackMovieWatchingIncludingInterval($vis2);
 
+        $this->dateTime = Date::factory($this->dateTime)->addDay(1);
+        $vis3 = self::getTracker($this->idSite, $this->dateTime, $useDefault = true, $uselocal);
+        $vis3->setIp('111.1.1.2');
+        $vis3->setPlugins($flash = false, $java = false, $director = true);
+
+        $this->trackMusicPlaying($vis3);
+        $this->trackMusicRatings($vis3);
+        $this->trackMovieWatchingIncludingInterval($vis3);
+
     }
 
     private function moveTimeForward(PiwikTracker $vis, $minutes)
diff --git a/tests/PHPUnit/System/CustomEventsTest.php b/tests/PHPUnit/System/CustomEventsTest.php
index f0eef8335420162785f60a6beeb3409684c40341..bb2ba6bca777b8016fa5c452db008aa6dedce2e0 100644
--- a/tests/PHPUnit/System/CustomEventsTest.php
+++ b/tests/PHPUnit/System/CustomEventsTest.php
@@ -8,7 +8,7 @@
 namespace Piwik\Tests\System;
 
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
-use Piwik\Tests\Fixtures\TwoVisitsWithCustomEvents;
+use Piwik\Tests\Fixtures\ThreeVisitsWithCustomEvents;
 
 /**
  * Testing Custom Events
@@ -19,7 +19,7 @@ use Piwik\Tests\Fixtures\TwoVisitsWithCustomEvents;
 class CustomEventsTest extends SystemTestCase
 {
     /**
-     * @var TwoVisitsWithCustomEvents
+     * @var ThreeVisitsWithCustomEvents
      */
     public static $fixture = null; // initialized below class definition
 
@@ -91,7 +91,7 @@ class CustomEventsTest extends SystemTestCase
                 'idSite'       => $idSite1,
                 'date'         => $dateTime,
                 'periods'      => $dayPeriod,
-                'idGoal'       => TwoVisitsWithCustomEvents::$idGoalTriggeredOnEventCategory,
+                'idGoal'       => ThreeVisitsWithCustomEvents::$idGoalTriggeredOnEventCategory,
                 'setDateLastN' => false)
             )
 
@@ -151,4 +151,4 @@ class CustomEventsTest extends SystemTestCase
     }
 }
 
-CustomEventsTest::$fixture = new TwoVisitsWithCustomEvents();
+CustomEventsTest::$fixture = new ThreeVisitsWithCustomEvents();
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml
index 193c7e3ebbb24b8b3c7d214126c042cc7f89a416..3cfabafb6cc92dbe026dc400c6f1ae0a3693b6e0 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml
@@ -224,7 +224,179 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</result>
-		<result prettyDate="Monday, January 4, 2010" />
+		<result prettyDate="Monday, January 4, 2010">
+			<row>
+				<label>clickBuyNow - Spirited Away (千と千尋の神隠し)</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;--- - event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>1</nb_events_with_value>
+				<sum_event_value>9.66</sum_event_value>
+				<min_event_value>9.66</min_event_value>
+				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
+			</row>
+			<row>
+				<label>play - La fiancée de l'eau</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>play25% - La fiancée de l'eau</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>play25% - Spirited Away (千と千尋の神隠し)</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>play50% - La fiancée de l'eau</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>play50% - Spirited Away (千と千尋の神隠し)</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>play75% - La fiancée de l'eau</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>play75% - Spirited Away (千と千尋の神隠し)</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>playEnd - La fiancée de l'eau</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>playEnd - Spirited Away (千と千尋の神隠し)</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>playStart - Spirited Away (千と千尋の神隠し)</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>playTrailer - Ponyo (崖の上のポニョ)</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>playTrailer - Princess Mononoke (もののけ姫)</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>playTrailer - Spirited Away (千と千尋の神隠し)</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Purchase</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>rating - La fiancée de l'eau</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>2</nb_events_with_value>
+				<sum_event_value>19</sum_event_value>
+				<min_event_value>9</min_event_value>
+				<max_event_value>10</max_event_value>
+				<avg_event_value>9.5</avg_event_value>
+			</row>
+			<row>
+				<label>rating - Spirited Away (千と千尋の神隠し)</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>1</nb_events_with_value>
+				<sum_event_value>9.66</sum_event_value>
+				<min_event_value>9.66</min_event_value>
+				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
+			</row>
+			<row>
+				<label>Search - Search query here</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+		</result>
 		<result prettyDate="Tuesday, January 5, 2010" />
 		<result prettyDate="Wednesday, January 6, 2010" />
 		<result prettyDate="Thursday, January 7, 2010" />
@@ -241,7 +413,7 @@
 		<result prettyDate="Saturday, January 9, 2010" />
 	</reportMetadata>
 	<reportTotal>
-		<nb_visits>43</nb_visits>
-		<nb_uniq_visitors>41</nb_uniq_visitors>
+		<nb_visits>64</nb_visits>
+		<nb_uniq_visitors>61</nb_uniq_visitors>
 	</reportTotal>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
index 60b79ec22c8f8d7e5b46c23b4dd098e67ed073d3..a852445667cb67e09187f98cd2cd585d567e8fe2 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml
@@ -161,7 +161,116 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</result>
-		<result prettyDate="Monday, January 4, 2010" />
+		<result prettyDate="Monday, January 4, 2010">
+			<row>
+				<label>playTrailer</label>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Search</label>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>play25%</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>play50%</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>play75%</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>playEnd</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>rating</label>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.66</sum_event_value>
+				<min_event_value>9</min_event_value>
+				<max_event_value>10</max_event_value>
+				<avg_event_value>9.55</avg_event_value>
+			</row>
+			<row>
+				<label>clickBuyNow</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>1</nb_events_with_value>
+				<sum_event_value>9.66</sum_event_value>
+				<min_event_value>9.66</min_event_value>
+				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
+			</row>
+			<row>
+				<label>play</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>playStart</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Purchase</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+		</result>
 		<result prettyDate="Tuesday, January 5, 2010" />
 		<result prettyDate="Wednesday, January 6, 2010" />
 		<result prettyDate="Thursday, January 7, 2010" />
@@ -173,57 +282,57 @@
 			<row>
 				
 				<segment>eventAction==playTrailer</segment>
-				<idsubdatatable>856</idsubdatatable>
+				<idsubdatatable>1548</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==Search</segment>
-				<idsubdatatable>849</idsubdatatable>
+				<idsubdatatable>1541</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==play25%25</segment>
-				<idsubdatatable>851</idsubdatatable>
+				<idsubdatatable>1543</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==play50%25</segment>
-				<idsubdatatable>852</idsubdatatable>
+				<idsubdatatable>1544</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==play75%25</segment>
-				<idsubdatatable>853</idsubdatatable>
+				<idsubdatatable>1545</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==playEnd</segment>
-				<idsubdatatable>854</idsubdatatable>
+				<idsubdatatable>1546</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==rating</segment>
-				<idsubdatatable>855</idsubdatatable>
+				<idsubdatatable>1547</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==clickBuyNow</segment>
-				<idsubdatatable>857</idsubdatatable>
+				<idsubdatatable>1549</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>859</idsubdatatable>
+				<idsubdatatable>1551</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==play</segment>
-				<idsubdatatable>850</idsubdatatable>
+				<idsubdatatable>1542</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventAction==playStart</segment>
-				<idsubdatatable>858</idsubdatatable>
+				<idsubdatatable>1550</idsubdatatable>
 			</row>
 			<row>
 				<segment>eventAction==Purchase</segment>
@@ -232,7 +341,66 @@
 				<segment>eventAction==This+is+an+event+without+a+URL</segment>
 			</row>
 		</result>
-		<result prettyDate="Monday, January 4, 2010" />
+		<result prettyDate="Monday, January 4, 2010">
+			<row>
+				
+				<segment>eventAction==playTrailer</segment>
+				<idsubdatatable>1560</idsubdatatable>
+			</row>
+			<row>
+				
+				<segment>eventAction==Search</segment>
+				<idsubdatatable>1553</idsubdatatable>
+			</row>
+			<row>
+				
+				<segment>eventAction==play25%25</segment>
+				<idsubdatatable>1555</idsubdatatable>
+			</row>
+			<row>
+				
+				<segment>eventAction==play50%25</segment>
+				<idsubdatatable>1556</idsubdatatable>
+			</row>
+			<row>
+				
+				<segment>eventAction==play75%25</segment>
+				<idsubdatatable>1557</idsubdatatable>
+			</row>
+			<row>
+				
+				<segment>eventAction==playEnd</segment>
+				<idsubdatatable>1558</idsubdatatable>
+			</row>
+			<row>
+				
+				<segment>eventAction==rating</segment>
+				<idsubdatatable>1559</idsubdatatable>
+			</row>
+			<row>
+				
+				<segment>eventAction==clickBuyNow</segment>
+				<idsubdatatable>1561</idsubdatatable>
+			</row>
+			<row>
+				
+				<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
+				<idsubdatatable>1563</idsubdatatable>
+			</row>
+			<row>
+				
+				<segment>eventAction==play</segment>
+				<idsubdatatable>1554</idsubdatatable>
+			</row>
+			<row>
+				
+				<segment>eventAction==playStart</segment>
+				<idsubdatatable>1562</idsubdatatable>
+			</row>
+			<row>
+				<segment>eventAction==Purchase</segment>
+			</row>
+		</result>
 		<result prettyDate="Tuesday, January 5, 2010" />
 		<result prettyDate="Wednesday, January 6, 2010" />
 		<result prettyDate="Thursday, January 7, 2010" />
@@ -240,7 +408,7 @@
 		<result prettyDate="Saturday, January 9, 2010" />
 	</reportMetadata>
 	<reportTotal>
-		<nb_visits>43</nb_visits>
-		<nb_uniq_visitors>41</nb_uniq_visitors>
+		<nb_visits>64</nb_visits>
+		<nb_uniq_visitors>61</nb_uniq_visitors>
 	</reportTotal>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml
index 40bd94b451026c73b33ba9f4ab45c2f2e757599c..889fbf772ec336ff75eae381c6f8f1f2835bab4c 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_flat__API.getProcessedReport_day.xml
@@ -206,7 +206,161 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</result>
-		<result prettyDate="Monday, January 4, 2010" />
+		<result prettyDate="Monday, January 4, 2010">
+			<row>
+				<label>Movie - playTrailer</label>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Movie - Search</label>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;--- - event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>1</nb_events_with_value>
+				<sum_event_value>9.66</sum_event_value>
+				<min_event_value>9.66</min_event_value>
+				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
+			</row>
+			<row>
+				<label>Movie - clickBuyNow</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Movie - play25%</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Movie - play50%</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Movie - play75%</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Movie - playEnd</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Movie - playStart</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Movie - Purchase</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Movie - rating</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>1</nb_events_with_value>
+				<sum_event_value>9.66</sum_event_value>
+				<min_event_value>9.66</min_event_value>
+				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
+			</row>
+			<row>
+				<label>Music - play</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Music - play25%</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Music - play50%</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Music - play75%</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Music - playEnd</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Music - rating</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>2</nb_events_with_value>
+				<sum_event_value>19</sum_event_value>
+				<min_event_value>9</min_event_value>
+				<max_event_value>10</max_event_value>
+				<avg_event_value>9.5</avg_event_value>
+			</row>
+		</result>
 		<result prettyDate="Tuesday, January 5, 2010" />
 		<result prettyDate="Wednesday, January 6, 2010" />
 		<result prettyDate="Thursday, January 7, 2010" />
@@ -223,7 +377,7 @@
 		<result prettyDate="Saturday, January 9, 2010" />
 	</reportMetadata>
 	<reportTotal>
-		<nb_visits>43</nb_visits>
-		<nb_uniq_visitors>41</nb_uniq_visitors>
+		<nb_visits>64</nb_visits>
+		<nb_uniq_visitors>61</nb_uniq_visitors>
 	</reportTotal>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
index 5b430036c55ac405f28650f3bd866e6dd62540c5..69faeb032fa16f849314469b7280c725bb1a8d19 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml
@@ -80,7 +80,35 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</result>
-		<result prettyDate="Monday, January 4, 2010" />
+		<result prettyDate="Monday, January 4, 2010">
+			<row>
+				<label>Movie</label>
+				<nb_events>14</nb_events>
+				<nb_events_with_value>1</nb_events_with_value>
+				<sum_event_value>9.66</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
+			</row>
+			<row>
+				<label>Music</label>
+				<nb_events>7</nb_events>
+				<nb_events_with_value>2</nb_events_with_value>
+				<sum_event_value>19</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>10</max_event_value>
+				<avg_event_value>9.5</avg_event_value>
+			</row>
+			<row>
+				<label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>1</nb_events_with_value>
+				<sum_event_value>9.66</sum_event_value>
+				<min_event_value>9.66</min_event_value>
+				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
+			</row>
+		</result>
 		<result prettyDate="Tuesday, January 5, 2010" />
 		<result prettyDate="Wednesday, January 6, 2010" />
 		<result prettyDate="Thursday, January 7, 2010" />
@@ -92,25 +120,41 @@
 			<row>
 				
 				<segment>eventCategory==Movie</segment>
-				<idsubdatatable>792</idsubdatatable>
+				<idsubdatatable>1478</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventCategory==Music</segment>
-				<idsubdatatable>793</idsubdatatable>
+				<idsubdatatable>1479</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>794</idsubdatatable>
+				<idsubdatatable>1480</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventCategory==CategoryTriggersGoal+here</segment>
-				<idsubdatatable>795</idsubdatatable>
+				<idsubdatatable>1481</idsubdatatable>
+			</row>
+		</result>
+		<result prettyDate="Monday, January 4, 2010">
+			<row>
+				
+				<segment>eventCategory==Movie</segment>
+				<idsubdatatable>1483</idsubdatatable>
+			</row>
+			<row>
+				
+				<segment>eventCategory==Music</segment>
+				<idsubdatatable>1484</idsubdatatable>
+			</row>
+			<row>
+				
+				<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
+				<idsubdatatable>1485</idsubdatatable>
 			</row>
 		</result>
-		<result prettyDate="Monday, January 4, 2010" />
 		<result prettyDate="Tuesday, January 5, 2010" />
 		<result prettyDate="Wednesday, January 6, 2010" />
 		<result prettyDate="Thursday, January 7, 2010" />
@@ -118,7 +162,7 @@
 		<result prettyDate="Saturday, January 9, 2010" />
 	</reportMetadata>
 	<reportTotal>
-		<nb_visits>43</nb_visits>
-		<nb_uniq_visitors>41</nb_uniq_visitors>
+		<nb_visits>64</nb_visits>
+		<nb_uniq_visitors>61</nb_uniq_visitors>
 	</reportTotal>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml
index dcaf39aabb50c13bcb4321b52a7537a8a2bf529f..d09405ea903b9be0ef2d8ab3f2c4708166bdf4a4 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_flat__API.getProcessedReport_day.xml
@@ -233,7 +233,188 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</result>
-		<result prettyDate="Monday, January 4, 2010" />
+		<result prettyDate="Monday, January 4, 2010">
+			<row>
+				<label>Event Name not defined - Search</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;--- - event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>1</nb_events_with_value>
+				<sum_event_value>9.66</sum_event_value>
+				<min_event_value>9.66</min_event_value>
+				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
+			</row>
+			<row>
+				<label>Event Name not defined - Purchase</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>La fiancée de l'eau - play</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>La fiancée de l'eau - play25%</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>La fiancée de l'eau - play50%</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>La fiancée de l'eau - play75%</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>La fiancée de l'eau - playEnd</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>La fiancée de l'eau - rating</label>
+				<nb_events>2</nb_events>
+				<nb_events_with_value>2</nb_events_with_value>
+				<sum_event_value>19</sum_event_value>
+				<min_event_value>9</min_event_value>
+				<max_event_value>10</max_event_value>
+				<avg_event_value>9.5</avg_event_value>
+			</row>
+			<row>
+				<label>Ponyo (崖の上のポニョ) - playTrailer</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Princess Mononoke (もののけ姫) - playTrailer</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Search query here - Search</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Spirited Away (千と千尋の神隠し) - clickBuyNow</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Spirited Away (千と千尋の神隠し) - play25%</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Spirited Away (千と千尋の神隠し) - play50%</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Spirited Away (千と千尋の神隠し) - play75%</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Spirited Away (千と千尋の神隠し) - playEnd</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Spirited Away (千と千尋の神隠し) - playStart</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Spirited Away (千と千尋の神隠し) - playTrailer</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Spirited Away (千と千尋の神隠し) - rating</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>1</nb_events_with_value>
+				<sum_event_value>9.66</sum_event_value>
+				<min_event_value>9.66</min_event_value>
+				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
+			</row>
+		</result>
 		<result prettyDate="Tuesday, January 5, 2010" />
 		<result prettyDate="Wednesday, January 6, 2010" />
 		<result prettyDate="Thursday, January 7, 2010" />
@@ -250,7 +431,7 @@
 		<result prettyDate="Saturday, January 9, 2010" />
 	</reportMetadata>
 	<reportTotal>
-		<nb_visits>43</nb_visits>
-		<nb_uniq_visitors>41</nb_uniq_visitors>
+		<nb_visits>64</nb_visits>
+		<nb_uniq_visitors>61</nb_uniq_visitors>
 	</reportTotal>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
index 0dbe31d0ef6e2b79232b9a1468b326c9c3d38274..5f043780cfe422f0f67d7767aeac61f5deca0d45 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
@@ -107,7 +107,71 @@
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</result>
-		<result prettyDate="Monday, January 4, 2010" />
+		<result prettyDate="Monday, January 4, 2010">
+			<row>
+				<label>Spirited Away (千と千尋の神隠し)</label>
+				<nb_events>8</nb_events>
+				<nb_events_with_value>1</nb_events_with_value>
+				<sum_event_value>9.66</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
+			</row>
+			<row>
+				<label>La fiancée de l'eau</label>
+				<nb_events>7</nb_events>
+				<nb_events_with_value>2</nb_events_with_value>
+				<sum_event_value>19</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>10</max_event_value>
+				<avg_event_value>9.5</avg_event_value>
+			</row>
+			<row>
+				<label>Event Name not defined</label>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>1</nb_events_with_value>
+				<sum_event_value>9.66</sum_event_value>
+				<min_event_value>9.66</min_event_value>
+				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
+			</row>
+			<row>
+				<label>Ponyo (崖の上のポニョ)</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Princess Mononoke (もののけ姫)</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+			<row>
+				<label>Search query here</label>
+				<nb_events>1</nb_events>
+				<nb_events_with_value>0</nb_events_with_value>
+				<sum_event_value>0</sum_event_value>
+				<min_event_value>0</min_event_value>
+				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
+			</row>
+		</result>
 		<result prettyDate="Tuesday, January 5, 2010" />
 		<result prettyDate="Wednesday, January 6, 2010" />
 		<result prettyDate="Thursday, January 7, 2010" />
@@ -119,39 +183,74 @@
 			<row>
 				
 				<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
-				<idsubdatatable>922</idsubdatatable>
+				<idsubdatatable>1636</idsubdatatable>
+			</row>
+			<row>
+				
+				<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
+				<idsubdatatable>1635</idsubdatatable>
+			</row>
+			<row>
+				
+				<idsubdatatable>1634</idsubdatatable>
+			</row>
+			<row>
+				
+				<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
+				<idsubdatatable>1640</idsubdatatable>
+			</row>
+			<row>
+				
+				<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
+				<idsubdatatable>1638</idsubdatatable>
+			</row>
+			<row>
+				
+				<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
+				<idsubdatatable>1637</idsubdatatable>
+			</row>
+			<row>
+				
+				<segment>eventName==Search+query+here</segment>
+				<idsubdatatable>1639</idsubdatatable>
+			</row>
+		</result>
+		<result prettyDate="Monday, January 4, 2010">
+			<row>
+				
+				<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
+				<idsubdatatable>1644</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
-				<idsubdatatable>921</idsubdatatable>
+				<idsubdatatable>1643</idsubdatatable>
 			</row>
 			<row>
 				
-				<idsubdatatable>920</idsubdatatable>
+				<idsubdatatable>1642</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
-				<idsubdatatable>926</idsubdatatable>
+				<idsubdatatable>1648</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
-				<idsubdatatable>924</idsubdatatable>
+				<idsubdatatable>1646</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
-				<idsubdatatable>923</idsubdatatable>
+				<idsubdatatable>1645</idsubdatatable>
 			</row>
 			<row>
 				
 				<segment>eventName==Search+query+here</segment>
-				<idsubdatatable>925</idsubdatatable>
+				<idsubdatatable>1647</idsubdatatable>
 			</row>
 		</result>
-		<result prettyDate="Monday, January 4, 2010" />
 		<result prettyDate="Tuesday, January 5, 2010" />
 		<result prettyDate="Wednesday, January 6, 2010" />
 		<result prettyDate="Thursday, January 7, 2010" />
@@ -159,7 +258,7 @@
 		<result prettyDate="Saturday, January 9, 2010" />
 	</reportMetadata>
 	<reportTotal>
-		<nb_visits>43</nb_visits>
-		<nb_uniq_visitors>41</nb_uniq_visitors>
+		<nb_visits>64</nb_visits>
+		<nb_uniq_visitors>61</nb_uniq_visitors>
 	</reportTotal>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml
index 79b9cb81e5f9bb57980a086424c46273d09f918c..842dff57a1a4fad5a152cf28d41db2125e46bd92 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.getPageUrls_month.xml
@@ -2,20 +2,20 @@
 <result>
 	<row>
 		<label>/movies</label>
-		<nb_visits>2</nb_visits>
-		<nb_hits>2</nb_hits>
+		<nb_visits>3</nb_visits>
+		<nb_hits>3</nb_hits>
 		<sum_time_spent>0</sum_time_spent>
-		<nb_hits_with_time_generation>2</nb_hits_with_time_generation>
+		<nb_hits_with_time_generation>3</nb_hits_with_time_generation>
 		<min_time_generation>0.666</min_time_generation>
 		<max_time_generation>0.666</max_time_generation>
-		<entry_nb_visits>1</entry_nb_visits>
-		<entry_nb_actions>14</entry_nb_actions>
-		<entry_sum_visit_length>3541</entry_sum_visit_length>
+		<entry_nb_visits>2</entry_nb_visits>
+		<entry_nb_actions>28</entry_nb_actions>
+		<entry_sum_visit_length>7082</entry_sum_visit_length>
 		<entry_bounce_count>0</entry_bounce_count>
-		<exit_nb_visits>2</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>2</sum_daily_exit_nb_uniq_visitors>
+		<exit_nb_visits>3</exit_nb_visits>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
+		<sum_daily_entry_nb_uniq_visitors>2</sum_daily_entry_nb_uniq_visitors>
+		<sum_daily_exit_nb_uniq_visitors>3</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>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_month.xml
index f7a5fb831c424cee6b3dd881902531e1246bc78d..5e22f5f565f6b8e17d8faacd57ce17410ec1989d 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Actions.get_month.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <result>
-	<nb_pageviews>3</nb_pageviews>
-	<nb_uniq_pageviews>3</nb_uniq_pageviews>
+	<nb_pageviews>4</nb_pageviews>
+	<nb_uniq_pageviews>4</nb_uniq_pageviews>
 	<nb_downloads>0</nb_downloads>
 	<nb_uniq_downloads>0</nb_uniq_downloads>
 	<nb_outlinks>0</nb_outlinks>
 	<nb_uniq_outlinks>0</nb_uniq_outlinks>
 	<nb_searches>0</nb_searches>
 	<nb_keywords>0</nb_keywords>
-	<avg_time_generation>0.557</avg_time_generation>
+	<avg_time_generation>0.585</avg_time_generation>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml
index f60a44a673fc89b485ab265f2e0c4337fcf136d0..07715b1b6f4e901daa2106381fe76fd821278e5b 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml
@@ -2,365 +2,365 @@
 <result>
 	<row>
 		<label>playTrailer</label>
-		<nb_visits>6</nb_visits>
-		<nb_events>6</nb_events>
+		<nb_visits>9</nb_visits>
+		<nb_events>9</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==playTrailer</segment>
 		<subtable>
 			<row>
 				<label>Ponyo (崖の上のポニョ)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Princess Mononoke (もののけ姫)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Search</label>
-		<nb_visits>6</nb_visits>
-		<nb_events>6</nb_events>
+		<nb_visits>9</nb_visits>
+		<nb_events>9</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==Search</segment>
 		<subtable>
 			<row>
 				<label>Search query here</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>play25%</label>
-		<nb_visits>4</nb_visits>
-		<nb_events>4</nb_events>
+		<nb_visits>6</nb_visits>
+		<nb_events>6</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==play25%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l'eau</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>play50%</label>
-		<nb_visits>4</nb_visits>
-		<nb_events>4</nb_events>
+		<nb_visits>6</nb_visits>
+		<nb_events>6</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==play50%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l'eau</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>play75%</label>
-		<nb_visits>4</nb_visits>
-		<nb_events>4</nb_events>
+		<nb_visits>6</nb_visits>
+		<nb_events>6</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==play75%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l'eau</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>playEnd</label>
-		<nb_visits>4</nb_visits>
-		<nb_events>4</nb_events>
+		<nb_visits>6</nb_visits>
+		<nb_events>6</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==playEnd</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l'eau</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>rating</label>
-		<nb_visits>4</nb_visits>
-		<nb_events>6</nb_events>
-		<nb_events_with_value>6</nb_events_with_value>
-		<sum_event_value>57.32</sum_event_value>
+		<nb_visits>6</nb_visits>
+		<nb_events>9</nb_events>
+		<nb_events_with_value>9</nb_events_with_value>
+		<sum_event_value>85.98</sum_event_value>
 		<min_event_value>9</min_event_value>
 		<max_event_value>10</max_event_value>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.55</avg_event_value>
 		<segment>eventAction==rating</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l'eau</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>4</nb_events>
-				<nb_events_with_value>4</nb_events_with_value>
-				<sum_event_value>38</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>6</nb_events>
+				<nb_events_with_value>6</nb_events_with_value>
+				<sum_event_value>57</sum_event_value>
 				<min_event_value>9</min_event_value>
 				<max_event_value>10</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.5</avg_event_value>
 			</row>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.98</sum_event_value>
 				<min_event_value>9.66</min_event_value>
 				<max_event_value>9.66</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.66</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>clickBuyNow</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==clickBuyNow</segment>
 		<subtable>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
-		<nb_events_with_value>2</nb_events_with_value>
-		<sum_event_value>19.32</sum_event_value>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
+		<nb_events_with_value>3</nb_events_with_value>
+		<sum_event_value>28.98</sum_event_value>
 		<min_event_value>9.66</min_event_value>
 		<max_event_value>9.66</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
 		<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.98</sum_event_value>
 				<min_event_value>9.66</min_event_value>
 				<max_event_value>9.66</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.66</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>play</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==play</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l'eau</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>playStart</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==playStart</segment>
 		<subtable>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Purchase</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==Purchase</segment>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml
index ced40076d26cb89e62b3bb3e1ba67dcf9d3508a8..26def0abf9a5fdbb1bdaebaa423b95ed9e3889ac 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getCategory_month.xml
@@ -2,229 +2,229 @@
 <result>
 	<row>
 		<label>Movie</label>
-		<nb_visits>28</nb_visits>
-		<nb_events>28</nb_events>
-		<nb_events_with_value>2</nb_events_with_value>
-		<sum_event_value>19.32</sum_event_value>
+		<nb_visits>42</nb_visits>
+		<nb_events>42</nb_events>
+		<nb_events_with_value>3</nb_events_with_value>
+		<sum_event_value>28.98</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
-		<sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>39</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
 		<segment>eventCategory==Movie</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
-				<nb_visits>6</nb_visits>
-				<nb_events>6</nb_events>
+				<nb_visits>9</nb_visits>
+				<nb_events>9</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Search</label>
-				<nb_visits>6</nb_visits>
-				<nb_events>6</nb_events>
+				<nb_visits>9</nb_visits>
+				<nb_events>9</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>clickBuyNow</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play25%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play50%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play75%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>playEnd</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>playStart</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Purchase</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>rating</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.98</sum_event_value>
 				<min_event_value>9.66</min_event_value>
 				<max_event_value>9.66</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.66</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Music</label>
-		<nb_visits>12</nb_visits>
-		<nb_events>14</nb_events>
-		<nb_events_with_value>4</nb_events_with_value>
-		<sum_event_value>38</sum_event_value>
+		<nb_visits>18</nb_visits>
+		<nb_events>21</nb_events>
+		<nb_events_with_value>6</nb_events_with_value>
+		<sum_event_value>57</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>10</max_event_value>
-		<sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.5</avg_event_value>
 		<segment>eventCategory==Music</segment>
 		<subtable>
 			<row>
 				<label>play</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play25%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play50%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play75%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>playEnd</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>rating</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>4</nb_events>
-				<nb_events_with_value>4</nb_events_with_value>
-				<sum_event_value>38</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>6</nb_events>
+				<nb_events_with_value>6</nb_events_with_value>
+				<sum_event_value>57</sum_event_value>
 				<min_event_value>9</min_event_value>
 				<max_event_value>10</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.5</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
-		<nb_events_with_value>2</nb_events_with_value>
-		<sum_event_value>19.32</sum_event_value>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
+		<nb_events_with_value>3</nb_events_with_value>
+		<sum_event_value>28.98</sum_event_value>
 		<min_event_value>9.66</min_event_value>
 		<max_event_value>9.66</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
 		<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.98</sum_event_value>
 				<min_event_value>9.66</min_event_value>
 				<max_event_value>9.66</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.66</avg_event_value>
 			</row>
 		</subtable>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml
index d0560a002319edb508cfeaecd7ca759b70929c88..a87c852b657d3d1a80bea6ef55070dfd36b6692a 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml
@@ -2,217 +2,217 @@
 <result>
 	<row>
 		<label>Spirited Away (千と千尋の神隠し)</label>
-		<nb_visits>16</nb_visits>
-		<nb_events>16</nb_events>
-		<nb_events_with_value>2</nb_events_with_value>
-		<sum_event_value>19.32</sum_event_value>
+		<nb_visits>24</nb_visits>
+		<nb_events>24</nb_events>
+		<nb_events_with_value>3</nb_events_with_value>
+		<sum_event_value>28.98</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
-		<sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
 		<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
 		<subtable>
 			<row>
 				<label>clickBuyNow</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play25%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play50%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play75%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>playEnd</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>playStart</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>playTrailer</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>rating</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.98</sum_event_value>
 				<min_event_value>9.66</min_event_value>
 				<max_event_value>9.66</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.66</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>La fiancée de l'eau</label>
-		<nb_visits>12</nb_visits>
-		<nb_events>14</nb_events>
-		<nb_events_with_value>4</nb_events_with_value>
-		<sum_event_value>38</sum_event_value>
+		<nb_visits>18</nb_visits>
+		<nb_events>21</nb_events>
+		<nb_events_with_value>6</nb_events_with_value>
+		<sum_event_value>57</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>10</max_event_value>
-		<sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.5</avg_event_value>
 		<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
 		<subtable>
 			<row>
 				<label>play</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play25%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play50%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play75%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>playEnd</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>rating</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>4</nb_events>
-				<nb_events_with_value>4</nb_events_with_value>
-				<sum_event_value>38</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>6</nb_events>
+				<nb_events_with_value>6</nb_events_with_value>
+				<sum_event_value>57</sum_event_value>
 				<min_event_value>9</min_event_value>
 				<max_event_value>10</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.5</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Event Name not defined</label>
-		<nb_visits>7</nb_visits>
-		<nb_events>7</nb_events>
+		<nb_visits>10</nb_visits>
+		<nb_events>10</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<subtable>
 			<row>
 				<label>Search</label>
-				<nb_visits>4</nb_visits>
-				<nb_events>4</nb_events>
+				<nb_visits>6</nb_visits>
+				<nb_events>6</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Purchase</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
@@ -230,100 +230,100 @@
 	</row>
 	<row>
 		<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
-		<nb_events_with_value>2</nb_events_with_value>
-		<sum_event_value>19.32</sum_event_value>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
+		<nb_events_with_value>3</nb_events_with_value>
+		<sum_event_value>28.98</sum_event_value>
 		<min_event_value>9.66</min_event_value>
 		<max_event_value>9.66</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
 		<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.98</sum_event_value>
 				<min_event_value>9.66</min_event_value>
 				<max_event_value>9.66</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.66</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Ponyo (崖の上のポニョ)</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Princess Mononoke (もののけ姫)</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Search query here</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventName==Search+query+here</segment>
 		<subtable>
 			<row>
 				<label>Search</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
index 3c677f06fd794808375afa8dd5c5e252c46ac82e..6c7b19157ad5c9021863f609e38fc75408a9cfe7 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
@@ -2,8 +2,8 @@
 <result>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>5</idVisit>
-		<visitIp>156.5.3.2</visitIp>
+		<idVisit>15</idVisit>
+		<visitIp>111.1.1.2</visitIp>
 		
 		<actionDetails>
 			<row>
@@ -11,7 +11,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>22</pageId>
+				<pageId>68</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Purchase</eventAction>
 				<icon>plugins/Morpheus/images/event.png</icon>
@@ -88,15 +88,11 @@
 			</row>
 		</customVariables>
 		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
+		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
+				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
 		
@@ -107,8 +103,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>4</idVisit>
-		<visitIp>156.5.3.2</visitIp>
+		<idVisit>14</idVisit>
+		<visitIp>111.1.1.2</visitIp>
 		
 		<actionDetails>
 			<row>
@@ -116,7 +112,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>21</pageId>
+				<pageId>67</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
 				<icon>plugins/Morpheus/images/event.png</icon>
@@ -193,15 +189,11 @@
 			</row>
 		</customVariables>
 		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
+		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
+				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
 		
@@ -212,8 +204,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>2</idVisit>
-		<visitIp>156.5.3.2</visitIp>
+		<idVisit>12</idVisit>
+		<visitIp>111.1.1.2</visitIp>
 		
 		<actionDetails>
 			<row>
@@ -221,7 +213,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>17</pageId>
+				<pageId>63</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>play50%</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -235,7 +227,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>18</pageId>
+				<pageId>64</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>play75%</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -249,7 +241,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>20</pageId>
+				<pageId>66</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
 				<eventName>Search query here</eventName>
@@ -263,7 +255,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>23</pageId>
+				<pageId>69</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playEnd</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -277,7 +269,7 @@
 				<url />
 				<pageIdAction />
 				
-				<pageId>24</pageId>
+				<pageId>70</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>rating</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -292,7 +284,7 @@
 				<url>http://example.org/finishedMovie</url>
 				<pageIdAction>27</pageIdAction>
 				
-				<pageId>25</pageId>
+				<pageId>71</pageId>
 				<eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventCategory>
 				<eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventAction>
 				<eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventName>
@@ -371,15 +363,11 @@
 			</row>
 		</customVariables>
 		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
+		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
+				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
 		
@@ -390,8 +378,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>3</idVisit>
-		<visitIp>156.5.3.2</visitIp>
+		<idVisit>13</idVisit>
+		<visitIp>111.1.1.2</visitIp>
 		
 		<actionDetails>
 			<row>
@@ -399,7 +387,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>19</pageId>
+				<pageId>65</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
 				<icon>plugins/Morpheus/images/event.png</icon>
@@ -476,15 +464,11 @@
 			</row>
 		</customVariables>
 		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
+		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
+				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
 		
@@ -495,40 +479,16 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>1</idVisit>
-		<visitIp>156.5.3.2</visitIp>
+		<idVisit>11</idVisit>
+		<visitIp>111.1.1.2</visitIp>
 		
 		<actionDetails>
-			<row>
-				<type>goal</type>
-				<goalName>triggered js</goalName>
-				<goalId>1</goalId>
-				<revenue>0</revenue>
-				<goalPageId>1</goalPageId>
-				
-				<url>http://example.org/webradio</url>
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				
-			</row>
-			<row>
-				<type>action</type>
-				<url>http://example.org/webradio</url>
-				<pageTitle>Welcome!</pageTitle>
-				<pageIdAction>2</pageIdAction>
-				
-				<pageId>1</pageId>
-				<generationTime>0.33s</generationTime>
-				<timeSpent>60</timeSpent>
-				<timeSpentPretty>1 min 0s</timeSpentPretty>
-				<icon />
-				
-			</row>
 			<row>
 				<type>event</type>
-				<url>http://example.org/webradio</url>
-				<pageIdAction>3</pageIdAction>
+				<url>http://example.com/piwik/</url>
+				<pageIdAction>31</pageIdAction>
 				
-				<pageId>2</pageId>
+				<pageId>49</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play</eventAction>
 				<customVariables>
@@ -545,10 +505,10 @@
 			</row>
 			<row>
 				<type>event</type>
-				<url>http://example.org/webradio</url>
-				<pageIdAction>3</pageIdAction>
+				<url>http://example.com/piwik/</url>
+				<pageIdAction>31</pageIdAction>
 				
-				<pageId>3</pageId>
+				<pageId>50</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play25%</eventAction>
 				<customVariables>
@@ -565,10 +525,10 @@
 			</row>
 			<row>
 				<type>event</type>
-				<url>http://example.org/webradio</url>
-				<pageIdAction>3</pageIdAction>
+				<url>http://example.com/piwik/</url>
+				<pageIdAction>31</pageIdAction>
 				
-				<pageId>4</pageId>
+				<pageId>51</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play50%</eventAction>
 				<customVariables>
@@ -585,10 +545,10 @@
 			</row>
 			<row>
 				<type>event</type>
-				<url>http://example.org/webradio</url>
-				<pageIdAction>3</pageIdAction>
+				<url>http://example.com/piwik/</url>
+				<pageIdAction>31</pageIdAction>
 				
-				<pageId>5</pageId>
+				<pageId>52</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play75%</eventAction>
 				<customVariables>
@@ -605,10 +565,10 @@
 			</row>
 			<row>
 				<type>event</type>
-				<url>http://example.org/webradio</url>
-				<pageIdAction>3</pageIdAction>
+				<url>http://example.com/piwik/</url>
+				<pageIdAction>31</pageIdAction>
 				
-				<pageId>6</pageId>
+				<pageId>53</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>playEnd</eventAction>
 				<customVariables>
@@ -625,10 +585,10 @@
 			</row>
 			<row>
 				<type>event</type>
-				<url>http://example.org/webradio</url>
-				<pageIdAction>3</pageIdAction>
+				<url>http://example.com/piwik/</url>
+				<pageIdAction>31</pageIdAction>
 				
-				<pageId>7</pageId>
+				<pageId>54</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>rating</eventAction>
 				<customVariables>
@@ -646,10 +606,10 @@
 			</row>
 			<row>
 				<type>event</type>
-				<url>http://example.org/webradio</url>
-				<pageIdAction>3</pageIdAction>
+				<url>http://example.com/piwik/</url>
+				<pageIdAction>31</pageIdAction>
 				
-				<pageId>8</pageId>
+				<pageId>55</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>rating</eventAction>
 				<customVariables>
@@ -660,30 +620,6 @@
 				</customVariables>
 				<eventName>La fiancée de l'eau</eventName>
 				<eventValue>10</eventValue>
-				<timeSpent>0</timeSpent>
-				<timeSpentPretty>0s</timeSpentPretty>
-				<icon>plugins/Morpheus/images/event.png</icon>
-				
-			</row>
-			<row>
-				<type>goal</type>
-				<goalName>event matching</goalName>
-				<goalId>3</goalId>
-				<revenue>0</revenue>
-				<goalPageId>9</goalPageId>
-				
-				<url />
-				<icon>plugins/Morpheus/images/goal.png</icon>
-				
-			</row>
-			<row>
-				<type>event</type>
-				<url />
-				<pageIdAction />
-				
-				<pageId>9</pageId>
-				<eventCategory>CategoryTriggersGoal here</eventCategory>
-				<eventAction>This is an event without a URL</eventAction>
 				<timeSpent>1499</timeSpent>
 				<timeSpentPretty>24 min 59s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
@@ -695,7 +631,7 @@
 				<pageTitle>Movie Theater</pageTitle>
 				<pageIdAction>15</pageIdAction>
 				
-				<pageId>10</pageId>
+				<pageId>56</pageId>
 				<generationTime>0.67s</generationTime>
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
@@ -707,7 +643,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>11</pageId>
+				<pageId>57</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playTrailer</eventAction>
 				<eventName>Princess Mononoke (もののけ姫)</eventName>
@@ -721,7 +657,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>12</pageId>
+				<pageId>58</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playTrailer</eventAction>
 				<eventName>Ponyo (崖の上のポニョ)</eventName>
@@ -735,7 +671,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>13</pageId>
+				<pageId>59</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playTrailer</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -749,7 +685,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>14</pageId>
+				<pageId>60</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>clickBuyNow</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -763,7 +699,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>15</pageId>
+				<pageId>61</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playStart</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -777,7 +713,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>16</pageId>
+				<pageId>62</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>play25%</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -785,7 +721,7 @@
 				
 			</row>
 		</actionDetails>
-		<goalConversions>2</goalConversions>
+		<goalConversions>0</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
@@ -795,18 +731,18 @@
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
-		<visitConverted>1</visitConverted>
-		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
+		<visitConverted>0</visitConverted>
+		<visitConvertedIcon />
 		<visitCount>1</visitCount>
 		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<visitDuration>3601</visitDuration>
-		<visitDurationPretty>1 hours 0 min</visitDurationPretty>
+		<visitDuration>3541</visitDuration>
+		<visitDurationPretty>59 min 1s</visitDurationPretty>
 		<searches>0</searches>
-		<actions>16</actions>
+		<actions>14</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -833,7 +769,7 @@
 		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
-		<events>14</events>
+		<events>13</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -855,15 +791,11 @@
 			</row>
 		</customVariables>
 		<resolution>1024x768</resolution>
-		<plugins>flash, java</plugins>
+		<plugins>director</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
-				<pluginName>flash</pluginName>
-			</row>
-			<row>
-				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
-				<pluginName>java</pluginName>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
+				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
 		
@@ -874,8 +806,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>10</idVisit>
-		<visitIp>111.1.1.1</visitIp>
+		<idVisit>5</idVisit>
+		<visitIp>156.5.3.2</visitIp>
 		
 		<actionDetails>
 			<row>
@@ -883,7 +815,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>45</pageId>
+				<pageId>22</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Purchase</eventAction>
 				<icon>plugins/Morpheus/images/event.png</icon>
@@ -960,11 +892,15 @@
 			</row>
 		</customVariables>
 		<resolution>1024x768</resolution>
-		<plugins>director</plugins>
+		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
-				<pluginName>director</pluginName>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
 		
@@ -975,8 +911,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>9</idVisit>
-		<visitIp>111.1.1.1</visitIp>
+		<idVisit>4</idVisit>
+		<visitIp>156.5.3.2</visitIp>
 		
 		<actionDetails>
 			<row>
@@ -984,7 +920,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>44</pageId>
+				<pageId>21</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
 				<icon>plugins/Morpheus/images/event.png</icon>
@@ -1061,11 +997,15 @@
 			</row>
 		</customVariables>
 		<resolution>1024x768</resolution>
-		<plugins>director</plugins>
+		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
-				<pluginName>director</pluginName>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
 		
@@ -1076,8 +1016,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>7</idVisit>
-		<visitIp>111.1.1.1</visitIp>
+		<idVisit>2</idVisit>
+		<visitIp>156.5.3.2</visitIp>
 		
 		<actionDetails>
 			<row>
@@ -1085,7 +1025,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>40</pageId>
+				<pageId>17</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>play50%</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -1099,7 +1039,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>41</pageId>
+				<pageId>18</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>play75%</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -1113,7 +1053,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>43</pageId>
+				<pageId>20</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
 				<eventName>Search query here</eventName>
@@ -1127,7 +1067,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>46</pageId>
+				<pageId>23</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playEnd</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -1141,7 +1081,7 @@
 				<url />
 				<pageIdAction />
 				
-				<pageId>47</pageId>
+				<pageId>24</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>rating</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -1156,7 +1096,7 @@
 				<url>http://example.org/finishedMovie</url>
 				<pageIdAction>27</pageIdAction>
 				
-				<pageId>48</pageId>
+				<pageId>25</pageId>
 				<eventCategory>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventCategory>
 				<eventAction>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventAction>
 				<eventName>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</eventName>
@@ -1235,11 +1175,15 @@
 			</row>
 		</customVariables>
 		<resolution>1024x768</resolution>
-		<plugins>director</plugins>
+		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
-				<pluginName>director</pluginName>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
 		
@@ -1250,8 +1194,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>8</idVisit>
-		<visitIp>111.1.1.1</visitIp>
+		<idVisit>3</idVisit>
+		<visitIp>156.5.3.2</visitIp>
 		
 		<actionDetails>
 			<row>
@@ -1259,7 +1203,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>42</pageId>
+				<pageId>19</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>Search</eventAction>
 				<icon>plugins/Morpheus/images/event.png</icon>
@@ -1336,11 +1280,15 @@
 			</row>
 		</customVariables>
 		<resolution>1024x768</resolution>
-		<plugins>director</plugins>
+		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
-				<pluginName>director</pluginName>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
 		
@@ -1351,16 +1299,40 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>6</idVisit>
-		<visitIp>111.1.1.1</visitIp>
+		<idVisit>1</idVisit>
+		<visitIp>156.5.3.2</visitIp>
 		
 		<actionDetails>
+			<row>
+				<type>goal</type>
+				<goalName>triggered js</goalName>
+				<goalId>1</goalId>
+				<revenue>0</revenue>
+				<goalPageId>1</goalPageId>
+				
+				<url>http://example.org/webradio</url>
+				<icon>plugins/Morpheus/images/goal.png</icon>
+				
+			</row>
+			<row>
+				<type>action</type>
+				<url>http://example.org/webradio</url>
+				<pageTitle>Welcome!</pageTitle>
+				<pageIdAction>2</pageIdAction>
+				
+				<pageId>1</pageId>
+				<generationTime>0.33s</generationTime>
+				<timeSpent>60</timeSpent>
+				<timeSpentPretty>1 min 0s</timeSpentPretty>
+				<icon />
+				
+			</row>
 			<row>
 				<type>event</type>
-				<url>http://example.com/piwik/</url>
-				<pageIdAction>31</pageIdAction>
+				<url>http://example.org/webradio</url>
+				<pageIdAction>3</pageIdAction>
 				
-				<pageId>26</pageId>
+				<pageId>2</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play</eventAction>
 				<customVariables>
@@ -1377,10 +1349,10 @@
 			</row>
 			<row>
 				<type>event</type>
-				<url>http://example.com/piwik/</url>
-				<pageIdAction>31</pageIdAction>
+				<url>http://example.org/webradio</url>
+				<pageIdAction>3</pageIdAction>
 				
-				<pageId>27</pageId>
+				<pageId>3</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play25%</eventAction>
 				<customVariables>
@@ -1397,10 +1369,10 @@
 			</row>
 			<row>
 				<type>event</type>
-				<url>http://example.com/piwik/</url>
-				<pageIdAction>31</pageIdAction>
+				<url>http://example.org/webradio</url>
+				<pageIdAction>3</pageIdAction>
 				
-				<pageId>28</pageId>
+				<pageId>4</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play50%</eventAction>
 				<customVariables>
@@ -1417,10 +1389,10 @@
 			</row>
 			<row>
 				<type>event</type>
-				<url>http://example.com/piwik/</url>
-				<pageIdAction>31</pageIdAction>
+				<url>http://example.org/webradio</url>
+				<pageIdAction>3</pageIdAction>
 				
-				<pageId>29</pageId>
+				<pageId>5</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>play75%</eventAction>
 				<customVariables>
@@ -1437,10 +1409,10 @@
 			</row>
 			<row>
 				<type>event</type>
-				<url>http://example.com/piwik/</url>
-				<pageIdAction>31</pageIdAction>
+				<url>http://example.org/webradio</url>
+				<pageIdAction>3</pageIdAction>
 				
-				<pageId>30</pageId>
+				<pageId>6</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>playEnd</eventAction>
 				<customVariables>
@@ -1457,10 +1429,10 @@
 			</row>
 			<row>
 				<type>event</type>
-				<url>http://example.com/piwik/</url>
-				<pageIdAction>31</pageIdAction>
+				<url>http://example.org/webradio</url>
+				<pageIdAction>3</pageIdAction>
 				
-				<pageId>31</pageId>
+				<pageId>7</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>rating</eventAction>
 				<customVariables>
@@ -1478,10 +1450,10 @@
 			</row>
 			<row>
 				<type>event</type>
-				<url>http://example.com/piwik/</url>
-				<pageIdAction>31</pageIdAction>
+				<url>http://example.org/webradio</url>
+				<pageIdAction>3</pageIdAction>
 				
-				<pageId>32</pageId>
+				<pageId>8</pageId>
 				<eventCategory>Music</eventCategory>
 				<eventAction>rating</eventAction>
 				<customVariables>
@@ -1492,6 +1464,30 @@
 				</customVariables>
 				<eventName>La fiancée de l'eau</eventName>
 				<eventValue>10</eventValue>
+				<timeSpent>0</timeSpent>
+				<timeSpentPretty>0s</timeSpentPretty>
+				<icon>plugins/Morpheus/images/event.png</icon>
+				
+			</row>
+			<row>
+				<type>goal</type>
+				<goalName>event matching</goalName>
+				<goalId>3</goalId>
+				<revenue>0</revenue>
+				<goalPageId>9</goalPageId>
+				
+				<url />
+				<icon>plugins/Morpheus/images/goal.png</icon>
+				
+			</row>
+			<row>
+				<type>event</type>
+				<url />
+				<pageIdAction />
+				
+				<pageId>9</pageId>
+				<eventCategory>CategoryTriggersGoal here</eventCategory>
+				<eventAction>This is an event without a URL</eventAction>
 				<timeSpent>1499</timeSpent>
 				<timeSpentPretty>24 min 59s</timeSpentPretty>
 				<icon>plugins/Morpheus/images/event.png</icon>
@@ -1503,7 +1499,7 @@
 				<pageTitle>Movie Theater</pageTitle>
 				<pageIdAction>15</pageIdAction>
 				
-				<pageId>33</pageId>
+				<pageId>10</pageId>
 				<generationTime>0.67s</generationTime>
 				<timeSpent>60</timeSpent>
 				<timeSpentPretty>1 min 0s</timeSpentPretty>
@@ -1515,7 +1511,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>34</pageId>
+				<pageId>11</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playTrailer</eventAction>
 				<eventName>Princess Mononoke (もののけ姫)</eventName>
@@ -1529,7 +1525,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>35</pageId>
+				<pageId>12</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playTrailer</eventAction>
 				<eventName>Ponyo (崖の上のポニョ)</eventName>
@@ -1543,7 +1539,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>36</pageId>
+				<pageId>13</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playTrailer</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -1557,7 +1553,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>37</pageId>
+				<pageId>14</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>clickBuyNow</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -1571,7 +1567,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>38</pageId>
+				<pageId>15</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>playStart</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -1585,7 +1581,7 @@
 				<url>http://example.org/movies</url>
 				<pageIdAction>16</pageIdAction>
 				
-				<pageId>39</pageId>
+				<pageId>16</pageId>
 				<eventCategory>Movie</eventCategory>
 				<eventAction>play25%</eventAction>
 				<eventName>Spirited Away (千と千尋の神隠し)</eventName>
@@ -1593,7 +1589,7 @@
 				
 			</row>
 		</actionDetails>
-		<goalConversions>0</goalConversions>
+		<goalConversions>2</goalConversions>
 		<siteCurrency>USD</siteCurrency>
 		<siteCurrencySymbol>$</siteCurrencySymbol>
 		
@@ -1603,18 +1599,18 @@
 		<userId />
 		<visitorType>new</visitorType>
 		<visitorTypeIcon />
-		<visitConverted>0</visitConverted>
-		<visitConvertedIcon />
+		<visitConverted>1</visitConverted>
+		<visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon>
 		<visitCount>1</visitCount>
 		
 		<visitEcommerceStatus>none</visitEcommerceStatus>
 		<visitEcommerceStatusIcon />
 		<daysSinceFirstVisit>0</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
-		<visitDuration>3541</visitDuration>
-		<visitDurationPretty>59 min 1s</visitDurationPretty>
+		<visitDuration>3601</visitDuration>
+		<visitDurationPretty>1 hours 0 min</visitDurationPretty>
 		<searches>0</searches>
-		<actions>14</actions>
+		<actions>16</actions>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -1641,7 +1637,7 @@
 		<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
-		<events>13</events>
+		<events>14</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>France</country>
@@ -1663,11 +1659,15 @@
 			</row>
 		</customVariables>
 		<resolution>1024x768</resolution>
-		<plugins>director</plugins>
+		<plugins>flash, java</plugins>
 		<pluginsIcons>
 			<row>
-				<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
-				<pluginName>director</pluginName>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
+				<pluginName>flash</pluginName>
+			</row>
+			<row>
+				<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
+				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
 		
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml
index ced40076d26cb89e62b3bb3e1ba67dcf9d3508a8..26def0abf9a5fdbb1bdaebaa423b95ed9e3889ac 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getCategory_month.xml
@@ -2,229 +2,229 @@
 <result>
 	<row>
 		<label>Movie</label>
-		<nb_visits>28</nb_visits>
-		<nb_events>28</nb_events>
-		<nb_events_with_value>2</nb_events_with_value>
-		<sum_event_value>19.32</sum_event_value>
+		<nb_visits>42</nb_visits>
+		<nb_events>42</nb_events>
+		<nb_events_with_value>3</nb_events_with_value>
+		<sum_event_value>28.98</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
-		<sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>39</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
 		<segment>eventCategory==Movie</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
-				<nb_visits>6</nb_visits>
-				<nb_events>6</nb_events>
+				<nb_visits>9</nb_visits>
+				<nb_events>9</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Search</label>
-				<nb_visits>6</nb_visits>
-				<nb_events>6</nb_events>
+				<nb_visits>9</nb_visits>
+				<nb_events>9</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>clickBuyNow</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play25%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play50%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play75%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>playEnd</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>playStart</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Purchase</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>rating</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.98</sum_event_value>
 				<min_event_value>9.66</min_event_value>
 				<max_event_value>9.66</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.66</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Music</label>
-		<nb_visits>12</nb_visits>
-		<nb_events>14</nb_events>
-		<nb_events_with_value>4</nb_events_with_value>
-		<sum_event_value>38</sum_event_value>
+		<nb_visits>18</nb_visits>
+		<nb_events>21</nb_events>
+		<nb_events_with_value>6</nb_events_with_value>
+		<sum_event_value>57</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>10</max_event_value>
-		<sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.5</avg_event_value>
 		<segment>eventCategory==Music</segment>
 		<subtable>
 			<row>
 				<label>play</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play25%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play50%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play75%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>playEnd</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>rating</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>4</nb_events>
-				<nb_events_with_value>4</nb_events_with_value>
-				<sum_event_value>38</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>6</nb_events>
+				<nb_events_with_value>6</nb_events_with_value>
+				<sum_event_value>57</sum_event_value>
 				<min_event_value>9</min_event_value>
 				<max_event_value>10</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.5</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
-		<nb_events_with_value>2</nb_events_with_value>
-		<sum_event_value>19.32</sum_event_value>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
+		<nb_events_with_value>3</nb_events_with_value>
+		<sum_event_value>28.98</sum_event_value>
 		<min_event_value>9.66</min_event_value>
 		<max_event_value>9.66</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
 		<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.98</sum_event_value>
 				<min_event_value>9.66</min_event_value>
 				<max_event_value>9.66</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.66</avg_event_value>
 			</row>
 		</subtable>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml
index d0560a002319edb508cfeaecd7ca759b70929c88..a87c852b657d3d1a80bea6ef55070dfd36b6692a 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml
@@ -2,217 +2,217 @@
 <result>
 	<row>
 		<label>Spirited Away (千と千尋の神隠し)</label>
-		<nb_visits>16</nb_visits>
-		<nb_events>16</nb_events>
-		<nb_events_with_value>2</nb_events_with_value>
-		<sum_event_value>19.32</sum_event_value>
+		<nb_visits>24</nb_visits>
+		<nb_events>24</nb_events>
+		<nb_events_with_value>3</nb_events_with_value>
+		<sum_event_value>28.98</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
-		<sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
 		<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
 		<subtable>
 			<row>
 				<label>clickBuyNow</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play25%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play50%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play75%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>playEnd</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>playStart</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>playTrailer</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>rating</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.98</sum_event_value>
 				<min_event_value>9.66</min_event_value>
 				<max_event_value>9.66</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.66</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>La fiancée de l'eau</label>
-		<nb_visits>12</nb_visits>
-		<nb_events>14</nb_events>
-		<nb_events_with_value>4</nb_events_with_value>
-		<sum_event_value>38</sum_event_value>
+		<nb_visits>18</nb_visits>
+		<nb_events>21</nb_events>
+		<nb_events_with_value>6</nb_events_with_value>
+		<sum_event_value>57</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>10</max_event_value>
-		<sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.5</avg_event_value>
 		<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
 		<subtable>
 			<row>
 				<label>play</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play25%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play50%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play75%</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>playEnd</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>rating</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>4</nb_events>
-				<nb_events_with_value>4</nb_events_with_value>
-				<sum_event_value>38</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>6</nb_events>
+				<nb_events_with_value>6</nb_events_with_value>
+				<sum_event_value>57</sum_event_value>
 				<min_event_value>9</min_event_value>
 				<max_event_value>10</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.5</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Event Name not defined</label>
-		<nb_visits>7</nb_visits>
-		<nb_events>7</nb_events>
+		<nb_visits>10</nb_visits>
+		<nb_events>10</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<subtable>
 			<row>
 				<label>Search</label>
-				<nb_visits>4</nb_visits>
-				<nb_events>4</nb_events>
+				<nb_visits>6</nb_visits>
+				<nb_events>6</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Purchase</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
@@ -230,100 +230,100 @@
 	</row>
 	<row>
 		<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
-		<nb_events_with_value>2</nb_events_with_value>
-		<sum_event_value>19.32</sum_event_value>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
+		<nb_events_with_value>3</nb_events_with_value>
+		<sum_event_value>28.98</sum_event_value>
 		<min_event_value>9.66</min_event_value>
 		<max_event_value>9.66</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
 		<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.98</sum_event_value>
 				<min_event_value>9.66</min_event_value>
 				<max_event_value>9.66</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.66</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Ponyo (崖の上のポニョ)</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Princess Mononoke (もののけ姫)</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
 		<subtable>
 			<row>
 				<label>playTrailer</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Search query here</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventName==Search+query+here</segment>
 		<subtable>
 			<row>
 				<label>Search</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml
index 8503a4dc17a8499d6c57195d5f11eecc1456792d..65c0b2aa9e7b1c91e895de8b4c353e1fbfa59517 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getAction_month.xml
@@ -2,355 +2,355 @@
 <result>
 	<row>
 		<label>playTrailer</label>
-		<nb_visits>6</nb_visits>
-		<nb_events>6</nb_events>
+		<nb_visits>9</nb_visits>
+		<nb_events>9</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==playTrailer</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
-				<nb_visits>6</nb_visits>
-				<nb_events>6</nb_events>
+				<nb_visits>9</nb_visits>
+				<nb_events>9</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Search</label>
-		<nb_visits>6</nb_visits>
-		<nb_events>6</nb_events>
+		<nb_visits>9</nb_visits>
+		<nb_events>9</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==Search</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
-				<nb_visits>6</nb_visits>
-				<nb_events>6</nb_events>
+				<nb_visits>9</nb_visits>
+				<nb_events>9</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>play25%</label>
-		<nb_visits>4</nb_visits>
-		<nb_events>4</nb_events>
+		<nb_visits>6</nb_visits>
+		<nb_events>6</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==play25%25</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Music</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>play50%</label>
-		<nb_visits>4</nb_visits>
-		<nb_events>4</nb_events>
+		<nb_visits>6</nb_visits>
+		<nb_events>6</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==play50%25</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Music</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>play75%</label>
-		<nb_visits>4</nb_visits>
-		<nb_events>4</nb_events>
+		<nb_visits>6</nb_visits>
+		<nb_events>6</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==play75%25</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Music</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>playEnd</label>
-		<nb_visits>4</nb_visits>
-		<nb_events>4</nb_events>
+		<nb_visits>6</nb_visits>
+		<nb_events>6</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==playEnd</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Music</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>rating</label>
-		<nb_visits>4</nb_visits>
-		<nb_events>6</nb_events>
-		<nb_events_with_value>6</nb_events_with_value>
-		<sum_event_value>57.32</sum_event_value>
+		<nb_visits>6</nb_visits>
+		<nb_events>9</nb_events>
+		<nb_events_with_value>9</nb_events_with_value>
+		<sum_event_value>85.98</sum_event_value>
 		<min_event_value>9</min_event_value>
 		<max_event_value>10</max_event_value>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.55</avg_event_value>
 		<segment>eventAction==rating</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.98</sum_event_value>
 				<min_event_value>9.66</min_event_value>
 				<max_event_value>9.66</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.66</avg_event_value>
 			</row>
 			<row>
 				<label>Music</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>4</nb_events>
-				<nb_events_with_value>4</nb_events_with_value>
-				<sum_event_value>38</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>6</nb_events>
+				<nb_events_with_value>6</nb_events_with_value>
+				<sum_event_value>57</sum_event_value>
 				<min_event_value>9</min_event_value>
 				<max_event_value>10</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.5</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>clickBuyNow</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==clickBuyNow</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
-		<nb_events_with_value>2</nb_events_with_value>
-		<sum_event_value>19.32</sum_event_value>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
+		<nb_events_with_value>3</nb_events_with_value>
+		<sum_event_value>28.98</sum_event_value>
 		<min_event_value>9.66</min_event_value>
 		<max_event_value>9.66</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
 		<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.98</sum_event_value>
 				<min_event_value>9.66</min_event_value>
 				<max_event_value>9.66</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.66</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>play</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==play</segment>
 		<subtable>
 			<row>
 				<label>Music</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>playStart</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==playStart</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Purchase</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==Purchase</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml
index ceeee487c16232f9bc19c731c252df52bd914c33..bc59d36fd8945ff8d9a3a0aeac081acf010b2c99 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml
@@ -2,74 +2,74 @@
 <result>
 	<row>
 		<label>Spirited Away (千と千尋の神隠し)</label>
-		<nb_visits>16</nb_visits>
-		<nb_events>16</nb_events>
-		<nb_events_with_value>2</nb_events_with_value>
-		<sum_event_value>19.32</sum_event_value>
+		<nb_visits>24</nb_visits>
+		<nb_events>24</nb_events>
+		<nb_events_with_value>3</nb_events_with_value>
+		<sum_event_value>28.98</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
-		<sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
 		<segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
-				<nb_visits>16</nb_visits>
-				<nb_events>16</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
+				<nb_visits>24</nb_visits>
+				<nb_events>24</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.98</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>9.66</max_event_value>
-				<sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.66</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>La fiancée de l'eau</label>
-		<nb_visits>12</nb_visits>
-		<nb_events>14</nb_events>
-		<nb_events_with_value>4</nb_events_with_value>
-		<sum_event_value>38</sum_event_value>
+		<nb_visits>18</nb_visits>
+		<nb_events>21</nb_events>
+		<nb_events_with_value>6</nb_events_with_value>
+		<sum_event_value>57</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>10</max_event_value>
-		<sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.5</avg_event_value>
 		<segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment>
 		<subtable>
 			<row>
 				<label>Music</label>
-				<nb_visits>12</nb_visits>
-				<nb_events>14</nb_events>
-				<nb_events_with_value>4</nb_events_with_value>
-				<sum_event_value>38</sum_event_value>
+				<nb_visits>18</nb_visits>
+				<nb_events>21</nb_events>
+				<nb_events_with_value>6</nb_events_with_value>
+				<sum_event_value>57</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>10</max_event_value>
-				<sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.5</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Event Name not defined</label>
-		<nb_visits>7</nb_visits>
-		<nb_events>7</nb_events>
+		<nb_visits>10</nb_visits>
+		<nb_events>10</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<subtable>
 			<row>
 				<label>Movie</label>
-				<nb_visits>6</nb_visits>
-				<nb_events>6</nb_events>
+				<nb_visits>9</nb_visits>
+				<nb_events>9</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
@@ -87,100 +87,100 @@
 	</row>
 	<row>
 		<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
-		<nb_events_with_value>2</nb_events_with_value>
-		<sum_event_value>19.32</sum_event_value>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
+		<nb_events_with_value>3</nb_events_with_value>
+		<sum_event_value>28.98</sum_event_value>
 		<min_event_value>9.66</min_event_value>
 		<max_event_value>9.66</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
 		<segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.98</sum_event_value>
 				<min_event_value>9.66</min_event_value>
 				<max_event_value>9.66</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.66</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Ponyo (崖の上のポニョ)</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Princess Mononoke (もののけ姫)</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Search query here</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventName==Search+query+here</segment>
 		<subtable>
 			<row>
 				<label>Movie</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml
index f60a44a673fc89b485ab265f2e0c4337fcf136d0..07715b1b6f4e901daa2106381fe76fd821278e5b 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml
@@ -2,365 +2,365 @@
 <result>
 	<row>
 		<label>playTrailer</label>
-		<nb_visits>6</nb_visits>
-		<nb_events>6</nb_events>
+		<nb_visits>9</nb_visits>
+		<nb_events>9</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==playTrailer</segment>
 		<subtable>
 			<row>
 				<label>Ponyo (崖の上のポニョ)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Princess Mononoke (もののけ姫)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Search</label>
-		<nb_visits>6</nb_visits>
-		<nb_events>6</nb_events>
+		<nb_visits>9</nb_visits>
+		<nb_events>9</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==Search</segment>
 		<subtable>
 			<row>
 				<label>Search query here</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>play25%</label>
-		<nb_visits>4</nb_visits>
-		<nb_events>4</nb_events>
+		<nb_visits>6</nb_visits>
+		<nb_events>6</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==play25%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l'eau</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>play50%</label>
-		<nb_visits>4</nb_visits>
-		<nb_events>4</nb_events>
+		<nb_visits>6</nb_visits>
+		<nb_events>6</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==play50%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l'eau</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>play75%</label>
-		<nb_visits>4</nb_visits>
-		<nb_events>4</nb_events>
+		<nb_visits>6</nb_visits>
+		<nb_events>6</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==play75%25</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l'eau</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>playEnd</label>
-		<nb_visits>4</nb_visits>
-		<nb_events>4</nb_events>
+		<nb_visits>6</nb_visits>
+		<nb_events>6</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==playEnd</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l'eau</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>rating</label>
-		<nb_visits>4</nb_visits>
-		<nb_events>6</nb_events>
-		<nb_events_with_value>6</nb_events_with_value>
-		<sum_event_value>57.32</sum_event_value>
+		<nb_visits>6</nb_visits>
+		<nb_events>9</nb_events>
+		<nb_events_with_value>9</nb_events_with_value>
+		<sum_event_value>85.98</sum_event_value>
 		<min_event_value>9</min_event_value>
 		<max_event_value>10</max_event_value>
-		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.55</avg_event_value>
 		<segment>eventAction==rating</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l'eau</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>4</nb_events>
-				<nb_events_with_value>4</nb_events_with_value>
-				<sum_event_value>38</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>6</nb_events>
+				<nb_events_with_value>6</nb_events_with_value>
+				<sum_event_value>57</sum_event_value>
 				<min_event_value>9</min_event_value>
 				<max_event_value>10</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.5</avg_event_value>
 			</row>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.98</sum_event_value>
 				<min_event_value>9.66</min_event_value>
 				<max_event_value>9.66</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.66</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>clickBuyNow</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==clickBuyNow</segment>
 		<subtable>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
-		<nb_events_with_value>2</nb_events_with_value>
-		<sum_event_value>19.32</sum_event_value>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
+		<nb_events_with_value>3</nb_events_with_value>
+		<sum_event_value>28.98</sum_event_value>
 		<min_event_value>9.66</min_event_value>
 		<max_event_value>9.66</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
 		<segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.98</sum_event_value>
 				<min_event_value>9.66</min_event_value>
 				<max_event_value>9.66</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.66</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>play</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==play</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l'eau</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>playStart</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==playStart</segment>
 		<subtable>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Purchase</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
 		<nb_events_with_value>0</nb_events_with_value>
 		<sum_event_value>0</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>0</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>0</avg_event_value>
 		<segment>eventAction==Purchase</segment>
 	</row>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml
index 5f3a8a5f0c513565ac158328e0bb38e17f728540..e74fe076fde38b4547d8e003f54549a35ae44fe0 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml
@@ -2,108 +2,108 @@
 <result>
 	<row>
 		<label>Movie</label>
-		<nb_visits>28</nb_visits>
-		<nb_events>28</nb_events>
-		<nb_events_with_value>2</nb_events_with_value>
-		<sum_event_value>19.32</sum_event_value>
+		<nb_visits>42</nb_visits>
+		<nb_events>42</nb_events>
+		<nb_events_with_value>3</nb_events_with_value>
+		<sum_event_value>28.98</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>9.66</max_event_value>
-		<sum_daily_nb_uniq_visitors>26</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>39</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
 		<segment>eventCategory==Movie</segment>
 		<subtable>
 			<row>
 				<label>Spirited Away (千と千尋の神隠し)</label>
-				<nb_visits>16</nb_visits>
-				<nb_events>16</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
+				<nb_visits>24</nb_visits>
+				<nb_events>24</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.98</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>9.66</max_event_value>
-				<sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>24</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.66</avg_event_value>
 			</row>
 			<row>
 				<label>Ponyo (崖の上のポニョ)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Princess Mononoke (もののけ姫)</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Search query here</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
 				<nb_events_with_value>0</nb_events_with_value>
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>0</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>Music</label>
-		<nb_visits>12</nb_visits>
-		<nb_events>14</nb_events>
-		<nb_events_with_value>4</nb_events_with_value>
-		<sum_event_value>38</sum_event_value>
+		<nb_visits>18</nb_visits>
+		<nb_events>21</nb_events>
+		<nb_events_with_value>6</nb_events_with_value>
+		<sum_event_value>57</sum_event_value>
 		<min_event_value>0</min_event_value>
 		<max_event_value>10</max_event_value>
-		<sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.5</avg_event_value>
 		<segment>eventCategory==Music</segment>
 		<subtable>
 			<row>
 				<label>La fiancée de l'eau</label>
-				<nb_visits>12</nb_visits>
-				<nb_events>14</nb_events>
-				<nb_events_with_value>4</nb_events_with_value>
-				<sum_event_value>38</sum_event_value>
+				<nb_visits>18</nb_visits>
+				<nb_events>21</nb_events>
+				<nb_events_with_value>6</nb_events_with_value>
+				<sum_event_value>57</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>10</max_event_value>
-				<sum_daily_nb_uniq_visitors>12</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.5</avg_event_value>
 			</row>
 		</subtable>
 	</row>
 	<row>
 		<label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-		<nb_visits>2</nb_visits>
-		<nb_events>2</nb_events>
-		<nb_events_with_value>2</nb_events_with_value>
-		<sum_event_value>19.32</sum_event_value>
+		<nb_visits>3</nb_visits>
+		<nb_events>3</nb_events>
+		<nb_events_with_value>3</nb_events_with_value>
+		<sum_event_value>28.98</sum_event_value>
 		<min_event_value>9.66</min_event_value>
 		<max_event_value>9.66</max_event_value>
-		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<avg_event_value>9.66</avg_event_value>
 		<segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment>
 		<subtable>
 			<row>
 				<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
-				<nb_visits>2</nb_visits>
-				<nb_events>2</nb_events>
-				<nb_events_with_value>2</nb_events_with_value>
-				<sum_event_value>19.32</sum_event_value>
+				<nb_visits>3</nb_visits>
+				<nb_events>3</nb_events>
+				<nb_events_with_value>3</nb_events_with_value>
+				<sum_event_value>28.98</sum_event_value>
 				<min_event_value>9.66</min_event_value>
 				<max_event_value>9.66</max_event_value>
-				<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+				<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 				<avg_event_value>9.66</avg_event_value>
 			</row>
 		</subtable>