Index: openacs-4/packages/acs-admin/www/apm/package-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-add-2.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-admin/www/apm/package-add-2.tcl	21 Jan 2018 00:38:38 -0000	1.16
+++ openacs-4/packages/acs-admin/www/apm/package-add-2.tcl	2 Feb 2018 00:04:50 -0000	1.17
@@ -5,7 +5,7 @@
     @creation-date 17 April 2000
     @cvs-id $Id$
 } {
-    package_key
+    package_key:token
     pretty_name
     pretty_plural
     { package_type "apm_application"}
Index: openacs-4/packages/acs-admin/www/apm/package-instance-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-instance-create.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/apm/package-instance-create.tcl	19 Jan 2018 13:40:40 -0000	1.4
+++ openacs-4/packages/acs-admin/www/apm/package-instance-create.tcl	2 Feb 2018 00:04:50 -0000	1.5
@@ -4,7 +4,7 @@
     @creation-date 8 Sept 2014
     @cvs-id $Id$
 } {
-    {package_key:notnull}
+    {package_key:token,notnull}
     {return_url:localurl /acs/admin/apm}
 }
 
Index: openacs-4/packages/acs-admin/www/apm/package-watch-cancel.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-watch-cancel.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/apm/package-watch-cancel.tcl	19 Jan 2018 13:40:40 -0000	1.3
+++ openacs-4/packages/acs-admin/www/apm/package-watch-cancel.tcl	2 Feb 2018 00:04:50 -0000	1.4
@@ -4,7 +4,7 @@
     @author Peter Marklund
     @cvs-id $Id$
 } {
-    package_key
+    package_key:token
     {return_url:localurl "index"}
 } 
 
Index: openacs-4/packages/acs-admin/www/apm/package-watch.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-watch.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/apm/package-watch.tcl	19 Jan 2018 13:40:40 -0000	1.4
+++ openacs-4/packages/acs-admin/www/apm/package-watch.tcl	2 Feb 2018 00:04:50 -0000	1.5
@@ -5,7 +5,7 @@
     @author Peter Marklund
     @cvs-id $Id$
 } {
-    package_key
+    package_key:token
     {return_url:localurl "index"}
 } 
 
Index: openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl	1 Oct 2017 12:16:05 -0000	1.16
+++ openacs-4/packages/acs-admin/www/apm/packages-install-2.tcl	2 Feb 2018 00:04:50 -0000	1.17
@@ -6,7 +6,7 @@
     @creation-date Mon Oct  9 00:13:43 2000
     @cvs-id $Id$
 } {
-    {package_key:multiple ""}
+    {package_key:token,multiple ""}
     {force_p:boolean "f"}
 }
 
Index: openacs-4/packages/acs-admin/www/apm/parameter-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-add-2.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/acs-admin/www/apm/parameter-add-2.tcl	19 Jan 2018 13:40:40 -0000	1.12
+++ openacs-4/packages/acs-admin/www/apm/parameter-add-2.tcl	2 Feb 2018 00:04:50 -0000	1.13
@@ -7,7 +7,7 @@
 } {
     version_id:naturalnum,notnull
     parameter_id:naturalnum,notnull
-    package_key:notnull
+    package_key:token,notnull
     parameter_name:notnull
     section_name
     description:notnull,nohtml
Index: openacs-4/packages/acs-admin/www/apm/parameter-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-edit-2.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-admin/www/apm/parameter-edit-2.tcl	21 Jan 2018 00:38:38 -0000	1.10
+++ openacs-4/packages/acs-admin/www/apm/parameter-edit-2.tcl	2 Feb 2018 00:04:50 -0000	1.11
@@ -7,7 +7,7 @@
 } {
     version_id:naturalnum,notnull
     parameter_id:naturalnum,notnull
-    package_key:notnull
+    package_key:token,notnull
     parameter_name:notnull
     section_name
     description:notnull,nohtml
Index: openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl	19 Jan 2018 13:40:40 -0000	1.11
+++ openacs-4/packages/acs-admin/www/apm/version-dependency-remove.tcl	2 Feb 2018 00:04:50 -0000	1.12
@@ -7,7 +7,7 @@
     {version_id:naturalnum,notnull}
     {dependency_id:naturalnum,notnull}
     dependency_type:notnull
-    package_key:notnull
+    package_key:token,notnull
 }
 
 db_transaction {
Index: openacs-4/packages/acs-admin/www/apm/version-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-view.tcl,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/acs-admin/www/apm/version-view.tcl	25 Sep 2017 17:47:11 -0000	1.24
+++ openacs-4/packages/acs-admin/www/apm/version-view.tcl	2 Feb 2018 00:04:50 -0000	1.25
@@ -5,7 +5,7 @@
     @cvs-id $Id$
 } {
     {version_id:naturalnum,optional}
-    {package_key:optional}
+    {package_key:token,optional}
 } -validate {
     version_id_or_package_key {
         if {[info exists package_key] && ![info exists version_id]} {
Index: openacs-4/packages/acs-admin/www/install/install-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install-2.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/install/install-2.tcl	1 Oct 2017 12:16:05 -0000	1.5
+++ openacs-4/packages/acs-admin/www/install/install-2.tcl	2 Feb 2018 00:04:50 -0000	1.6
@@ -1,7 +1,7 @@
 ad_page_contract {
     Install packages - dependency check
 } {
-    package_key:multiple
+    package_key:token,multiple
     {repository_url ""}
 }
 
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 -N -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/users/bouncing-users.tcl	7 Aug 2017 23:47:45 -0000	1.4
+++ openacs-4/packages/acs-admin/www/users/bouncing-users.tcl	2 Feb 2018 00:04:50 -0000	1.5
@@ -7,8 +7,8 @@
     @cvs-id $Id$
 
 } {
-    {page ""}
-    {page_size 25}
+    {page:naturalnum ""}
+    {page_size:naturalnum 25}
     {orderby:token "username,asc"}
 }
 
Index: openacs-4/packages/acs-admin/www/users/merge.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-admin/www/users/merge.tcl	7 Aug 2017 23:47:45 -0000	1.7
+++ openacs-4/packages/acs-admin/www/users/merge.tcl	2 Feb 2018 00:04:50 -0000	1.8
@@ -6,7 +6,7 @@
     @cvs-id $Id$
 } {
     user_id:naturalnum,notnull
-    user_id_from_search
+    user_id_from_search:naturalnum,notnull
 } -properties {
     context:onevalue
     first_names:onevalue
Index: openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount.tcl	19 Jan 2018 14:09:48 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount.tcl	2 Feb 2018 00:05:53 -0000	1.8
@@ -9,7 +9,7 @@
     @cvs-id $Id$
 
 } {
-    package_key:notnull
+    package_key:token,notnull
     node_id:naturalnum,notnull
     {return_url:localurl ""}
 }
Index: openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl	19 Jan 2018 14:09:48 -0000	1.17
+++ openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl	2 Feb 2018 00:05:53 -0000	1.18
@@ -15,7 +15,7 @@
     {new_node_p:boolean f}
     {node_name:trim ""}
     {instance_name ""}
-    package_key:notnull
+    package_key:token,notnull
     {expand:integer,multiple ""}
     root_id:naturalnum,optional
 }
Index: openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/parameter-set-2.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-2.tcl	19 Jan 2018 14:09:48 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-2.tcl	2 Feb 2018 00:05:53 -0000	1.9
@@ -7,10 +7,10 @@
     @cvs-id $Id$
 
 } {
-    package_key:notnull
+    package_key:token,notnull
     package_id:naturalnum,notnull
     instance_name:notnull
-    {return_url "."}
+    {return_url:localurl "."}
     params:array
 }
 
Index: openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/parameter-set.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.tcl	7 Aug 2017 23:47:58 -0000	1.13
+++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.tcl	2 Feb 2018 00:05:53 -0000	1.14
@@ -9,7 +9,7 @@
 } {
     package_id:naturalnum,notnull
     {orderby:token ""}
-    {return_url "."}
+    {return_url:localurl "."}
 }
 
 permission::require_permission -object_id $package_id -privilege admin
Index: openacs-4/packages/acs-subsite/www/shared/parameters.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/parameters.tcl,v
diff -u -N -r1.23 -r1.24
--- openacs-4/packages/acs-subsite/www/shared/parameters.tcl	1 Oct 2017 12:16:05 -0000	1.23
+++ openacs-4/packages/acs-subsite/www/shared/parameters.tcl	2 Feb 2018 00:05:53 -0000	1.24
@@ -6,7 +6,7 @@
     @cvs-id $Id$
 } {
     {package_id:naturalnum "[ad_conn package_id]"}
-    package_key:optional
+    package_key:token,optional
     {scope "instance"}
     {return_url:localurl,optional "[ad_conn url]?[ad_conn query]"}
     {section ""}