Index: openacs-4/packages/acs-subsite/www/permissions/revoke-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/Attic/revoke-oracle.xql,v
diff -u -N
--- openacs-4/packages/acs-subsite/www/permissions/revoke-oracle.xql	30 Apr 2001 22:02:48 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
-
-<fullquery name="name">      
-      <querytext>
-      select acs_object.name(:object_id)
-from dual
-      </querytext>
-</fullquery>
-
- 
-<fullquery name="party_name">      
-      <querytext>
-      select acs_object.name(:party_id) from dual
-      </querytext>
-</fullquery>
-
- 
-</queryset>
Index: openacs-4/packages/acs-subsite/www/permissions/revoke-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/Attic/revoke-postgresql.xql,v
diff -u -N
--- openacs-4/packages/acs-subsite/www/permissions/revoke-postgresql.xql	30 Apr 2001 22:02:48 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-   <rdbms><type>postgresql</type><version>7.1</version></rdbms>
-
-<fullquery name="name">      
-      <querytext>
-      select acs_object__name(:object_id)
-
-      </querytext>
-</fullquery>
-
- 
-<fullquery name="party_name">      
-      <querytext>
-      select acs_object__name(:party_id) 
-      </querytext>
-</fullquery>
-
- 
-</queryset>
Index: openacs-4/packages/acs-subsite/www/permissions/revoke.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/revoke.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/permissions/revoke.tcl	23 Apr 2018 21:32:46 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/permissions/revoke.tcl	20 Jun 2018 10:05:53 -0000	1.9
@@ -26,14 +26,14 @@
 
     <hr>
     Are you sure you want to remove the following entries from the access
-    control list of [db_string name {}]?
+    control list of [acs_object_name $object_id]?
     <ul>
 }]
 
 foreach item $revoke_list {
     lassign $item party_id privilege
     append body [subst {
-        <li>[db_string party_name {}]</li>
+        <li>[party::name -party_id $party_id]</li>
     }]
 }
 
Index: openacs-4/packages/acs-admin/lib/service-parameters-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/Attic/service-parameters-oracle.xql,v
diff -u -N
--- openacs-4/packages/acs-admin/lib/service-parameters-oracle.xql	7 Aug 2017 23:47:45 -0000	1.6
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
-
-    <fullquery name="services_select">
-        <querytext>
-                    select package_id,
-                           ap.package_key,
-                           --acs_object.name(package_id) as instance_name,
-			   pretty_name as instance_name,
-                           apm_package_type.num_parameters(ap.package_key) as parameter_count
-                    from apm_packages ap,
-                         apm_package_types
-                    where ap.package_key = apm_package_types.package_key
-                    and package_type = 'apm_service'
-                    and   (ap.package_key != 'acs-subsite')
-                    order by instance_name
-        </querytext>
-    </fullquery>
-
-</queryset>
Index: openacs-4/packages/acs-admin/lib/service-parameters-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/Attic/service-parameters-postgresql.xql,v
diff -u -N
--- openacs-4/packages/acs-admin/lib/service-parameters-postgresql.xql	7 Aug 2017 23:47:45 -0000	1.6
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-
-<queryset>
-    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
-
-    <fullquery name="services_select">
-        <querytext>
-                    select package_id,
-                           ap.package_key,
-                           -- acs_object__name(package_id) as instance_name,
-			   pretty_name as instance_name,
-                           apm_package_type__num_parameters(ap.package_key) as parameter_count
-                    from apm_packages ap,
-                         apm_package_types
-                    where ap.package_key = apm_package_types.package_key
-                    and package_type = 'apm_service'
-                    and   (ap.package_key != 'acs-subsite')
-                    order by instance_name
-        </querytext>
-    </fullquery>
-
-</queryset>
Index: openacs-4/packages/acs-admin/lib/service-parameters.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/lib/service-parameters.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-admin/lib/service-parameters.tcl	7 Aug 2017 23:47:45 -0000	1.8
+++ openacs-4/packages/acs-admin/lib/service-parameters.tcl	20 Jun 2018 10:14:03 -0000	1.9
@@ -11,7 +11,19 @@
 
 set user_id [ad_conn user_id]
 set swadmin_p 0
-db_multirow -extend { url admin_url param_url sitewide_admin_url} packages services_select {} {
+db_multirow -extend { url admin_url param_url sitewide_admin_url} packages services_select {
+    select package_id,
+           ap.package_key,
+           pretty_name as instance_name,
+           (select count(*) from apm_parameters
+             where package_key = ap.package_key) as parameter_count
+    from apm_packages ap,
+         apm_package_types
+    where ap.package_key = apm_package_types.package_key
+    and package_type = 'apm_service'
+    and ap.package_key <> 'acs-subsite'
+    order by instance_name
+} {
     set root_dir [acs_package_root_dir $package_key]
     set sitewide_admin_url ""
     if { [file exists $root_dir/www/] } {