Index: openacs-4/packages/dotlrn/www/applet-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/applet-remove.tcl,v
diff -u -r1.10.6.1 -r1.10.6.2
--- openacs-4/packages/dotlrn/www/applet-remove.tcl	11 Sep 2015 11:40:41 -0000	1.10.6.1
+++ openacs-4/packages/dotlrn/www/applet-remove.tcl	26 Jan 2017 11:46:02 -0000	1.10.6.2
@@ -20,7 +20,7 @@
     @author Ben Adida (ben@openforce.net)
     @creation-date 2001-10-08
 } -query {
-    community_id
+    community_id:naturalnum,notnull
     applet_key
 }
 
Index: openacs-4/packages/dotlrn/www/approve.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/approve.tcl,v
diff -u -r1.9.4.1 -r1.9.4.2
--- openacs-4/packages/dotlrn/www/approve.tcl	11 Sep 2015 11:40:41 -0000	1.9.4.1
+++ openacs-4/packages/dotlrn/www/approve.tcl	26 Jan 2017 11:46:02 -0000	1.9.4.2
@@ -21,8 +21,8 @@
     @creation-date 2002-03-15
     @version $Id$
 } -query {
-    {user_id:multiple ""}
-    {community_id ""}
+    {user_id:integer,multiple ""}
+    {community_id:integer ""}
     {referer "./"}
 }
 
Index: openacs-4/packages/dotlrn/www/deregister-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/deregister-confirm.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/dotlrn/www/deregister-confirm.tcl	11 Sep 2015 11:40:42 -0000	1.6.2.1
+++ openacs-4/packages/dotlrn/www/deregister-confirm.tcl	26 Jan 2017 11:46:02 -0000	1.6.2.2
@@ -22,7 +22,7 @@
     @version $Id$ 
 } -query {
     {user_id:naturalnum,multiple,notnull}
-    {community_id ""}
+    {community_id:integer ""}
     {referer ""}
 }
 
Index: openacs-4/packages/dotlrn/www/deregister-self-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/deregister-self-confirm.tcl,v
diff -u -r1.2.6.1 -r1.2.6.2
--- openacs-4/packages/dotlrn/www/deregister-self-confirm.tcl	11 Sep 2015 11:40:42 -0000	1.2.6.1
+++ openacs-4/packages/dotlrn/www/deregister-self-confirm.tcl	26 Jan 2017 11:46:02 -0000	1.2.6.2
@@ -2,7 +2,7 @@
     Form to confirm a user dropping a single membership for themselves
 } -query {
     {user_id:multiple,integer ""}
-    {community_id ""}
+    {community_id:integer ""}
     {referer "./"}
 }
 
Index: openacs-4/packages/dotlrn/www/deregister.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/deregister.tcl,v
diff -u -r1.10.4.1 -r1.10.4.2
--- openacs-4/packages/dotlrn/www/deregister.tcl	11 Sep 2015 11:40:43 -0000	1.10.4.1
+++ openacs-4/packages/dotlrn/www/deregister.tcl	26 Jan 2017 11:46:02 -0000	1.10.4.2
@@ -23,7 +23,7 @@
     @version $Id$
 } -query {
     {user_id:multiple,integer ""}
-    {community_id ""}
+    {community_id:integer ""}
     {referer "./"}
 }
 
Index: openacs-4/packages/dotlrn/www/join-policy-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/join-policy-toggle.tcl,v
diff -u -r1.10.4.1 -r1.10.4.2
--- openacs-4/packages/dotlrn/www/join-policy-toggle.tcl	11 Sep 2015 11:40:44 -0000	1.10.4.1
+++ openacs-4/packages/dotlrn/www/join-policy-toggle.tcl	26 Jan 2017 11:46:02 -0000	1.10.4.2
@@ -21,7 +21,7 @@
     @creation-date 2002-01-18
     @version $Id$
 } -query {
-    {community_id ""}
+    {community_id:integer ""}
     policy:notnull
     {referer "one-community-admin"}
 } -validate {
Index: openacs-4/packages/dotlrn/www/manage-memberships.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/manage-memberships.tcl,v
diff -u -r1.22.2.2 -r1.22.2.3
--- openacs-4/packages/dotlrn/www/manage-memberships.tcl	8 Nov 2016 13:56:02 -0000	1.22.2.2
+++ openacs-4/packages/dotlrn/www/manage-memberships.tcl	26 Jan 2017 11:46:02 -0000	1.22.2.3
@@ -38,8 +38,8 @@
 } -query {
     {member_department_key ""}
     {non_member_department_key ""}
-    {member_term_id -1}
-    {non_member_term_id -1}
+    {member_term_id:integer -1}
+    {non_member_term_id:integer -1}
 } -properties {
 }
 
Index: openacs-4/packages/dotlrn/www/member-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-2.tcl,v
diff -u -r1.16.4.1 -r1.16.4.2
--- openacs-4/packages/dotlrn/www/member-add-2.tcl	11 Sep 2015 11:40:44 -0000	1.16.4.1
+++ openacs-4/packages/dotlrn/www/member-add-2.tcl	26 Jan 2017 11:46:02 -0000	1.16.4.2
@@ -22,7 +22,7 @@
     @creation-date 2001-11-04
     @version $Id$
 } -query {
-    user_id
+    user_id:naturalnum,notnull
     {referer "one-community-admin"}
 } -properties {
     roles:multirow
Index: openacs-4/packages/dotlrn/www/member-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-3.tcl,v
diff -u -r1.14.6.1 -r1.14.6.2
--- openacs-4/packages/dotlrn/www/member-add-3.tcl	11 Sep 2015 11:40:44 -0000	1.14.6.1
+++ openacs-4/packages/dotlrn/www/member-add-3.tcl	26 Jan 2017 11:46:02 -0000	1.14.6.2
@@ -22,7 +22,7 @@
     @creation-date 2001-11-04
     @version $Id$
 } -query {
-    user_id:multiple
+    user_id:naturalnum,multiple,notnull
     rel_type
     {referer "one-community-admin"}
 }
Index: openacs-4/packages/dotlrn/www/member-email-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-email-confirm.tcl,v
diff -u -r1.2.8.1 -r1.2.8.2
--- openacs-4/packages/dotlrn/www/member-email-confirm.tcl	11 Sep 2015 11:40:44 -0000	1.2.8.1
+++ openacs-4/packages/dotlrn/www/member-email-confirm.tcl	26 Jan 2017 11:46:02 -0000	1.2.8.2
@@ -1,7 +1,7 @@
 ad_page_contract {
     Send word of welcome
 } -query {
-    community_id
+    community_id:naturalnum,notnull
 } -validate {
     community_id_is_dotlrn_community {
 	if {[dotlrn_community::get_community_key -community_id $community_id] eq ""} {
Index: openacs-4/packages/dotlrn/www/privacy-policy-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/privacy-policy-toggle.tcl,v
diff -u -r1.4.4.1 -r1.4.4.2
--- openacs-4/packages/dotlrn/www/privacy-policy-toggle.tcl	11 Sep 2015 11:40:46 -0000	1.4.4.1
+++ openacs-4/packages/dotlrn/www/privacy-policy-toggle.tcl	26 Jan 2017 11:46:02 -0000	1.4.4.2
@@ -21,7 +21,7 @@
     @creation-date 2004-02-17
     @version $Id$
 } -query {
-    {community_id ""}
+    {community_id:integer ""}
     policy:notnull
     {referer "one-community-admin"}
 } -validate {
Index: openacs-4/packages/dotlrn/www/register.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/register.tcl,v
diff -u -r1.17.4.3 -r1.17.4.4
--- openacs-4/packages/dotlrn/www/register.tcl	12 Sep 2016 11:16:15 -0000	1.17.4.3
+++ openacs-4/packages/dotlrn/www/register.tcl	26 Jan 2017 11:46:02 -0000	1.17.4.4
@@ -22,8 +22,8 @@
     @creation-date 2001-10-06
     @version $Id$
 } -query {
-    {user_id ""}
-    {community_id ""}
+    {user_id:integer ""}
+    {community_id:integer ""}
     {referer "./"}
 }
 
Index: openacs-4/packages/dotlrn/www/reject.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/reject.tcl,v
diff -u -r1.9.4.1 -r1.9.4.2
--- openacs-4/packages/dotlrn/www/reject.tcl	11 Sep 2015 11:40:46 -0000	1.9.4.1
+++ openacs-4/packages/dotlrn/www/reject.tcl	26 Jan 2017 11:46:02 -0000	1.9.4.2
@@ -21,8 +21,8 @@
     @creation-date 2002-03-15
     @version $Id$
 } -query {
-    {user_id:multiple ""}
-    {community_id ""}
+    {user_id:integer,multiple ""}
+    {community_id:integer ""}
     {referer "./"}
 }
 
Index: openacs-4/packages/dotlrn/www/spam-policy-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-policy-toggle.tcl,v
diff -u -r1.4.4.1 -r1.4.4.2
--- openacs-4/packages/dotlrn/www/spam-policy-toggle.tcl	11 Sep 2015 11:40:46 -0000	1.4.4.1
+++ openacs-4/packages/dotlrn/www/spam-policy-toggle.tcl	26 Jan 2017 11:46:02 -0000	1.4.4.2
@@ -18,7 +18,7 @@
     @creation-date 2002-01-18
     @version $Id$
 } -query {
-    {community_id ""}
+    {community_id:integer ""}
     policy:notnull
     {referer "one-community-admin"}
 } -validate {
Index: openacs-4/packages/dotlrn/www/spam-recipients.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-recipients.tcl,v
diff -u -r1.7.4.1 -r1.7.4.2
--- openacs-4/packages/dotlrn/www/spam-recipients.tcl	11 Sep 2015 11:40:46 -0000	1.7.4.1
+++ openacs-4/packages/dotlrn/www/spam-recipients.tcl	26 Jan 2017 11:46:02 -0000	1.7.4.2
@@ -1,6 +1,6 @@
 ad_page_contract {
 } -query {
-    {community_id ""}
+    {community_id:integer ""}
     {referer ""}
 }
 
Index: openacs-4/packages/dotlrn/www/spam.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.tcl,v
diff -u -r1.31.4.2 -r1.31.4.3
--- openacs-4/packages/dotlrn/www/spam.tcl	18 Sep 2015 08:05:10 -0000	1.31.4.2
+++ openacs-4/packages/dotlrn/www/spam.tcl	26 Jan 2017 11:46:02 -0000	1.31.4.3
@@ -21,7 +21,7 @@
 } -query {
     {recipients:integer,multiple ""}
     {recipients_str ""}
-    {community_id ""}
+    {community_id:integer ""}
     {rel_types:multiple "" }
     {rel_types_str ""}
     {referer ""}
Index: openacs-4/packages/dotlrn/www/subcommunity-archive.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/subcommunity-archive.tcl,v
diff -u -r1.11.4.1 -r1.11.4.2
--- openacs-4/packages/dotlrn/www/subcommunity-archive.tcl	11 Sep 2015 11:40:47 -0000	1.11.4.1
+++ openacs-4/packages/dotlrn/www/subcommunity-archive.tcl	26 Jan 2017 11:46:02 -0000	1.11.4.2
@@ -20,7 +20,7 @@
     @author arjun (arjun@openforce.net)
     @version $Id$
 } -query {
-    {community_id ""}
+    {community_id:integer ""}
     {referer "one-community-admin"}
 } -properties {
     title:onevalue
Index: openacs-4/packages/dotlrn/www/user-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-2.tcl,v
diff -u -r1.16.2.1 -r1.16.2.2
--- openacs-4/packages/dotlrn/www/user-add-2.tcl	11 Sep 2015 11:40:47 -0000	1.16.2.1
+++ openacs-4/packages/dotlrn/www/user-add-2.tcl	26 Jan 2017 11:46:02 -0000	1.16.2.2
@@ -21,14 +21,14 @@
     @creation-date 2002-01-20
     @version $Id$
 } -query {
-    user_id
+    user_id:naturalnum,notnull
     password
     {referer "/acs-admin/users"}
     type
-    can_browse_p
-    read_private_data_p
-    dotlrn_interactive_p
-    add_membership_p
+    can_browse_p:boolean
+    read_private_data_p:boolean
+    dotlrn_interactive_p:boolean
+    add_membership_p:boolean
 } -properties {
     context_bar:onevalue
     export_vars:onevalue
Index: openacs-4/packages/dotlrn/www/user-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add.tcl,v
diff -u -r1.35.4.1 -r1.35.4.2
--- openacs-4/packages/dotlrn/www/user-add.tcl	11 Sep 2015 11:40:47 -0000	1.35.4.1
+++ openacs-4/packages/dotlrn/www/user-add.tcl	26 Jan 2017 11:46:02 -0000	1.35.4.2
@@ -24,10 +24,10 @@
     @version $Id$
 } -query {
     {type student}
-    {can_browse_p 0}
-    {read_private_data_p f}
-    {add_membership_p t}
-    {dotlrn_interactive_p 0}
+    {can_browse_p:boolean 0}
+    {read_private_data_p:boolean f}
+    {add_membership_p:boolean t}
+    {dotlrn_interactive_p:boolean 0}
     {referer members}
 } -properties {
     context_bar:onevalue
Index: openacs-4/packages/dotlrn/www/admin/admin-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/admin-add-2.tcl,v
diff -u -r1.5.4.1 -r1.5.4.2
--- openacs-4/packages/dotlrn/www/admin/admin-add-2.tcl	11 Sep 2015 11:40:48 -0000	1.5.4.1
+++ openacs-4/packages/dotlrn/www/admin/admin-add-2.tcl	26 Jan 2017 11:46:02 -0000	1.5.4.2
@@ -23,7 +23,7 @@
     @creation-date 2004-07-02
     @cvs-id $Id$
 } -query {
-    user_id
+    user_id:naturalnum,notnull
     {referer "dotlrn-admins"}
 } -properties {
 
Index: openacs-4/packages/dotlrn/www/admin/browse-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/browse-toggle.tcl,v
diff -u -r1.4.10.1 -r1.4.10.2
--- openacs-4/packages/dotlrn/www/admin/browse-toggle.tcl	11 Sep 2015 11:40:49 -0000	1.4.10.1
+++ openacs-4/packages/dotlrn/www/admin/browse-toggle.tcl	26 Jan 2017 11:46:02 -0000	1.4.10.2
@@ -21,8 +21,8 @@
     @creation-date November 19, 2002
     @version $Id$
 } -query {
-    user_id
-    can_browse_p
+    user_id:naturalnum,notnull
+    can_browse_p:boolean
     {referer "users"}
 }
 
Index: openacs-4/packages/dotlrn/www/admin/class.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.tcl,v
diff -u -r1.21.4.3 -r1.21.4.4
--- openacs-4/packages/dotlrn/www/admin/class.tcl	8 Nov 2016 13:56:02 -0000	1.21.4.3
+++ openacs-4/packages/dotlrn/www/admin/class.tcl	26 Jan 2017 11:46:02 -0000	1.21.4.4
@@ -23,8 +23,8 @@
     @version $Id$
 } -query {
     class_key:notnull
-    {term_id -1}
-    {orderby "term_name,asc"}
+    {term_id:integer -1}
+    {orderby:token "term_name,asc"}
     {keyword ""}
 } -properties {
     pretty_name:onevalue
Index: openacs-4/packages/dotlrn/www/admin/classes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes.tcl,v
diff -u -r1.16.10.1 -r1.16.10.2
--- openacs-4/packages/dotlrn/www/admin/classes.tcl	11 Sep 2015 11:40:50 -0000	1.16.10.1
+++ openacs-4/packages/dotlrn/www/admin/classes.tcl	26 Jan 2017 11:46:02 -0000	1.16.10.2
@@ -23,7 +23,7 @@
     @version $Id$
 } -query {
     {department_key ""}
-    {orderby "department_name,asc"}
+    {orderby:token "department_name,asc"}
     {keyword ""}
     {page ""}
 } -properties {
Index: openacs-4/packages/dotlrn/www/admin/clubs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/clubs.tcl,v
diff -u -r1.19.2.2 -r1.19.2.3
--- openacs-4/packages/dotlrn/www/admin/clubs.tcl	18 Sep 2015 08:05:10 -0000	1.19.2.2
+++ openacs-4/packages/dotlrn/www/admin/clubs.tcl	26 Jan 2017 11:46:02 -0000	1.19.2.3
@@ -23,7 +23,7 @@
     @creation-date 2001-12-03
     @version $Id$
 } -query {
-    {orderby "pretty_name,asc"}
+    {orderby:token "pretty_name,asc"}
     page:naturalnum,optional
 } -properties {
     title:onevalue
Index: openacs-4/packages/dotlrn/www/admin/departments.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.tcl,v
diff -u -r1.13.2.1 -r1.13.2.2
--- openacs-4/packages/dotlrn/www/admin/departments.tcl	11 Sep 2015 11:40:51 -0000	1.13.2.1
+++ openacs-4/packages/dotlrn/www/admin/departments.tcl	26 Jan 2017 11:46:02 -0000	1.13.2.2
@@ -22,7 +22,7 @@
     @version $Id$
 } -query {
     {keyword ""}
-    {orderby "department_name,asc"}
+    {orderby:token "department_name,asc"}
     page:naturalnum,optional
 } -properties {
     title:onevalue
Index: openacs-4/packages/dotlrn/www/admin/guest-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/guest-toggle.tcl,v
diff -u -r1.4.10.1 -r1.4.10.2
--- openacs-4/packages/dotlrn/www/admin/guest-toggle.tcl	11 Sep 2015 11:40:52 -0000	1.4.10.1
+++ openacs-4/packages/dotlrn/www/admin/guest-toggle.tcl	26 Jan 2017 11:46:02 -0000	1.4.10.2
@@ -21,8 +21,8 @@
     @creation-date November 19, 2002
     @version $Id$
 } -query {
-    user_id
-    guest_p
+    user_id:naturalnum,notnull
+    guest_p:boolean
     {referer "users"}
 }
 
Index: openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl,v
diff -u -r1.14.2.1 -r1.14.2.2
--- openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl	11 Sep 2015 11:40:52 -0000	1.14.2.1
+++ openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl	26 Jan 2017 11:46:02 -0000	1.14.2.2
@@ -21,7 +21,7 @@
     @creation-date Jan 12, 2002
     @version $Id$
 } -query {
-    user_id
+    user_id:naturalnum,notnull
     value
     {referer "users"}
 }
Index: openacs-4/packages/dotlrn/www/admin/term.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.tcl,v
diff -u -r1.19.2.4 -r1.19.2.5
--- openacs-4/packages/dotlrn/www/admin/term.tcl	8 Nov 2016 13:56:02 -0000	1.19.2.4
+++ openacs-4/packages/dotlrn/www/admin/term.tcl	26 Jan 2017 11:46:02 -0000	1.19.2.5
@@ -23,7 +23,7 @@
 } -query {
     term_id:integer,notnull
     {department_key ""}
-    {orderby "department_name,asc"}
+    {orderby:token "department_name,asc"}
     page:naturalnum,optional
     {keyword ""}
     {referer "terms"}
Index: openacs-4/packages/dotlrn/www/admin/terms.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/terms.tcl,v
diff -u -r1.9.2.1 -r1.9.2.2
--- openacs-4/packages/dotlrn/www/admin/terms.tcl	11 Sep 2015 11:40:53 -0000	1.9.2.1
+++ openacs-4/packages/dotlrn/www/admin/terms.tcl	26 Jan 2017 11:46:02 -0000	1.9.2.2
@@ -22,7 +22,7 @@
     @version $Id$
 } -query {
     page:naturalnum,optional
-    {orderby "start_date_pretty,desc"}
+    {orderby:token "start_date_pretty,desc"}
 } -properties {
     context_bar:onevalue
     terms:multirow
Index: openacs-4/packages/dotlrn/www/admin/unarchive.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/unarchive.tcl,v
diff -u -r1.4.2.1 -r1.4.2.2
Binary files differ
Index: openacs-4/packages/dotlrn/www/admin/user-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-edit.tcl,v
diff -u -r1.23.10.1 -r1.23.10.2
--- openacs-4/packages/dotlrn/www/admin/user-edit.tcl	11 Sep 2015 11:40:53 -0000	1.23.10.1
+++ openacs-4/packages/dotlrn/www/admin/user-edit.tcl	26 Jan 2017 11:46:02 -0000	1.23.10.2
@@ -22,8 +22,8 @@
     @creation-date 2001-12-10
     @version $Id$
 } -query {
-    {return_url "[dotlrn::get_admin_url]/users"}
-    user_id
+    {return_url:localurl "[dotlrn::get_admin_url]/users"}
+    user_id:naturalnum,notnull
 }
 
 #Pages in this directory are only runnable by dotlrn-wide admins.
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.1 -r1.30.2.2
--- openacs-4/packages/dotlrn/www/admin/users-search.tcl	11 Sep 2015 11:40:54 -0000	1.30.2.1
+++ openacs-4/packages/dotlrn/www/admin/users-search.tcl	26 Jan 2017 11:46:02 -0000	1.30.2.2
@@ -22,8 +22,8 @@
     @version $Id$
 } -query {
     {type "any"}
-    {can_browse_p "any"}
-    {guest_p "any"}
+    {can_browse_p:word "any"}
+    {guest_p:word "any"}
     {join_criteria "and"}
     {n_users 0}
     {action "none"}
Index: openacs-4/packages/xotcl-request-monitor/www/active-communities.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/active-communities.tcl,v
diff -u -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/xotcl-request-monitor/www/active-communities.tcl	26 Apr 2016 07:25:29 -0000	1.2.2.2
+++ openacs-4/packages/xotcl-request-monitor/www/active-communities.tcl	26 Jan 2017 11:48:29 -0000	1.2.2.3
@@ -5,7 +5,7 @@
 
     @cvs-id $id$
 } -query {
-  {orderby:optional "count,desc"}
+  {orderby:token,optional "count,desc"}
 } -properties {
   title:onevalue
   context:onevalue
Index: openacs-4/packages/xotcl-request-monitor/www/last-requests.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/last-requests.tcl,v
diff -u -r1.8.2.2 -r1.8.2.3
--- openacs-4/packages/xotcl-request-monitor/www/last-requests.tcl	26 Apr 2016 07:25:29 -0000	1.8.2.2
+++ openacs-4/packages/xotcl-request-monitor/www/last-requests.tcl	26 Jan 2017 11:48:29 -0000	1.8.2.3
@@ -6,7 +6,7 @@
 } -query {
   request_key
   {all:optional 1}
-  {orderby:optional "last_modified,desc"}
+  {orderby:token,optional "last_modified,desc"}
 } -properties {
     title:onevalue
     context:onevalue
Index: openacs-4/packages/xotcl-request-monitor/www/last100.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/last100.tcl,v
diff -u -r1.7.2.3 -r1.7.2.4
--- openacs-4/packages/xotcl-request-monitor/www/last100.tcl	30 Nov 2016 08:16:17 -0000	1.7.2.3
+++ openacs-4/packages/xotcl-request-monitor/www/last100.tcl	26 Jan 2017 11:48:29 -0000	1.7.2.4
@@ -5,7 +5,7 @@
 
     @cvs-id $Id$
 } -query {
-    {orderby:optional "time,desc"}
+    {orderby:token,optional "time,desc"}
 } -properties {
     title:onevalue
     context:onevalue
Index: openacs-4/packages/xotcl-request-monitor/www/last101.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/last101.tcl,v
diff -u -r1.3.2.2 -r1.3.2.3
--- openacs-4/packages/xotcl-request-monitor/www/last101.tcl	26 Apr 2016 07:25:29 -0000	1.3.2.2
+++ openacs-4/packages/xotcl-request-monitor/www/last101.tcl	26 Jan 2017 11:48:29 -0000	1.3.2.3
@@ -5,7 +5,7 @@
 
     @cvs-id $id
 } -query {
-    {orderby:optional "time,desc"}
+    {orderby:token,optional "time,desc"}
 } -properties {
     title:onevalue
     context:onevalue
Index: openacs-4/packages/xotcl-request-monitor/www/running.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/running.tcl,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/xotcl-request-monitor/www/running.tcl	10 Sep 2015 08:10:47 -0000	1.7.2.1
+++ openacs-4/packages/xotcl-request-monitor/www/running.tcl	26 Jan 2017 11:48:29 -0000	1.7.2.2
@@ -4,7 +4,7 @@
     @author Gustaf Neumann (adapted for interaction with controlling thread)
     @cvs-id $Id$
 } -query {
-  orderby:optional
+  orderby:token,optional
 } -properties {
     title:onevalue
     context:onevalue
Index: openacs-4/packages/xotcl-request-monitor/www/stat-details.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/stat-details.tcl,v
diff -u -r1.6.2.2 -r1.6.2.3
--- openacs-4/packages/xotcl-request-monitor/www/stat-details.tcl	26 Apr 2016 07:25:29 -0000	1.6.2.2
+++ openacs-4/packages/xotcl-request-monitor/www/stat-details.tcl	26 Jan 2017 11:48:29 -0000	1.6.2.3
@@ -8,7 +8,7 @@
     {all:optional 0}
     {with_param:optional 1}
     {with_apps:optional 0}
-    {orderby:optional "totaltime,desc"}
+    {orderby:token,optional "totaltime,desc"}
 } -properties {
     title:onevalue
     context:onevalue
Index: openacs-4/packages/xotcl-request-monitor/www/whos-online-today.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/whos-online-today.tcl,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/xotcl-request-monitor/www/whos-online-today.tcl	26 Apr 2016 07:25:29 -0000	1.4.2.2
+++ openacs-4/packages/xotcl-request-monitor/www/whos-online-today.tcl	26 Jan 2017 11:48:29 -0000	1.4.2.3
@@ -5,7 +5,7 @@
   
   @cvs-id $id: whos-online.tcl,v 1.1.1.1 2004/03/16 16:11:51 nsadmin exp $
 } -query {
-  {orderby:optional "date,desc"}
+  {orderby:token,optional "date,desc"}
   {all:optional 0}
 } -properties {
   title:onevalue
Index: openacs-4/packages/xotcl-request-monitor/www/whos-online.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/whos-online.tcl,v
diff -u -r1.11.2.2 -r1.11.2.3
--- openacs-4/packages/xotcl-request-monitor/www/whos-online.tcl	26 Apr 2016 07:25:29 -0000	1.11.2.2
+++ openacs-4/packages/xotcl-request-monitor/www/whos-online.tcl	26 Jan 2017 11:48:29 -0000	1.11.2.3
@@ -5,7 +5,7 @@
   
   @cvs-id $id: whos-online.tcl,v 1.1.1.1 2004/03/16 16:11:51 nsadmin exp $
 } -query {
-  {orderby:optional "activity,desc"}
+  {orderby:token,optional "activity,desc"}
   {all:boolean 0}
 } -properties {
   title:onevalue
Index: openacs-4/packages/acs-admin/www/users/user-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add-2.tcl,v
diff -u -r1.11.2.2 -r1.11.2.3
--- openacs-4/packages/acs-admin/www/users/user-add-2.tcl	2 Jan 2016 13:50:17 -0000	1.11.2.2
+++ openacs-4/packages/acs-admin/www/users/user-add-2.tcl	26 Jan 2017 11:50:08 -0000	1.11.2.3
@@ -2,7 +2,7 @@
     Processes a new user created by an admin
     @cvs-id $Id$
 } -query {
-    user_id
+    user_id:naturalnum,notnull
     password
     {referer "/acs-admin/users"}
 } -properties {
Index: openacs-4/packages/acs-admin/www/users/user-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add-3.tcl,v
diff -u -r1.8.2.1 -r1.8.2.2
--- openacs-4/packages/acs-admin/www/users/user-add-3.tcl	10 Sep 2015 08:21:10 -0000	1.8.2.1
+++ openacs-4/packages/acs-admin/www/users/user-add-3.tcl	26 Jan 2017 11:50:08 -0000	1.8.2.2
@@ -7,7 +7,7 @@
     message
     first_names
     last_name
-    user_id
+    user_id:naturalnum,notnull
     {referer "/acs-admin/users"}
 } -properties {
     context:onevalue
Index: openacs-4/packages/acs-templating/www/doc/demo/list5/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list5/index.tcl,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/acs-templating/www/doc/demo/list5/index.tcl	10 Sep 2015 08:22:14 -0000	1.2.2.1
+++ openacs-4/packages/acs-templating/www/doc/demo/list5/index.tcl	26 Jan 2017 11:51:47 -0000	1.2.2.2
@@ -6,7 +6,7 @@
   @creation-date 2000-10-23
   @cvs-id $Id$
 } -query {
-  orderby:optional
+  orderby:token,optional
 } -properties {
   notes:multirow
   context:onevalue
Index: openacs-4/packages/acs-templating/www/doc/demo/list6/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/list6/index.tcl,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/acs-templating/www/doc/demo/list6/index.tcl	10 Sep 2015 08:22:14 -0000	1.2.2.1
+++ openacs-4/packages/acs-templating/www/doc/demo/list6/index.tcl	26 Jan 2017 11:51:47 -0000	1.2.2.2
@@ -6,7 +6,7 @@
   @creation-date 2000-10-23
   @cvs-id $Id$
 } -query {
-  orderby:optional
+  orderby:token,optional
 } -properties {
   template_demo_notes:multirow
   context:onevalue