Index: openacs-4/packages/acs-admin/www/apm/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/index.tcl,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/acs-admin/www/apm/index.tcl	19 Jun 2015 09:09:51 -0000	1.28
+++ openacs-4/packages/acs-admin/www/apm/index.tcl	26 Jun 2015 20:50:09 -0000	1.29
@@ -6,8 +6,8 @@
     @author Jon Salz (jsalz@arsdigita.com)
     @cvs-id $Id$
 } {
-    { orderby "package_key" }
-    { owned_by "everyone" }
+    { orderby:token "package_key" }
+    { owned_by:word "everyone" }
     { supertype "all" }
     { reload_links_p:boolean 0 }
 }
Index: openacs-4/packages/acs-admin/www/apm/version-parameters.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-parameters.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-admin/www/apm/version-parameters.tcl	19 Jun 2015 09:09:51 -0000	1.10
+++ openacs-4/packages/acs-admin/www/apm/version-parameters.tcl	26 Jun 2015 20:50:09 -0000	1.11
@@ -7,7 +7,7 @@
     @creation-date 12 September 2000
     @cvs-id $Id$
 } {
-    {orderby "parameter_name"}
+    {orderby:token "parameter_name"}
     {version_id:naturalnum,notnull}
     {section_name ""}
 }
Index: openacs-4/packages/acs-admin/www/users/bouncing-users.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/bouncing-users.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/users/bouncing-users.tcl	19 Jun 2015 09:09:51 -0000	1.2
+++ openacs-4/packages/acs-admin/www/users/bouncing-users.tcl	26 Jun 2015 20:50:09 -0000	1.3
@@ -9,7 +9,7 @@
 } {
     {page ""}
     {page_size 25}
-    {orderby "username,asc"}
+    {orderby:token "username,asc"}
 }
 
 
Index: openacs-4/packages/acs-authentication/lib/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/lib/search.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-authentication/lib/search.tcl	19 Jun 2015 18:07:53 -0000	1.5
+++ openacs-4/packages/acs-authentication/lib/search.tcl	26 Jun 2015 20:50:09 -0000	1.6
@@ -16,8 +16,8 @@
 
 } {
     {search_text ""}
-    {authority_id ""}
-    orderby:optional
+    {authority_id:naturalnum,notnull ""}
+    orderby:token,optional
 }
 
 set authority_options [auth::authority::get_authority_options]
Index: openacs-4/packages/acs-automated-testing/www/admin/clear.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/clear.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-automated-testing/www/admin/clear.tcl	27 Oct 2014 16:39:02 -0000	1.3
+++ openacs-4/packages/acs-automated-testing/www/admin/clear.tcl	26 Jun 2015 20:50:09 -0000	1.4
@@ -4,7 +4,7 @@
   {package_key ""}
   {category:aa_test_category ""}
   {view_by:aa_test_view_by "package"}
-  {testcase_id ""}
+  {testcase_id:naturalnum,notnull ""}
   {quiet:boolean "0"}
 } -properties {
 }
Index: openacs-4/packages/acs-automated-testing/www/admin/component.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/component.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-automated-testing/www/admin/component.tcl	27 Oct 2014 16:39:02 -0000	1.4
+++ openacs-4/packages/acs-automated-testing/www/admin/component.tcl	26 Jun 2015 20:50:09 -0000	1.5
@@ -1,7 +1,7 @@
 ad_page_contract {
   @cvs-id $Id$
 } {
-  component_id:notnull
+  component_id:naturalnum,notnull
   package_key:nohtml
 } -properties {
   title:onevalue
Index: openacs-4/packages/acs-automated-testing/www/admin/rerun.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/rerun.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-automated-testing/www/admin/rerun.tcl	27 Oct 2014 16:39:03 -0000	1.5
+++ openacs-4/packages/acs-automated-testing/www/admin/rerun.tcl	26 Jun 2015 20:50:09 -0000	1.6
@@ -4,7 +4,7 @@
     {package_key ""}
     {category:aa_test_category ""}
     {view_by:aa_test_view_by "package"}
-    {testcase_id ""}
+    {testcase_id:naturalnum,notnull ""}
     {quiet:boolean "0"}
     {stress:boolean "0"}
     {security_risk:boolean "0"}
Index: openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl	22 Jun 2015 21:03:12 -0000	1.11
+++ openacs-4/packages/acs-automated-testing/www/admin/testcase.tcl	26 Jun 2015 20:50:09 -0000	1.12
@@ -1,7 +1,7 @@
 ad_page_contract {
     @cvs-id $Id$
 } {
-    testcase_id:notnull
+    testcase_id:naturalnum,notnull
     package_key:nohtml
     {showsource:boolean 0}
     {quiet:boolean 1}
Index: openacs-4/packages/download/www/all-metadata.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/all-metadata.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/download/www/all-metadata.tcl	12 Sep 2013 10:26:11 -0000	1.5
+++ openacs-4/packages/download/www/all-metadata.tcl	26 Jun 2015 20:56:07 -0000	1.6
@@ -6,7 +6,7 @@
      @cvs-id $Id$
 } {
     metadata_id:naturalnum,notnull
-    {orderby ""}
+    {orderby:token ""}
 }
 
 if { ![db_0or1row metadata {
Index: openacs-4/packages/download/www/archive-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/archive-add-2.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/download/www/archive-add-2.tcl	6 Aug 2014 16:24:41 -0000	1.7
+++ openacs-4/packages/download/www/archive-add-2.tcl	26 Jun 2015 20:56:07 -0000	1.8
@@ -13,7 +13,7 @@
     {version_name ""}
     summary:notnull
     description:notnull,html
-    html_p
+    html_p:boolean
     metadata:array,optional,html
 } -validate {
     check_metadata -requires { archive_type_id } {
Index: openacs-4/packages/download/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/index.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/download/www/index.tcl	31 Jul 2014 09:02:56 -0000	1.15
+++ openacs-4/packages/download/www/index.tcl	26 Jun 2015 20:56:07 -0000	1.16
@@ -6,7 +6,7 @@
      @cvs-id $Id$
 } {
     {archive_type_id:naturalnum,optional ""}
-    {orderby "archive_name,desc"}
+    {orderby:token "archive_name,desc"}
     {query_string ""}
     {updated ""}
 } -properties {
Index: openacs-4/packages/download/www/admin/report-one-ip.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-one-ip.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/download/www/admin/report-one-ip.tcl	12 Sep 2013 10:26:12 -0000	1.7
+++ openacs-4/packages/download/www/admin/report-one-ip.tcl	26 Jun 2015 20:56:07 -0000	1.8
@@ -7,7 +7,7 @@
      @cvs-id $Id$
 } {
     download_ip:notnull
-    {orderby "archive_name"}
+    {orderby:token "archive_name"}
     {downloaded "1m"}
 } -properties {
     download_ip:onevalue
Index: openacs-4/packages/download/www/admin/report-one-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-one-user.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/download/www/admin/report-one-user.tcl	6 Aug 2014 16:24:41 -0000	1.8
+++ openacs-4/packages/download/www/admin/report-one-user.tcl	26 Jun 2015 20:56:07 -0000	1.9
@@ -6,7 +6,7 @@
      @cvs-id $Id$
 } {
     user_id:naturalnum,notnull
-    {orderby "archive_name"}
+    {orderby:token "archive_name"}
     {downloaded "1m"}
 } -properties {
     first_names:onevalue
Index: openacs-4/packages/download/www/admin/report-version-downloads.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-version-downloads.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/download/www/admin/report-version-downloads.tcl	6 Aug 2014 16:24:41 -0000	1.8
+++ openacs-4/packages/download/www/admin/report-version-downloads.tcl	26 Jun 2015 20:56:07 -0000	1.9
@@ -6,7 +6,7 @@
      @cvs-id $Id$
 } {
     {archive_id:naturalnum,notnull}
-    {orderby "user_name"}
+    {orderby:token "user_name"}
     {downloaded 1m}
     {versions "current"}
 } -properties {
Index: openacs-4/packages/photo-album/www/album-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-delete.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/photo-album/www/album-delete.tcl	7 Aug 2014 07:59:50 -0000	1.8
+++ openacs-4/packages/photo-album/www/album-delete.tcl	26 Jun 2015 20:59:39 -0000	1.9
@@ -9,7 +9,7 @@
     @cvs-id $Id$
 } {
     album_id:naturalnum,notnull
-    {confirmed_p "f"}
+    {confirmed_p:boolean "f"}
 } -validate {
     valid_album -requires {album_id:integer} {
 	if [string equal [pa_is_album_p $album_id] "f"] {
Index: openacs-4/packages/photo-album/www/folder-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/folder-delete.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/photo-album/www/folder-delete.tcl	7 Aug 2014 07:59:50 -0000	1.8
+++ openacs-4/packages/photo-album/www/folder-delete.tcl	26 Jun 2015 20:59:39 -0000	1.9
@@ -10,7 +10,7 @@
     @cvs-id $Id$
 } {
     folder_id:naturalnum,notnull
-    {confirmed_p "f"}
+    {confirmed_p:boolean "f"}
 } -validate {
     valid_folder -requires {folder_id:integer} {
 	if [string equal [pa_is_folder_p $folder_id] "f"] {
Index: openacs-4/packages/photo-album/www/photo-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-delete.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/photo-album/www/photo-delete.tcl	7 Aug 2014 07:59:51 -0000	1.8
+++ openacs-4/packages/photo-album/www/photo-delete.tcl	26 Jun 2015 20:59:39 -0000	1.9
@@ -12,7 +12,7 @@
     @cvs-id $Id$
 } {
     photo_id:naturalnum,notnull
-    {confirmed_p "f"}
+    {confirmed_p:boolean "f"}
 } -validate {
     valid_photo -requires {photo_id:integer} {
 	if [string equal [pa_is_photo_p $photo_id] "f"] {
Index: openacs-4/packages/photo-album/www/photo.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/photo-album/www/photo.tcl	7 Aug 2014 07:59:51 -0000	1.12
+++ openacs-4/packages/photo-album/www/photo.tcl	26 Jun 2015 20:59:39 -0000	1.13
@@ -11,7 +11,7 @@
     {latest_revision 0}
     {photo_id:naturalnum,notnull 0}
     {collection_id:naturalnum,optional {}}
-    {show_html_p 0}
+    {show_html_p:boolean 0}
 } -properties {
     context:onevalue
     title:onevalue
Index: openacs-4/packages/wp-slim/www/attach.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/wp-slim/www/attach.tcl	12 Sep 2013 20:47:19 -0000	1.12
+++ openacs-4/packages/wp-slim/www/attach.tcl	26 Jun 2015 20:56:07 -0000	1.13
@@ -10,7 +10,7 @@
     slide_item_id:naturalnum,notnull
     pres_item_id:naturalnum,notnull
     attachment:notnull
-    inline_image_p:notnull
+    inline_image_p:boolean,notnull
     display:notnull
 }
 
Index: openacs-4/packages/wp-slim/www/presentation-public.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-public.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/presentation-public.tcl	12 Sep 2013 20:47:20 -0000	1.3
+++ openacs-4/packages/wp-slim/www/presentation-public.tcl	26 Jun 2015 20:56:07 -0000	1.4
@@ -9,7 +9,7 @@
     @cvs-id $Id$
 } {
     pres_item_id:naturalnum,notnull
-    public_p:notnull
+    public_p:boolean,notnull
 }
 
 permission::require_permission -object_id $pres_item_id -privilege wp_admin_presentation
Index: openacs-4/packages/wp-slim/www/style-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/style-edit-2.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/wp-slim/www/style-edit-2.tcl	7 Aug 2014 13:00:22 -0000	1.6
+++ openacs-4/packages/wp-slim/www/style-edit-2.tcl	26 Jun 2015 20:56:07 -0000	1.7
@@ -32,7 +32,7 @@
     vlink_color.c1:naturalnum,optional
     vlink_color.c2:naturalnum,optional
     vlink_color.c3:naturalnum,optional
-    public_p:notnull
+    public_p:boolean,notnull
     css:optional
 }