Index: openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl,v
diff -u -N -r1.55 -r1.56
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	9 May 2018 15:33:28 -0000	1.55
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	14 Jun 2018 12:56:48 -0000	1.56
@@ -387,9 +387,10 @@
     @author Oumi Mehrotra (oumi@arsdigita.com)
     @creation-date 2000-02-07
 } {
-
-    return [db_string sub_type_exists_p {}]
-
+    return [db_string sub_type_exists_p {
+        select exists (select 1 from acs_object_types 
+                              where supertype = :object_type) from dual
+    }]
 }
 
 
@@ -1122,8 +1123,15 @@
 ad_proc -public subsite::get_application_options {} {
     Gets options list for applications to install
 } {
-    set subsite_package_keys [join '[subsite::package_keys]' ","]
-    return [db_list_of_lists package_types {}]
+    return [db_list_of_lists package_types {
+        select pretty_name, package_key
+        from   apm_package_types t
+        where  not (singleton_p and exists (select 1 from apm_packages
+                                            where package_key = t.package_key))
+        and    implements_subsite_p = 'f'
+        and    package_type = 'apm_application'
+        order  by upper(pretty_name)
+    }]
 }
 
 ad_proc -private subsite::assert_user_may_add_member {} {