Index: openacs-4/packages/edit-this-page/tcl/etp-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/tcl/etp-procs.tcl,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/edit-this-page/tcl/etp-procs.tcl	23 Jun 2015 17:06:27 -0000	1.26
+++ openacs-4/packages/edit-this-page/tcl/etp-procs.tcl	27 Jun 2015 20:03:21 -0000	1.27
@@ -509,7 +509,7 @@
 	set name [etp::get_name]
 
 	if { ![regexp "^etp" $name] } {
-	    return "etp?[export_vars { name }]"
+	    return [export_vars -base etp { name }]
 	}
     } 
 
Index: openacs-4/packages/edit-this-page/www/etp-create-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-create-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/www/etp-create-2.tcl	9 Sep 2013 17:34:17 -0000	1.2
+++ openacs-4/packages/edit-this-page/www/etp-create-2.tcl	27 Jun 2015 20:03:21 -0000	1.3
@@ -17,5 +17,5 @@
     identifies this subtopic."
 } else {
     etp::make_page $name $title
-    ad_returnredirect "etp?[export_vars -url {name}]"
+    ad_returnredirect [export_vars -base etp {name}]
 }
Index: openacs-4/packages/edit-this-page/www/etp-create-extlink.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-create-extlink.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/edit-this-page/www/etp-create-extlink.tcl	7 Aug 2014 07:39:18 -0000	1.6
+++ openacs-4/packages/edit-this-page/www/etp-create-extlink.tcl	27 Jun 2015 20:03:21 -0000	1.7
@@ -30,7 +30,7 @@
 	    db_dml copy_parameter ""
 	}
 	set title $subtopic_title
-	ad_returnredirect "$subtopic_name/etp-setup-2?[export_vars -url {title}]"
+	ad_returnredirect [export_vars -base $subtopic_name/etp-setup-2 {title}]
     }
     ad_script_abort
 } else {
Index: openacs-4/packages/edit-this-page/www/etp-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-edit.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/edit-this-page/www/etp-edit.tcl	3 Oct 2013 09:15:25 -0000	1.16
+++ openacs-4/packages/edit-this-page/www/etp-edit.tcl	27 Jun 2015 20:03:21 -0000	1.17
@@ -166,14 +166,14 @@
 	db_dml update_package_instance_name ""
     }
 
-    ad_returnredirect "etp?[export_vars -url {name}]"
+    ad_returnredirect [export_vars -base etp {name}]
     ad_script_abort
 }
 
 set page_title [_ edit-this-page.atribute_for_page_title]
 
 if {$name eq "index"} {
-    set context [list [list "etp?[export_vars -url {name}]" Edit] $attribute_title]
+    set context [list [list [export_vars -base etp {name}] Edit] $attribute_title]
 } else {
-    set context [list [list $name $name] [list "etp?[export_vars -url {name}]" Edit] $attribute_title]
+    set context [list [list $name $name] [list [export_vars -base etp {name}] Edit] $attribute_title]
 }
Index: openacs-4/packages/edit-this-page/www/etp-history.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-history.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/edit-this-page/www/etp-history.tcl	9 Sep 2013 17:34:17 -0000	1.5
+++ openacs-4/packages/edit-this-page/www/etp-history.tcl	27 Jun 2015 20:03:21 -0000	1.6
@@ -26,9 +26,9 @@
 set page_title [_ edit-this-page.revision_history_for]
 
 if {$name eq "index"} {
-    set context [list [list "etp?[export_vars -url {name}]" "[_ acs-kernel.common_Edit]"] "[_ edit-this-page.History]"]
+    set context [list [list [export_vars -base etp {name}] "[_ acs-kernel.common_Edit]"] "[_ edit-this-page.History]"]
 } else {
-    set context [list [list $name $name] [list "etp?[export_vars -url {name}]" "[_ acs-kernel.common_Edit]"] "[_ edit-this-page.History]"]
+    set context [list [list $name $name] [list [export_vars -base etp {name}] "[_ acs-kernel.common_Edit]"] "[_ edit-this-page.History]"]
 }
 
 
Index: openacs-4/packages/edit-this-page/www/etp-publish.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-publish.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/www/etp-publish.tcl	9 Sep 2013 17:34:17 -0000	1.2
+++ openacs-4/packages/edit-this-page/www/etp-publish.tcl	27 Jun 2015 20:03:21 -0000	1.3
@@ -28,5 +28,5 @@
     util_memoize_flush $key
 }
 
-ad_returnredirect "etp?[export_vars -url {name}]"
+ad_returnredirect [export_vars -base etp {name}]
 
Index: openacs-4/packages/edit-this-page/www/etp-revert.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-revert.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/edit-this-page/www/etp-revert.tcl	7 Aug 2014 07:39:18 -0000	1.5
+++ openacs-4/packages/edit-this-page/www/etp-revert.tcl	27 Jun 2015 20:03:21 -0000	1.6
@@ -34,7 +34,7 @@
 	    db_exec_plsql delete_revision ""
 	}
     }
-    ad_returnredirect "etp?[export_vars -url {name}]"
+    ad_returnredirect [export_vars -base etp {name}]
     ad_script_abort
 
 } else {
Index: openacs-4/packages/edit-this-page/www/etp-revision-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-revision-delete.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/edit-this-page/www/etp-revision-delete.tcl	7 Aug 2014 07:39:18 -0000	1.6
+++ openacs-4/packages/edit-this-page/www/etp-revision-delete.tcl	27 Jun 2015 20:03:21 -0000	1.7
@@ -26,7 +26,7 @@
 
     db_exec_plsql delete_revision {}
 
-    ad_returnredirect "etp?[export_vars -url {name}]"
+    ad_returnredirect [export_vars -base etp {name}]
     ad_script_abort
 } else {
     set form_vars [export_vars -form { name revision_id version_number { confirmed t }}]
Index: openacs-4/packages/edit-this-page/www/etp-setup-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-setup-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/edit-this-page/www/etp-setup-2.tcl	7 Sep 2013 12:50:58 -0000	1.5
+++ openacs-4/packages/edit-this-page/www/etp-setup-2.tcl	27 Jun 2015 20:03:21 -0000	1.6
@@ -33,9 +33,9 @@
     array set parent_site_node [site_node::get -url $parent_url]
     set parent_package_id $parent_site_node(object_id)
 
-#    set parent_package_id [site_node_closest_ancestor_package -url "$parent_url" "edit-this-page"]
+#    set parent_package_id [site_node::closest_ancestor_package -include_self -url "$parent_url" -package_key "edit-this-page"]
 #    if {$parent_package_id eq ""} {
-#	set parent_package_id [site_node_closest_ancestor_package -url "$parent_url" "acs-subsite"]
+#	set parent_package_id [site_node::closest_ancestor_package -include_self -url "$parent_url" -package_key "acs-subsite"]
 #    }
 
     db_transaction {
Index: openacs-4/packages/edit-this-page/www/etp-subtopic-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-subtopic-create.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/edit-this-page/www/etp-subtopic-create.tcl	13 Oct 2013 14:31:27 -0000	1.6
+++ openacs-4/packages/edit-this-page/www/etp-subtopic-create.tcl	27 Jun 2015 20:03:21 -0000	1.7
@@ -38,7 +38,7 @@
 
 	apm_parameter_sync "edit-this-page" $new_package_id
 	set title $subtopic_title
-	ad_returnredirect "$subtopic_name/etp-setup-2?[export_vars -url {title}]"
+	ad_returnredirect [export_vars -base $subtopic_name/etp-setup-2 {title}]
     }
     ad_script_abort
 } else {