Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl,v
diff -u -r1.138 -r1.139
--- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	23 Nov 2018 10:13:15 -0000	1.138
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	28 Nov 2018 22:43:12 -0000	1.139
@@ -377,11 +377,12 @@
     nsv_array reset site_node_url_by_object_id [list]
     nsv_array reset site_node_url_by_package_key [list]
 
-    set root_node_id [db_string get_root_node_id {} -default {}]
-    if { $root_node_id ne "" } {
-        set url [site_node::get_url -node_id $root_node_id]
-        set node_object_id [dict get [site_node::get -node_id $node_node_id] object_id]
-        update_cache -sync_children -node_id $root_node_id -url $url -object_id $node_object_id
+    if {[db_0or1row get_root_node {
+        select node_id, object_id
+        from site_nodes
+        where parent_id is null
+    }]} {
+        update_cache -sync_children -node_id $node_id -url "/" -object_id $object_id
     }
 }
 
Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.xql,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.xql	6 Oct 2018 09:28:38 -0000	1.15
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.xql	28 Nov 2018 22:43:12 -0000	1.16
@@ -50,12 +50,4 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="site_node::init_cache.get_root_node_id">
-        <querytext>
-            select node_id
-            from site_nodes
-            where parent_id is null
-        </querytext>
-    </fullquery>
-
 </queryset>