Index: openacs-4/packages/acs-api-browser/www/content-page-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/content-page-view.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-api-browser/www/content-page-view.tcl	27 Jun 2015 16:57:15 -0000	1.9
+++ openacs-4/packages/acs-api-browser/www/content-page-view.tcl	27 Jun 2015 17:05:56 -0000	1.10
@@ -21,7 +21,7 @@
 
 set context [list]
 set url_vars [export_vars {path version_id}]
-set return_url [ns_urlencode [ad_conn url]?][ns_urlencode $url_vars]
+set return_url [export_vars -base [ad_conn url] {path version_id}]
 set default_source_p [ad_get_client_property -default 0 acs-api-browser api_doc_source_p]
 
 if { ![info exists source_p] } {
@@ -54,10 +54,10 @@
 if {![file readable $::acs::rootdir/$path] || [file isdirectory $::acs::rootdir/$path]} {
     if {[info exists version_id]} {
 	set kind content
-	set href [ad_conn package_url]/package-view?[export_vars {version_id {kind procs}}]
-	set link [subst {<p>Go back to <a href="$href">Package Documentation</a>.}]
+	set href [export_vars -base [ad_conn package_url]/package-view {version_id {kind procs}}]
+	set link [subst {<p>Go back to <a href="[ns_quotehtml $href]">Package Documentation</a>.}]
     } else {
-	set link [subst {<p>Go back to <a href="[ad_conn package_url]">API Browser</a>.}]
+	set link [subst {<p>Go back to <a href="[ns_quotehtml [ad_conn package_url]]">API Browser</a>.}]
     }
     ad_return_warning "No such content page" [subst {
 	The file '$path' was not found. Maybe the url contains a typo.
Index: openacs-4/packages/acs-api-browser/www/proc/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc/index.vuh,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-api-browser/www/proc/index.vuh	30 Nov 2002 17:13:46 -0000	1.2
+++ openacs-4/packages/acs-api-browser/www/proc/index.vuh	27 Jun 2015 17:05:56 -0000	1.3
@@ -1,3 +1,4 @@
+# -*- tcl -*-
 set query_string [string range [ad_conn extra_url] [string length "proc/"] end]
-set url "[ad_conn package_url]proc-search?[export_vars { query_string { search_type "Feeling Lucky" } }]"
+set url [export_vars -base [ad_conn package_url]proc-search { query_string { search_type "Feeling Lucky" } }]
 ad_returnredirect $url
Index: openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl,v
diff -u -r1.39 -r1.40
--- openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	27 Oct 2014 16:39:02 -0000	1.39
+++ openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	27 Jun 2015 17:13:45 -0000	1.40
@@ -1103,10 +1103,11 @@
     }
 
     # TODO: Not working
-    set service(admin_login_url) "$service(url)register/?[export_vars { { email $service(adminemail) } { password $service(adminpassword) } }]"
-
+    set service(admin_login_url) [export_vars -base $service(url)register/ {
+	{ email $service(adminemail) }
+	{ password $service(adminpassword) }
+    }]
     set service(auto_test_url) "$service(url)test/admin"
-
     set service(rebuild_cmd) "sh [file join $service(script_path) recreate.sh]"
 }
 
Index: openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl	26 Jun 2015 20:50:09 -0000	1.12
+++ openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl	27 Jun 2015 17:13:45 -0000	1.13
@@ -62,14 +62,16 @@
 
 set bug_list [list]
 foreach bug $testcase_bugs {
-    lappend bug_list "<a href=\"[export_vars -base "http://openacs.org/bugtracker/openacs/bug" [list [list bug_number $bug]]]\">$bug</a>"
+    set href [export_vars -base "http://openacs.org/bugtracker/openacs/bug" {{bug_number $bug}}]
+    lappend bug_list [subst {<a href="[ns_quotehtml $href]">$bug</a>}]
 }
 set bug_blurb [join $bug_list ", "]
 
 set proc_list [list]
-foreach proc $testcase_procs {                             
-                              lappend proc_list "<a href=\"[export_vars -base "/api-doc/proc-view" { proc }]\">$proc</a>"
-                          }
+foreach p $testcase_procs {
+    set href [export_vars -base "/api-doc/proc-view" { {proc $p} }]
+    lappend proc_list [subst {<a href="[ns_quotehtml $href]">$p</a>}]
+}
 set proc_blurb [join $proc_list ", "]
 
 
@@ -99,7 +101,10 @@
     }
 }
 
-set resource_file_url "init-file-resource?[export_vars -url { {return_url {[ad_return_url]} } {absolute_file_path $testcase_file}}]"
+set resource_file_url [export_vars -base init-file-resource {
+    {return_url [ad_return_url]}
+    {absolute_file_path $testcase_file}
+}]
 
 set return_url [export_vars -base . { { view_by testcase } quiet { by_package_key $package_key } }]