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.239.2.39 -r1.239.2.40
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	1 Feb 2020 08:10:36 -0000	1.239.2.39
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	1 Feb 2020 09:20:22 -0000	1.239.2.40
@@ -4691,7 +4691,7 @@
       }
     }
 
-    set given_includelet_key [::xo::cc query_parameter includelet_key ""]
+    set given_includelet_key [ns_base64urldecode [::xo::cc query_parameter includelet_key:graph ""]]
     if {$given_includelet_key ne ""} {
       if {$given_includelet_key eq $includelet_key && [info exists generate]} {
         if {$generate eq "csv"} {
@@ -4718,11 +4718,13 @@
     append html [t1 asHTML]
 
     if {$csv} {
-      set csv_href "[::xo::cc url]?[::xo::cc actual_query]&includelet_key=[ns_urlencode $includelet_key]&generate=csv"
+      set encoded_includelet_key [ns_urlencode [ns_base64urlencode $includelet_key]]
+      set csv_href "[::xo::cc url]?[::xo::cc actual_query]&includelet_key=$encoded_includelet_key&generate=csv"
       lappend links "<a href='[ns_quotehtml $csv_href]'>csv</a>"
     }
     if {[info exists voting_form]} {
-      set href "[::xo::cc url]?[::xo::cc actual_query]&includelet_key=[ns_urlencode $includelet_key]&generate=voting_form"
+      set encoded_includelet_key [ns_urlencode [ns_base64urlencode $includelet_key]]
+      set href "[::xo::cc url]?[::xo::cc actual_query]&includelet_key=$encoded_includelet_key&generate=voting_form"
       lappend links " <a href='[ns_quotehtml $href]'>Generate Voting Form $voting_form</a>"
     }
     append html [join $links ,]
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 -N -r1.368.2.54 -r1.368.2.55
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	31 Jan 2020 17:59:51 -0000	1.368.2.54
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	1 Feb 2020 09:20:22 -0000	1.368.2.55
@@ -437,7 +437,7 @@
     set attributes [lsort -dictionary [array names vars]]
     # make sure, we the includelet honors the cvs generation
     set includelet_key name:form-usages,form_item_ids:$form_item_id,field_names:[join $attributes " "],
-    ::xo::cc set queryparm(includelet_key) $includelet_key
+    ::xo::cc set queryparm(includelet_key) [ns_base64urlencode $includelet_key]
     # call the includelet
     :www-view [:include [list form-usages -field_names $attributes \
                              -extra_form_constraints _creation_user:numeric,format=%d \