Index: openacs-4/packages/faq/www/admin/one-faq.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-faq.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/faq/www/admin/one-faq.tcl	15 May 2007 20:14:35 -0000	1.6
+++ openacs-4/packages/faq/www/admin/one-faq.tcl	27 Jun 2015 21:16:37 -0000	1.7
@@ -36,6 +36,6 @@
 set title "#faq.faq_name_Admin#"
 set context [list $faq_name]
 
-set new_faq_url "q-and-a-add-edit?[export_vars { faq_id }]"
+set new_faq_url [export_vars -base q-and-a-add-edit { faq_id }]
 
 ad_return_template
Index: openacs-4/packages/faq/www/admin/one-question.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-question.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/faq/www/admin/one-question.tcl	1 Mar 2005 00:01:36 -0000	1.6
+++ openacs-4/packages/faq/www/admin/one-question.tcl	27 Jun 2015 21:16:37 -0000	1.7
@@ -28,8 +28,8 @@
 
 set context [list [list "one-faq?faq_id=$faq_id" "$faq_name"] "[_ faq.One_Question]"]
 
-set edit_url "q-and-a-add-edit?[export_vars { entry_id faq_id }]"
-set delete_url "q_and_a-delete?[export_vars { entry_id faq_id }]"
-set create_url "q-and-a-add-edit?[export_vars { faq_id } ]"
+set edit_url [export_vars -base q-and-a-add-edit { entry_id faq_id }]
+set delete_url [export_vars -base q_and_a-delete { entry_id faq_id }]
+set create_url [export_vars -base q-and-a-add-edit { faq_id } ]
 
 ad_return_template
Index: openacs-4/packages/faq/www/admin/q_and_a-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-edit.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/faq/www/admin/q_and_a-edit.tcl	12 Sep 2013 20:29:36 -0000	1.6
+++ openacs-4/packages/faq/www/admin/q_and_a-edit.tcl	27 Jun 2015 21:16:37 -0000	1.7
@@ -30,6 +30,6 @@
 
 set context [list [list "one-faq?faq_id=$faq_id" "$faq_name"] "One Q&A"]
 
-set delete_url "q_and_a-delete?[export_vars { entry_id faq_id }]"
+set delete_url [export_vars -base q_and_a-delete { entry_id faq_id }]
 
 ad_return_template
Index: openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl	14 Jun 2015 00:36:08 -0000	1.7
+++ openacs-4/packages/faq/www/admin/q_and_a-new-2.tcl	27 Jun 2015 21:16:37 -0000	1.8
@@ -74,4 +74,4 @@
     }
 }
 
-ad_returnredirect "one-faq?[export_vars -url {faq_id}]"
+ad_returnredirect [export_vars -base one-faq {faq_id}]
Index: openacs-4/packages/faq/www/admin/swap.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/swap.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/faq/www/admin/swap.tcl	27 Oct 2014 16:41:30 -0000	1.4
+++ openacs-4/packages/faq/www/admin/swap.tcl	27 Jun 2015 21:16:37 -0000	1.5
@@ -51,5 +51,5 @@
 
 db_release_unused_handles
 
-ad_returnredirect "one-faq?[export_vars -url {faq_id}]" 
+ad_returnredirect [export_vars -base one-faq {faq_id}] 
 
Index: openacs-4/packages/faq/www/categories/list-categories.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/categories/list-categories.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/faq/www/categories/list-categories.tcl	10 Mar 2005 18:27:41 -0000	1.1
+++ openacs-4/packages/faq/www/categories/list-categories.tcl	27 Jun 2015 21:16:37 -0000	1.2
@@ -4,7 +4,7 @@
     @cvs-id $Id$
 } {
     {cat:trim,integer {}}
-    {orderby "object_title"}
+    {orderby:token "object_title"}
 }
 
 set cat_name [category::get_names $cat]