Index: openacs-4/packages/acs-subsite/www/admin/applications/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/index-postgresql.xql,v
diff -u -N -r1.2.18.1 -r1.2.18.2
--- openacs-4/packages/acs-subsite/www/admin/applications/index-postgresql.xql	28 Aug 2015 08:13:51 -0000	1.2.18.1
+++ openacs-4/packages/acs-subsite/www/admin/applications/index-postgresql.xql	27 Apr 2017 15:55:19 -0000	1.2.18.2
@@ -10,9 +10,18 @@
     from   site_nodes n,
            site_nodes np,
            apm_packages p
+	   left outer join lang_messages m
+	     on m.locale = :locale and
+  	        '#' || m.package_key || '.' || m.message_key || '#' = p.instance_name
+           left outer join lang_messages md
+	     on m.locale = 'en_US' and
+  	        '#' || md.package_key || '.' || md.message_key || '#' = p.instance_name,
+	   apm_package_types pt
     where  np.node_id = :subsite_node_id
     and    n.tree_sortkey between np.tree_sortkey and tree_right(np.tree_sortkey)
     and    p.package_id = n.object_id
+    and    pt.package_key = p.package_key
+    [template::list::filter_where_clauses -and -name applications]
     order  by n.tree_sortkey
 
       </querytext>
@@ -27,7 +36,8 @@
            p.instance_name,
            tree_level(n.tree_sortkey) - tree_level(np.tree_sortkey) as treelevel,
            pt.pretty_name as package_pretty_name,
-           (select count(*) from apm_parameters par where par.package_key = pt.package_key) as num_parameters
+           exists (select 1 from apm_parameters
+	            where package_key = pt.package_key) as parameters_p
     from   site_nodes n,
            site_nodes np,
            apm_packages p,
@@ -37,7 +47,6 @@
     and    p.package_id = n.object_id
     and    pt.package_key = p.package_key
     and [template::list::page_where_clause -name applications -key n.node_id]
-    [template::list::filter_where_clauses -and -name applications]
     order  by n.tree_sortkey
 
       </querytext>