Customizeable / Extendable Visitor Profile & Visitor Log (#11579)

* move setting visitor details into own classes instead of using an event

* move manipulating actions to VisitorDetails classes

* move some more parts to plugins

* update test files as order of columns changed

* implement new VisitorDetails method to provide actions

* move rendering actions to visitordetail classes

* render visitor properties in new classes

* makes it possible to attach icons to visitor log

* moves rendering of action tooltip into new visitordetails method

* adds event for extending custom action dimension fields

* small improvements

* fetch log_link_visit_action.idpageview for actions

* improve variable name

* started to improve/change visitor profile

* show devices summary in visitor profile

* also remove empty xml tags for api tests

* hide actions in visitor profile by default

* move all icons to the middle of visitor log

* small change

* move rendering referrer information to referrers plugin

* move provider logic to provider plugin

* show content interactions in visitor log

* improve look of content interactions/impressions in visitor log / profile

* hide idpageview from tests

* update changelog

* move rendering events to Events plugin

* do not hide duplicate page views in visitor log, but show them with a refresh icon instead

* show top visited pages in visitor profile

* always show visitor profile link in visitor log

Still hidden in a widget by default, as it might overlay some other content

* Show info about not shown actions

truncated due to config setting

* use bulk queries to fetch actions instead of fetching them for each visit

* small adjustments

* improve some loops to improve memory usage

* move gathering visitor profile informations to VisitorDetails classes

* update screenshots

* update test files

* move rendering of visitor profile summary to visitor details classes

* improve templates

* Makes VisitorDetailsAbstract class api and improves comments

* show visit details in visitor profile

* improve css

* reverse enumeration of visits in visitor profile

* improve css

* Show visit id in IP tooltip

* Small CSS improvements

* further adjustments

* sort devices by count

* adds UI tests for visitor log and profile

* Show bandwidth in visitor profile test

* show actions by default and add button to toggle all together

* CSS cleanup

* remove border around refresh icon

* add tooltip for refresh icon in profile

* move first/last visit before top visited pages

* Improve text shown for unique pageviews

* link urls in top visited pages

* improve sorting of device list

* improve tests

* Improve device overview in visitor profile

* only render top pages if at least one page was visited more than once

* make visitor id non bold

* hide visitor type icon in profile, and show latest visits icons in overview

* fix search engine icon in visitor details

* small improvements

* only render view if required

* show visit icons only on hover in profile

* remove from again

* test improves

* show text besides icon in profile header

* improve tests

* Removes unused CSS and JS

* Reformats CSS

* Removes invisible paper clip

* Removes unused profile images from Live plugin

* raise test timeouts

* Improve UI tests splitting for travis

* show device type in profile header if no resolution is available

* prevent text overlapping

* no retries

* fix test

* change summary order

* fix position of export icon

* fixes tooltip text

* improve pages overview

* visitor details order

* action tooltip order

* show only ecommerce icon if no goals where converted

* show custom variables summary in profile

* show user id in same size as headline

* link referer urls for first/last visit in profile

* make profile xml compatible

* try to improve ui test

* increase bottom marign

* increase version number

* small adjustments

* CSS Rewrite for visitor profile

* center action icons in visitor log and profile

* improve widgetized visitor profile

* small layout fix

* always populate raw referrer url for visitor details

* update expected test files

* Refactor profile summaries into additional classes

* update screenshots

* submodule update

* update piwik-icons submodule (#11904)

* update piwik-icons submodule

* fix some system tests

* update screenshots

* make device list xml compatible

* improve translation

* improve icon position

* improves spacings

* update test files

* small css improvement

* update screenshots

10 files changed, 2183 insertions, 130 deletions

diff --git a/plugins/Contents/Contents.php b/plugins/Contents/Contents.php
index 99e47bf8fd..289bdb25ec 100644
--- a/plugins/Contents/Contents.php
+++ b/plugins/Contents/Contents.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik\Plugins\Contents;
 
+use Piwik\Common;
 use Piwik\Piwik;
 
 class Contents extends \Piwik\Plugin
@@ -21,6 +22,7 @@ class Contents extends \Piwik\Plugin
             'Metrics.getDefaultMetricTranslations' => 'addMetricTranslations',
             'Metrics.getDefaultMetricDocumentationTranslations' => 'addMetricDocumentationTranslations',
             'AssetManager.getJavaScriptFiles' => 'getJsFiles',
+            'Actions.getCustomActionDimensionFieldsAndJoins' => 'provideActionDimensionFields'
         );
     }
 
@@ -41,4 +43,20 @@ class Contents extends \Piwik\Plugin
         $translations['nb_impressions'] = Piwik::translate('Contents_ImpressionsMetricDocumentation');
         $translations['nb_interactions'] = Piwik::translate('Contents_InteractionsMetricDocumentation');
     }
+
+    public function provideActionDimensionFields(&$fields, &$joins)
+    {
+        $fields[] = 'log_action_content_name.name as contentName';
+        $fields[] = 'log_action_content_piece.name as contentPiece';
+        $fields[] = 'log_action_content_target.name as contentTarget';
+        $fields[] = 'log_action_content_interaction.name as contentInteraction';
+        $joins[] = 'LEFT JOIN ' . Common::prefixTable('log_action') . ' AS log_action_content_name
+					ON  log_link_visit_action.idaction_content_name = log_action_content_name.idaction';
+        $joins[] = 'LEFT JOIN ' . Common::prefixTable('log_action') . ' AS log_action_content_piece
+					ON  log_link_visit_action.idaction_content_piece = log_action_content_piece.idaction';
+        $joins[] = 'LEFT JOIN ' . Common::prefixTable('log_action') . ' AS log_action_content_target
+					ON  log_link_visit_action.idaction_content_target = log_action_content_target.idaction';
+        $joins[] = 'LEFT JOIN ' . Common::prefixTable('log_action') . ' AS log_action_content_interaction
+					ON  log_link_visit_action.idaction_content_interaction = log_action_content_interaction.idaction';
+    }
 }
diff --git a/plugins/Contents/VisitorDetails.php b/plugins/Contents/VisitorDetails.php
new file mode 100644
index 0000000000..acf3363d38
--- /dev/null
+++ b/plugins/Contents/VisitorDetails.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link    http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Contents;
+
+use Piwik\Plugins\Live\VisitorDetailsAbstract;
+use Piwik\Tracker\Action;
+use Piwik\View;
+
+class VisitorDetails extends VisitorDetailsAbstract
+{
+    public function extendActionDetails(&$action, $nextAction, $visitorDetails)
+    {
+        if ($action['type'] != Action::TYPE_CONTENT) {
+            unset($action['contentName']);
+            unset($action['contentPiece']);
+            unset($action['contentTarget']);
+            unset($action['contentInteraction']);
+        }
+    }
+
+    public function renderAction($action, $previousAction, $visitorDetails)
+    {
+        if ($action['type'] != Action::TYPE_CONTENT) {
+            return;
+        }
+
+        $view                 = new View('@Contents/_actionContent.twig');
+        $view->action         = $action;
+        $view->previousAction = $previousAction;
+        $view->visitInfo      = $visitorDetails;
+        return $view->render();
+    }
+
+    public function renderActionTooltip($action, $visitInfo)
+    {
+        if ($action['type'] != Action::TYPE_CONTENT) {
+            return [];
+        }
+
+        $view         = new View('@Contents/_actionTooltip');
+        $view->action = $action;
+        return [[ 10, $view->render() ]];
+    }
+}
\ No newline at end of file
diff --git a/plugins/Contents/lang/en.json b/plugins/Contents/lang/en.json
index 915b9d9746..0947590f69 100644
--- a/plugins/Contents/lang/en.json
+++ b/plugins/Contents/lang/en.json
@@ -2,6 +2,7 @@
     "Contents": {
         "PluginDescription": "Content and banner tracking lets you measure the performance (views, clicks, CTR) of any piece of content on your pages (Banner ad, image, any item).",
         "Impressions": "Impressions",
+        "ContentImpression": "Content Impression",
         "ContentInteraction": "Content Interaction",
         "ContentInteractions": "Content Interactions",
         "InteractionRate": "Interaction Rate",
diff --git a/plugins/Contents/templates/_actionContent.twig b/plugins/Contents/templates/_actionContent.twig
new file mode 100644
index 0000000000..138f0e350e
--- /dev/null
+++ b/plugins/Contents/templates/_actionContent.twig
@@ -0,0 +1,15 @@
+<li class="content"
+    title="{{ postEvent('Live.renderActionTooltip', action, visitInfo) }}">
+    <div>
+        {% if action.contentInteraction %}
+        <span class="icon-document action-list-action-icon" title="{{ 'Contents_ContentInteraction'|translate }}"></span>
+        {% else %}
+        <span class="icon-show action-list-action-icon" title="{{ 'Contents_ContentImpression'|translate }}"></span>
+        {% endif %}
+        {% if action.contentInteraction %}
+            [{{ action.contentInteraction }}]
+        {% endif %}
+        {{ action.contentName }} -
+        {{ action.contentPiece }}
+    </div>
+</li>
diff --git a/plugins/Contents/templates/_actionTooltip.twig b/plugins/Contents/templates/_actionTooltip.twig
new file mode 100644
index 0000000000..c81c6883b4
--- /dev/null
+++ b/plugins/Contents/templates/_actionTooltip.twig
@@ -0,0 +1,9 @@
+{% if action.contentName %}
+
+{{ 'Contents_ContentName'|translate }}: {{ action.contentName }}{% endif %}{% if action.contentPiece %}
+
+{{ 'Contents_ContentPiece'|translate }}: {{ action.contentPiece }}{% endif %}{% if action.contentTarget %}
+
+{{ 'Contents_ContentTarget'|translate }}: {{ action.contentTarget }}{% endif %}{% if action.contentInteraction %}
+
+{{ 'Contents_ContentInteraction'|translate }}: {{ action.contentInteraction }}{% endif %}
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
index 24930328ff..52061fb273 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
@@ -12,14 +12,215 @@
 				<pageTitle>Ads</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
+				<bandwidth />
+				<timeSpent>271</timeSpent>
+				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>271</timeSpent>
-				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>2</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>Unknown</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>3</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece />
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>120</timeSpentRef>
+				<pageId>4</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>5</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad2.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>6</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction>submit</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>7</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>8</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>9</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>10</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>11</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>30</timeSpentRef>
+				<pageId>12</pageId>
+				<contentName>Video Ad</contentName>
+				<contentPiece>movie.mov</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -71,6 +272,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -104,17 +311,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -128,14 +324,215 @@
 				<pageTitle>Ads</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>13</pageId>
+				<bandwidth />
+				<timeSpent>271</timeSpent>
+				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>271</timeSpent>
-				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>14</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>Unknown</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>15</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece />
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>120</timeSpentRef>
+				<pageId>16</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>17</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad2.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>18</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction>submit</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>19</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>20</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>21</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>22</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>23</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>30</timeSpentRef>
+				<pageId>24</pageId>
+				<contentName>Video Ad</contentName>
+				<contentPiece>movie.mov</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -187,6 +584,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -216,16 +619,5 @@
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
index 24930328ff..52061fb273 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
@@ -12,14 +12,215 @@
 				<pageTitle>Ads</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
+				<bandwidth />
+				<timeSpent>271</timeSpent>
+				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>271</timeSpent>
-				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>2</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>Unknown</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>3</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece />
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>120</timeSpentRef>
+				<pageId>4</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>5</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad2.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>6</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction>submit</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>7</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>8</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>9</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>10</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>11</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>30</timeSpentRef>
+				<pageId>12</pageId>
+				<contentName>Video Ad</contentName>
+				<contentPiece>movie.mov</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -71,6 +272,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -104,17 +311,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -128,14 +324,215 @@
 				<pageTitle>Ads</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>13</pageId>
+				<bandwidth />
+				<timeSpent>271</timeSpent>
+				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>271</timeSpent>
-				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>14</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>Unknown</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>15</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece />
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>120</timeSpentRef>
+				<pageId>16</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>17</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad2.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>18</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction>submit</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>19</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>20</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>21</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>22</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>23</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>30</timeSpentRef>
+				<pageId>24</pageId>
+				<contentName>Video Ad</contentName>
+				<contentPiece>movie.mov</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -187,6 +584,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -216,16 +619,5 @@
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
index 24930328ff..52061fb273 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
@@ -12,14 +12,215 @@
 				<pageTitle>Ads</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
+				<bandwidth />
+				<timeSpent>271</timeSpent>
+				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>271</timeSpent>
-				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>2</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>Unknown</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>3</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece />
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>120</timeSpentRef>
+				<pageId>4</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>5</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad2.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>6</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction>submit</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>7</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>8</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>9</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>10</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>11</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>30</timeSpentRef>
+				<pageId>12</pageId>
+				<contentName>Video Ad</contentName>
+				<contentPiece>movie.mov</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -71,6 +272,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -104,17 +311,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -128,14 +324,215 @@
 				<pageTitle>Ads</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>13</pageId>
+				<bandwidth />
+				<timeSpent>271</timeSpent>
+				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>271</timeSpent>
-				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>14</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>Unknown</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>15</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece />
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>120</timeSpentRef>
+				<pageId>16</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>17</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad2.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>18</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction>submit</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>19</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>20</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>21</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>22</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>23</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>30</timeSpentRef>
+				<pageId>24</pageId>
+				<contentName>Video Ad</contentName>
+				<contentPiece>movie.mov</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -187,6 +584,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -216,16 +619,5 @@
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
index 24930328ff..52061fb273 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
@@ -12,14 +12,215 @@
 				<pageTitle>Ads</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
+				<bandwidth />
+				<timeSpent>271</timeSpent>
+				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>271</timeSpent>
-				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>2</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>Unknown</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>3</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece />
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>120</timeSpentRef>
+				<pageId>4</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>5</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad2.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>6</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction>submit</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>7</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>8</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>9</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>10</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>11</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>30</timeSpentRef>
+				<pageId>12</pageId>
+				<contentName>Video Ad</contentName>
+				<contentPiece>movie.mov</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -71,6 +272,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -104,17 +311,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -128,14 +324,215 @@
 				<pageTitle>Ads</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>13</pageId>
+				<bandwidth />
+				<timeSpent>271</timeSpent>
+				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>271</timeSpent>
-				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>14</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>Unknown</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>15</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece />
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>120</timeSpentRef>
+				<pageId>16</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>17</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad2.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>18</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction>submit</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>19</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>20</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>21</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>22</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>23</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>30</timeSpentRef>
+				<pageId>24</pageId>
+				<contentName>Video Ad</contentName>
+				<contentPiece>movie.mov</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -187,6 +584,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -216,16 +619,5 @@
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
index 24930328ff..52061fb273 100644
--- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
@@ -12,14 +12,215 @@
 				<pageTitle>Ads</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>1</pageId>
+				<bandwidth />
+				<timeSpent>271</timeSpent>
+				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>271</timeSpent>
-				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>2</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>Unknown</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>3</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece />
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>120</timeSpentRef>
+				<pageId>4</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>5</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad2.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>6</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction>submit</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>7</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>8</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>9</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>10</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>11</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>30</timeSpentRef>
+				<pageId>12</pageId>
+				<contentName>Video Ad</contentName>
+				<contentPiece>movie.mov</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -71,6 +272,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -104,17 +311,6 @@
 				<pluginName>java</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 	<row>
 		<idSite>1</idSite>
@@ -128,14 +324,215 @@
 				<pageTitle>Ads</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
+				
 				<pageId>13</pageId>
+				<bandwidth />
+				<timeSpent>271</timeSpent>
+				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<generationTimeMilliseconds>333</generationTimeMilliseconds>
 				<generationTime>0.33s</generationTime>
 				<interactionPosition>1</interactionPosition>
-				<timeSpent>271</timeSpent>
-				<timeSpentPretty>4 min 31s</timeSpentPretty>
 				<icon />
 				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>14</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>Unknown</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>15</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece />
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>120</timeSpentRef>
+				<pageId>16</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>17</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad2.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>18</pageId>
+				<contentName>ImageAd</contentName>
+				<contentPiece>/path/ad.jpg</contentPiece>
+				<contentTarget>http://www.example.com</contentTarget>
+				<contentInteraction>submit</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>19</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>20</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/</contentTarget>
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>21</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>0</timeSpentRef>
+				<pageId>22</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click NOW</contentPiece>
+				<contentTarget>http://piwik.org/download</contentTarget>
+				<contentInteraction>click</contentInteraction>
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>60</timeSpentRef>
+				<pageId>23</pageId>
+				<contentName>Text Ad</contentName>
+				<contentPiece>Click to download Piwik now</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
+			</row>
+			<row>
+				<type>13</type>
+				<url>http://www.example.org/page</url>
+				<pageTitle />
+				<pageIdAction>3</pageIdAction>
+				
+				
+				<timeSpentRef>30</timeSpentRef>
+				<pageId>24</pageId>
+				<contentName>Video Ad</contentName>
+				<contentPiece>movie.mov</contentPiece>
+				<contentTarget />
+				<contentInteraction />
+				<bandwidth />
+				<interactionPosition />
+				
+				<bandwidth_pretty>0 M</bandwidth_pretty>
 			</row>
 		</actionDetails>
 		<goalConversions>0</goalConversions>
@@ -187,6 +584,12 @@
 		<browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon>
 		<browserCode>FF</browserCode>
 		<browserVersion>3.6</browserVersion>
+		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
+		<totalEcommerceConversions>0</totalEcommerceConversions>
+		<totalEcommerceItems>0</totalEcommerceItems>
+		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
+		<totalAbandonedCarts>0</totalAbandonedCarts>
+		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 		<events>0</events>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
@@ -216,16 +619,5 @@
 				<pluginName>director</pluginName>
 			</row>
 		</pluginsIcons>
-		
-		
-		
-		
-		
-		<totalEcommerceRevenue>0.00</totalEcommerceRevenue>
-		<totalEcommerceConversions>0</totalEcommerceConversions>
-		<totalEcommerceItems>0</totalEcommerceItems>
-		<totalAbandonedCartsRevenue>0.00</totalAbandonedCartsRevenue>
-		<totalAbandonedCarts>0</totalAbandonedCarts>
-		<totalAbandonedCartsItems>0</totalAbandonedCartsItems>
 	</row>
 </result>
\ No newline at end of file