Index: openacs-4/packages/acs-subsite/tcl/subsite-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs-oracle.xql,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-subsite/tcl/subsite-procs-oracle.xql	14 Jun 2018 12:56:48 -0000	1.11
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs-oracle.xql	28 Nov 2018 16:31:02 -0000	1.12
@@ -20,19 +20,6 @@
       </querytext>
 </fullquery>
 
- 
-<fullquery name="subsite::auto_mount_application.select_package_object_names">      
-      <querytext>
-      
-	    select t.pretty_name as package_name, acs_object.name(s.object_id) as object_name
-	      from site_nodes s, apm_package_types t
-	     where s.node_id = :node_id
-	       and t.package_key = :package_key
-	
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="subsite::util::object_type_path_list.select_object_type_path">      
       <querytext>
       
Index: openacs-4/packages/acs-subsite/tcl/subsite-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/subsite-procs-postgresql.xql,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-subsite/tcl/subsite-procs-postgresql.xql	14 Jun 2018 12:56:48 -0000	1.13
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs-postgresql.xql	28 Nov 2018 16:31:02 -0000	1.14
@@ -21,19 +21,6 @@
       </querytext>
 </fullquery>
 
- 
-<fullquery name="subsite::auto_mount_application.select_package_object_names">      
-      <querytext>
-      
-	    select t.pretty_name as package_name, acs_object__name(s.object_id) as object_name
-	      from site_nodes s, apm_package_types t
-	     where s.node_id = :node_id
-	       and t.package_key = :package_key
-	
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="subsite::util::object_type_path_list.select_object_type_path">      
       <querytext>
 
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 -r1.60 -r1.61
--- openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	28 Nov 2018 16:02:40 -0000	1.60
+++ openacs-4/packages/acs-subsite/tcl/subsite-procs.tcl	28 Nov 2018 16:31:02 -0000	1.61
@@ -261,7 +261,12 @@
 
     if { $pretty_name eq "" } {
         # Get the name of the object mounted at this node
-        db_1row select_package_object_names {}
+        set package_name [db_string get_package_name {
+            select pretty_name from apm_package_types
+            where package_key = :package_key
+        }]
+        set node [site_node::get_from_node_id -node_id $node_id]
+        set object_name [acs_object_name [dict get $node object_id]]
         set pretty_name "$object_name $package_name"
         if { $ctr > 2 } {
             # This was a duplicate pkg name... append the ctr used in the instance name