Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.327.2.21 -r1.327.2.22
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	16 Jun 2016 09:36:47 -0000	1.327.2.21
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	10 Sep 2016 10:11:41 -0000	1.327.2.22
@@ -1193,7 +1193,8 @@
              -groupby "tag" \
              -orderby "nr" \
              -limit $limit] {
-               lappend entries "<a href='[ns_quotehtml $href&ptag=[ad_urlencode $tag]]'>[ns_quotehtml $tag ($nr)]</a>"
+               set label [ns_quotehtml "$tag ($nr)"]
+               lappend entries "<a href='[ns_quotehtml $href&ptag=[ad_urlencode $tag]]'>$label</a>"
              }
     ns_return 200 text/html "[_ xowiki.popular_tags_label]: [join $entries {, }]"
   }
@@ -1220,7 +1221,7 @@
       }
     }
     #my show_fields $form_fields
-    lassign  [my get_form_data -field_names $query_field_names $form_fields] validation_erors category_ids
+    lassign [my get_form_data -field_names $query_field_names $form_fields] validation_erors category_ids
 
     if {$validation_errors == 0} {
       #
@@ -1559,7 +1560,7 @@
       #
       ::xo::Page requireCSS /resources/xowiki/xowiki.css
       if {$footer ne ""} {
-        ::xo::Page requireJS {
+        template::add_body_script -script {
           function get_popular_tags(popular_tags_link, prefix) {
             var http = getHttpObject();
             http.open('GET', popular_tags_link, true);
@@ -1579,6 +1580,7 @@
         }
       }
       set header_stuff [::xo::Page header_stuff]
+      #ns_log notice "=== HEADER STUFF <$header_stuff>"
       if {![my exists description]} {my set description [my get_description $content]}
 
       if {[info commands ::template::head::add_meta] ne ""} {