Index: openacs-4/packages/bulk-mail/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/www/index.tcl,v
diff -u -r1.15.2.1 -r1.15.2.2
--- openacs-4/packages/bulk-mail/www/index.tcl	10 Sep 2015 08:30:14 -0000	1.15.2.1
+++ openacs-4/packages/bulk-mail/www/index.tcl	2 Feb 2017 14:09:22 -0000	1.15.2.2
@@ -5,7 +5,7 @@
     @cvs-id $Id$
 
 } -query {
-    {orderby "send_date"}
+    {orderby:token "send_date"}
 } -properties {
     title:onevalue
     context:onevalue
Index: openacs-4/packages/dotlrn/www/admin/users-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-search.tcl,v
diff -u -r1.30.2.2 -r1.30.2.3
--- openacs-4/packages/dotlrn/www/admin/users-search.tcl	26 Jan 2017 11:46:02 -0000	1.30.2.2
+++ openacs-4/packages/dotlrn/www/admin/users-search.tcl	2 Feb 2017 14:09:22 -0000	1.30.2.3
@@ -21,12 +21,12 @@
     @creation-date 2002-02-10
     @version $Id$
 } -query {
-    {type "any"}
+    {type:word "any"}
     {can_browse_p:word "any"}
     {guest_p:word "any"}
-    {join_criteria "and"}
-    {n_users 0}
-    {action "none"}
+    {join_criteria:word "and"}
+    {n_users:integer 0}
+    {action:word "none"}
 } -properties {
     context_bar:onevalue
     is_request:onevalue
Index: openacs-4/packages/dotlrn-bm/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bm/www/admin/index.tcl,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/dotlrn-bm/www/admin/index.tcl	11 Sep 2015 11:40:55 -0000	1.5.2.1
+++ openacs-4/packages/dotlrn-bm/www/admin/index.tcl	2 Feb 2017 14:09:22 -0000	1.5.2.2
@@ -4,7 +4,7 @@
     @creation-date 2002-05-13
     @version $Id$
 } -query {
-    {orderby "send_date"}
+    {orderby:token "send_date"}
 } -properties {
     title:onevalue
     context:onevalue
Index: openacs-4/packages/dotlrn-fs/www/all-objects.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/www/all-objects.tcl,v
diff -u -r1.16.2.2 -r1.16.2.3
--- openacs-4/packages/dotlrn-fs/www/all-objects.tcl	10 Nov 2016 15:02:13 -0000	1.16.2.2
+++ openacs-4/packages/dotlrn-fs/www/all-objects.tcl	2 Feb 2017 14:18:02 -0000	1.16.2.3
@@ -27,7 +27,7 @@
 
 } -query {
     {n_past_days:integer 999999}
-    {orderby "name"}
+    {orderby:token "name"}
 } -properties {
     n_past_days:onevalue
     days_singular_or_plural:onevalue
Index: openacs-4/packages/evaluation/www/answer-ok.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/answer-ok.tcl,v
diff -u -r1.4.10.1 -r1.4.10.2
--- openacs-4/packages/evaluation/www/answer-ok.tcl	12 Sep 2015 11:06:02 -0000	1.4.10.1
+++ openacs-4/packages/evaluation/www/answer-ok.tcl	2 Feb 2017 14:18:02 -0000	1.4.10.2
@@ -9,7 +9,7 @@
     @cvs-id $Id$
 
 } -query {
-	return_url:notnull
+	return_url:localurl,notnull
 }
 
 ad_return_template
Index: openacs-4/packages/evaluation/www/evaluation-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/evaluation-list.tcl,v
diff -u -r1.10.10.1 -r1.10.10.2
--- openacs-4/packages/evaluation/www/evaluation-list.tcl	12 Sep 2015 11:06:02 -0000	1.10.10.1
+++ openacs-4/packages/evaluation/www/evaluation-list.tcl	2 Feb 2017 14:18:02 -0000	1.10.10.2
@@ -9,7 +9,7 @@
     @cvs-id $Id$
 
 } -query {
-	{orderby:optional}
+	{orderby:token,optional}
 }
 
 set package_id [ad_conn package_id]
Index: openacs-4/packages/evaluation/www/task-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/task-list.tcl,v
diff -u -r1.8.10.1 -r1.8.10.2
--- openacs-4/packages/evaluation/www/task-list.tcl	12 Sep 2015 11:06:03 -0000	1.8.10.1
+++ openacs-4/packages/evaluation/www/task-list.tcl	2 Feb 2017 14:18:02 -0000	1.8.10.2
@@ -9,7 +9,7 @@
     @cvs-id $Id$
 
 } -query {
-	{orderby:optional}
+	{orderby:token,optional}
 }
 
 set package_id [ad_conn package_id]
Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.tcl,v
diff -u -r1.11.2.1 -r1.11.2.2
--- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.tcl	12 Sep 2015 11:06:04 -0000	1.11.2.1
+++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.tcl	2 Feb 2017 14:18:02 -0000	1.11.2.2
@@ -9,9 +9,9 @@
     @cvs-id $Id$
 
 } -query {
-	{orderby:optional}
+	{orderby:token,optional}
 	task_id:naturalnum,notnull
-	return_url
+	return_url:localurl
 } -validate {
 	grades_sheets {
 		if { ![db_string count_grades_sheets { *SQL* }] } {
Index: openacs-4/packages/evaluation/www/admin/grades/grades.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades.tcl,v
diff -u -r1.19.2.1 -r1.19.2.2
--- openacs-4/packages/evaluation/www/admin/grades/grades.tcl	12 Sep 2015 11:06:06 -0000	1.19.2.1
+++ openacs-4/packages/evaluation/www/admin/grades/grades.tcl	2 Feb 2017 14:18:02 -0000	1.19.2.2
@@ -8,7 +8,7 @@
     @creation-date Feb 2004
     @cvs-id $Id$
 } -query {
-    {orderby:optional}
+    {orderby:token,optional}
     {set_grade_id_live:optional ""}
 }
 
Index: openacs-4/packages/evaluation/www/view/answer-ok.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/answer-ok.tcl,v
diff -u -r1.2.10.1 -r1.2.10.2
--- openacs-4/packages/evaluation/www/view/answer-ok.tcl	12 Sep 2015 11:06:09 -0000	1.2.10.1
+++ openacs-4/packages/evaluation/www/view/answer-ok.tcl	2 Feb 2017 14:18:02 -0000	1.2.10.2
@@ -9,7 +9,7 @@
     @cvs-id $Id$
 
 } -query {
-	return_url:notnull
+	return_url:localurl,notnull
 }
 
 ad_return_template
Index: openacs-4/packages/evaluation/www/view/evaluation-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/evaluation-list.tcl,v
diff -u -r1.3.8.1 -r1.3.8.2
--- openacs-4/packages/evaluation/www/view/evaluation-list.tcl	12 Sep 2015 11:06:09 -0000	1.3.8.1
+++ openacs-4/packages/evaluation/www/view/evaluation-list.tcl	2 Feb 2017 14:18:02 -0000	1.3.8.2
@@ -9,7 +9,7 @@
     @cvs-id $Id$
 
 } -query {
-	{orderby:optional}
+	{orderby:token,optional}
 }
 
 set package_id [ad_conn package_id]
Index: openacs-4/packages/evaluation/www/view/task-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/view/task-list.tcl,v
diff -u -r1.2.10.1 -r1.2.10.2
--- openacs-4/packages/evaluation/www/view/task-list.tcl	12 Sep 2015 11:06:10 -0000	1.2.10.1
+++ openacs-4/packages/evaluation/www/view/task-list.tcl	2 Feb 2017 14:18:02 -0000	1.2.10.2
@@ -9,7 +9,7 @@
     @cvs-id $Id$
 
 } -query {
-	{orderby:optional}
+	{orderby:token,optional}
 }
 
 set package_id [ad_conn package_id]