Index: openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl,v
diff -u -N -r1.70.2.21 -r1.70.2.22
--- openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl	3 Feb 2021 14:02:40 -0000	1.70.2.21
+++ openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl	10 Mar 2021 10:45:25 -0000	1.70.2.22
@@ -836,11 +836,9 @@
       #
       # Called interactively
       #
-      set actual_query [ns_conn query]
-      foreach pair [split $actual_query &] {
-        lassign [split $pair =] key value
+      foreach {key value} [ns_set array [ns_parsequery [ns_conn query]]] {
         if {$key in {"orderby" "__csrf_token"}} continue
-        lappend query [list [ns_urldecode $key] [ns_urldecode $value]]
+        lappend query [list $key $value]
       }
       set base [ad_conn url]
     } else {