Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v
diff -u -N -r1.140 -r1.141
--- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	27 Jun 2015 17:32:40 -0000	1.140
+++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl	21 Apr 2016 10:02:09 -0000	1.141
@@ -889,7 +889,7 @@
     if { $url_p } {
 	set export_list [list]
 	for { set i 0 } { $i < $export_size } { incr i } {
-	    lappend export_list "[ns_urlencode [ns_set key $export_set $i]]=[ns_urlencode [ns_set value $export_set $i]]"
+	    lappend export_list "[ad_urlencode_path [ns_set key $export_set $i]]=[ad_urlencode_query [ns_set value $export_set $i]]"
 	}
 	set export_string [join $export_list "&"]
     } else {
@@ -1179,7 +1179,7 @@
             set value [ns_set value $setid $set_counter_i]
             if {$name ni $exclusion_list && $name ne ""} {
                 if {$format eq "url"} {
-                    lappend return_list "[ns_urlencode $name]=[ns_urlencode $value]"
+                    lappend return_list "[ad_urlencode_path $name]=[ad_urlencode_query $value]"
                 } else {
                     lappend return_list " name=\"[ns_quotehtml $name]\" value=\"[ns_quotehtml $value]\""
                 }
@@ -1288,7 +1288,7 @@
 		$vars_to_passthrough eq "" 
 		|| ($varname in $vars_to_passthrough)
 	    } {
-		lappend params "[ns_urlencode $varname]=[ad_urlencode_query $varvalue]" 
+		lappend params "[ad_urlencode_path $varname]=[ad_urlencode_query $varvalue]" 
 	    }
 	}
 	return [join $params "&"]