Index: openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl	21 Oct 2018 17:36:23 -0000	1.16
+++ openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl	21 Oct 2018 17:50:09 -0000	1.17
@@ -180,7 +180,7 @@
     rename_url delete_url parameters_url permissions_url extra_form_part view_p
 set open_nodes [list]
 
-db_foreach nodes_select {} {
+db_foreach dbqd.acs-subsite.www.admin.site-map.site-map.nodes_select {} {
     set add_folder_url ""
     set new_app_url ""
     set unmount_url ""
Index: openacs-4/packages/acs-subsite/www/site-map/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/site-map/index.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/acs-subsite/www/site-map/index.tcl	9 May 2018 15:33:28 -0000	1.12
+++ openacs-4/packages/acs-subsite/www/site-map/index.tcl	21 Oct 2018 17:50:09 -0000	1.13
@@ -41,27 +41,6 @@
 
 set user_id [ad_conn user_id]
 
-db_foreach path_select {} {
-    if {$node_id != $root_id && $admin_p == "t"} {
-        append head "<a href=\"[export_vars -base . {expand:multiple {root_id $node_id}}]\">"
-    }
-    if {$name eq ""} {
-	append head "$obj_name:"
-    } else {
-	append head $name
-    }
-    
-    if {$node_id != $root_id && $admin_p == "t"} {
-	append head "</a>"
-    }
-    
-    if {$directory_p == "t"} {
-	append head "/"
-    }
-} if_no_rows {
-    append head "&nbsp;"
-}
-
 if {[llength $expand] == 0} {
     lappend expand $root_id 
     if { $parent_id ne "" } {
@@ -127,9 +106,13 @@
         }
     }
 
-multirow create nodes node_id expand_mode expand_url tree_indent name name_url instance instance_url type action_type action_form_part add_folder_url new_app_url unmount_url mount_url rename_url delete_url parameters_url permissions_url extra_form_part view_p
+multirow create nodes \
+    node_id expand_mode expand_url tree_indent name name_url instance instance_url \
+    type action_type action_form_part add_folder_url new_app_url unmount_url mount_url \
+    rename_url delete_url parameters_url permissions_url extra_form_part view_p
 set open_nodes [list]
 
+# dbqd.acs-subsite.www.admin.site-map.site-map.nodes_select
 db_foreach nodes_select {} {
     set add_folder_url ""
     set new_app_url ""
@@ -140,7 +123,12 @@
     set parameters_url ""
     set permissions_url ""
 
-    if { $parent_id ni $open_nodes && $parent_id ne "" && $mylevel > 2 } { continue } 
+    if {$parent_id ni $open_nodes
+        && $parent_id ne ""
+        && $mylevel > 2
+    } {
+        continue
+    }
         
     if {$directory_p == "t"} {
 	set add_folder_url [export_vars -base . {expand:multiple root_id node_id {new_parent $node_id} {new_type folder}}]