Index: wiki/src/main/resources/Main/Activity.xml
===================================================================
--- wiki/src/main/resources/Main/Activity.xml	(revision 32940)
+++ wiki/src/main/resources/Main/Activity.xml	(working copy)
@@ -669,6 +669,9 @@
 #if($aWikis.size() == 0)
   #set($aWikisString = $context.macro.params.get('wikis'))
   #asList($aWikis $aWikisString)
+  #if($aWikis.size() == 0)
+    $aWikis.add($context.database)
+  #end
 #end
 ## Spaces
 #setVariableFromRequest($aSpaces "spaces" [])
@@ -721,7 +724,7 @@
 #end
 ## Minor versions
 #if("$!aMinor" == 'false')
-  #set($filterClause = $filterClause + " and not (version not like '%.1' and type = 'update')")
+  #set($filterClause = $filterClause + " and not (act.version not like '%.1' and act.type = 'update')")
 #end
 ##
 ## Macros
@@ -758,7 +761,7 @@
   *#
 #macro(updateFilterClause $colName $colValues $exclude)
   #if($colValues.class == 'class java.lang.String')
-    #set($filterClause = $filterClause + " and ${colName}='" + ${colValues} + "'")
+    #set($filterClause = $filterClause + " and act.${colName}='" + ${colValues} + "'")
   #else
     #foreach($colValue in $colValues)
       #if($velocityCount == 1)
@@ -766,7 +769,7 @@
         #if($exclude)
           #set($filterCondition = 'not ' + $filterCondition)
         #end
-        #set($filterClause = $filterClause + " and ${colName} ${filterCondition} (")
+        #set($filterClause = $filterClause + " and act.${colName} ${filterCondition} (")
       #end
       #if("$!colValues" != '')
         #if($velocityCount > 1) #set($filterClause = $filterClause + ',') #end
@@ -1238,8 +1241,7 @@
   ##
   ## Get distinct pages with activity
   ## -------------------------------------------------------------------
-  #set($activitiesQuery = "select page, max(date) from ActivityEventImpl where $!filterClause group by page order by max(date) desc")
-  #set($pages = $xwiki.search($activitiesQuery, $aEntries, 0))
+  #set($pages = $xwiki.activitystream.searchUniquePageEvents("$!filterClause", $aEntries, 0))
   #if ($pages.size() > 0)
     #foreach($page in $pages)
       ##