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 -N -r1.203 -r1.204
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	31 Aug 2017 17:29:34 -0000	1.203
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	7 Sep 2017 15:44:53 -0000	1.204
@@ -1435,11 +1435,11 @@
     }]
 
     template::add_event_listener \
-        -id ${:id} -edit-tags-control \
+        -id ${:id}-edit-tags-control \
         -script [subst {document.getElementById("${:id}-edit_tags").style.display="block";}]
 
     template::add_event_listener \
-        -id ${:id} -popular-tags-control \
+        -id ${:id}-popular-tags-control \
         -script [subst {get_popular_tags("[ns_quotehtml $popular_tags_link]","${:id}");}]
 
     return $content
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 -N -r1.293 -r1.294
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	31 Aug 2017 17:29:34 -0000	1.293
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	7 Sep 2017 15:48:27 -0000	1.294
@@ -911,7 +911,7 @@
         if {$batch_mode} {${:id} set __batch_mode 1}
         set err [catch { set r [my call $page_or_package $method ""]} errorMsg]
         if {$err} {set errorCode $::errorCode}
-        if {$batch_mode} {${id} unset -nocomplain __batch_mode}
+        if {$batch_mode} {${:id} unset -nocomplain __batch_mode}
         if {$err} {
           #
           # Check, if we were called from "ad_script_abort" (intentional abortion)