Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.36 -r1.37
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	6 May 2008 12:42:22 -0000	1.36
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	9 May 2008 21:15:39 -0000	1.37
@@ -1086,12 +1086,15 @@
     if {![info exists page]} {set page  [$package_id get_parameter weblog_page]}
     set base_url [$package_id pretty_link $page]
 
-    set href [$package_id package_url]/tag/
+    set href [$package_id package_url]tag/
     db_foreach [my qn get_counts] $sql {
-      set s [expr {$summary ? "&summary=$summary" : ""}]
+      set q [list]
+      if {$summary} {lappend q "summary=$summary"}
+      if {$popular} {lappend q "popular=$popular"}
+      set link $href$tag?[join $q &]
       #set href $base_url?$tag_type=[ad_urlencode $tag]$s
       #lappend entries "$tag <a href='$href'>($nr)</a>"
-      lappend entries "$tag <a rel='tag' href='$href[ad_urlencode $tag]'>($nr)</a>"
+      lappend entries "$tag <a rel='tag' href='$link'>($nr)</a>"
     }
     return [expr {[llength $entries]  > 0 ? 
                   "<h3>$label</h3> <BLOCKQUOTE>[join $entries {, }]</BLOCKQUOTE>\n" :
Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.119 -r1.120
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	25 Apr 2008 17:23:35 -0000	1.119
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	9 May 2008 21:15:39 -0000	1.120
@@ -490,11 +490,13 @@
         if {$item_id == 0 && $lang eq "tag"} {
 	  set tag $local_name
 	  set summary [::xo::cc query_parameter summary 0]
+	  set popular [::xo::cc query_parameter popular 0]
+	  set tag_kind [expr {$popular ? "ptag" :"tag"}]
 	  set weblog_page [my get_parameter weblog_page]
 	  my get_name_and_lang_from_path $weblog_page lang local_name
 	  set name $lang:$local_name
 	  my set object $weblog_page
-	  ::xo::cc set actual_query tag=$tag&summary=$summary
+	  ::xo::cc set actual_query $tag_kind=$tag&summary=$summary
 	}
         if {$item_id == 0} {
           set nname   [my normalize_name $name]
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.243 -r1.244
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	6 May 2008 12:42:22 -0000	1.243
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	9 May 2008 21:15:39 -0000	1.244
@@ -1731,7 +1731,7 @@
       set filter_clause " and '$wc(h)' <@ bt.hkey"
     }
 
-    set orderby ""; set page_size 20; set page_number ""; set base_table "cr_revisions"
+    set orderby ""; set page_size 20; set page_number ""
     set sql  [::xowiki::FormPage instance_select_query \
 		    -select_attributes $sql_atts \
 		    -from_clause "" \