Index: openacs-4/packages/categories/tcl/categories-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/tcl/categories-procs.tcl,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/categories/tcl/categories-procs.tcl	13 Jan 2010 17:07:00 -0000	1.28
+++ openacs-4/packages/categories/tcl/categories-procs.tcl	27 Jun 2015 19:24:24 -0000	1.29
@@ -504,7 +504,7 @@
     if {$object_id ne ""} {
 	set context_bar [list [category::get_object_context $object_id] [list [export_vars -no_empty -base object-map {locale object_id ctx_id}] [_ categories.cadmin]]]
     } else {
-	set context_bar [list [list ".?[export_vars -no_empty {locale ctx_id}]" [_ categories.cadmin]]]
+	set context_bar [list [list [export_vars -base . -no_empty {locale ctx_id}] [_ categories.cadmin]]]
     }
     lappend context_bar [list [export_vars -no_empty -base tree-view {tree_id locale object_id ctx_id}] [category_tree::get_name $tree_id $locale]]
 
Index: openacs-4/packages/categories/www/categories-browse.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/categories-browse.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/categories/www/categories-browse.tcl	14 Jun 2015 00:26:54 -0000	1.11
+++ openacs-4/packages/categories/www/categories-browse.tcl	27 Jun 2015 19:24:24 -0000	1.12
@@ -10,7 +10,7 @@
     tree_ids:integer,multiple
     {category_ids:integer,multiple,optional ""}
     {page:integer,optional 1}
-    {orderby:optional object_name}
+    {orderby:token,optional object_name}
     {subtree_p:boolean,optional f}
     {letter:optional all}
     {join:optional or}
@@ -36,7 +36,7 @@
 set page_title "Browse categories"
 
 set context_bar [list "Browse categories"]
-set url_vars [export_vars -url {tree_ids:multiple category_ids:multiple subtree_p letter join package_id}]
+set url_vars [export_vars {tree_ids:multiple category_ids:multiple subtree_p letter join package_id}]
 set form_vars [export_vars -form {tree_ids:multiple orderby subtree_p letter package_id}]
 
 db_transaction {
Index: openacs-4/packages/categories/www/cadmin/category-links-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-links-view.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/categories/www/cadmin/category-links-view.tcl	27 Oct 2014 16:41:12 -0000	1.7
+++ openacs-4/packages/categories/www/cadmin/category-links-view.tcl	27 Jun 2015 19:24:24 -0000	1.8
@@ -9,7 +9,7 @@
     tree_id:naturalnum,notnull
     {locale ""}
     object_id:naturalnum,optional
-    orderby:optional
+    orderby:token,optional
     ctx_id:naturalnum,optional
 } -properties {
     page_title:onevalue
Index: openacs-4/packages/categories/www/cadmin/category-usage.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-usage.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/categories/www/cadmin/category-usage.tcl	27 Oct 2014 16:41:12 -0000	1.7
+++ openacs-4/packages/categories/www/cadmin/category-usage.tcl	27 Jun 2015 19:24:24 -0000	1.8
@@ -10,7 +10,7 @@
     {locale ""}
     object_id:naturalnum,optional
     {page:integer,optional 1}
-    {orderby:optional object_name}
+    {orderby:token,optional object_name}
 } -properties {
     page_title:onevalue
     context_bar:onevalue
Index: openacs-4/packages/categories/www/cadmin/synonyms-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonyms-view.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/categories/www/cadmin/synonyms-view.tcl	27 Oct 2014 16:41:13 -0000	1.5
+++ openacs-4/packages/categories/www/cadmin/synonyms-view.tcl	27 Jun 2015 19:24:24 -0000	1.6
@@ -9,7 +9,7 @@
     tree_id:naturalnum,notnull
     {locale ""}
     object_id:naturalnum,optional
-    orderby:optional
+    orderby:token,optional
     ctx_id:naturalnum,optional
 } -properties {
     page_title:onevalue
Index: openacs-4/packages/categories/www/cadmin/tree-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-delete-2.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/categories/www/cadmin/tree-delete-2.tcl	27 Oct 2014 16:41:14 -0000	1.8
+++ openacs-4/packages/categories/www/cadmin/tree-delete-2.tcl	27 Jun 2015 19:24:24 -0000	1.9
@@ -24,7 +24,7 @@
 category_tree::delete $tree_id
 
 if {![info exists object_id]} {
-    ad_returnredirect ".?[export_vars -no_empty {locale ctx_id}]"
+    ad_returnredirect [export_vars -base . -no_empty {locale ctx_id}]
 } else {
     ad_returnredirect [export_vars -no_empty -base object-map {locale object_id ctx_id}]
 }
Index: openacs-4/packages/categories/www/cadmin/tree-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-form.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/categories/www/cadmin/tree-form.tcl	27 Oct 2014 16:41:14 -0000	1.9
+++ openacs-4/packages/categories/www/cadmin/tree-form.tcl	27 Jun 2015 19:24:24 -0000	1.10
@@ -28,7 +28,7 @@
           [_ categories.cadmin]]]
 } else {
     set context_bar [list \
-          [list ".?[export_vars -no_empty {locale ctx_id}]" \
+          [list [export_vars -base . -no_empty {locale ctx_id}] \
           [_ categories.cadmin]]]
 }
 lappend context_bar $page_title
Index: openacs-4/packages/categories/www/cadmin/tree-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-view.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/categories/www/cadmin/tree-view.tcl	27 Oct 2014 16:41:14 -0000	1.17
+++ openacs-4/packages/categories/www/cadmin/tree-view.tcl	27 Jun 2015 19:24:25 -0000	1.18
@@ -34,7 +34,7 @@
 if {[info exists object_id]} {
     set context_bar [list [category::get_object_context $object_id] [list [export_vars -no_empty -base object-map {locale object_id ctx_id}] "[_ categories.cadmin]"] $tree_name]
 } else {
-    set context_bar [list [list ".?[export_vars -no_empty {locale ctx_id}]" "[_ categories.cadmin]"] $tree_name]
+    set context_bar [list [list [export_vars -base . -no_empty {locale ctx_id}] "[_ categories.cadmin]"] $tree_name]
 }
 
 set can_write_p [permission::permission_p -object_id $tree_id -privilege category_tree_write]
Index: openacs-4/packages/categories/www/cadmin/trees-code.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/trees-code.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/www/cadmin/trees-code.tcl	27 Oct 2014 16:41:14 -0000	1.2
+++ openacs-4/packages/categories/www/cadmin/trees-code.tcl	27 Jun 2015 19:24:25 -0000	1.3
@@ -13,7 +13,7 @@
 permission::require_permission -object_id [ad_conn package_id] -privilege admin
 
 set page_title "[_ categories.code_export]"
-set context_bar [list [list ".?[export_vars -no_empty {locale}]" "[_ categories.cadmin]"] $page_title]
+set context_bar [list [list [export_vars -base . -no_empty {locale}] "[_ categories.cadmin]"] $page_title]
 
 multirow create trees tree_id
 foreach tid $tree_id {