Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v
diff -u -r1.87 -r1.88
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	14 Mar 2007 09:55:12 -0000	1.87
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	5 Jun 2007 09:01:15 -0000	1.88
@@ -1451,6 +1451,11 @@
     # Other hostnames map to subsites.
     set node_id [util_memoize [list rp_lookup_node_from_host $host]]
 
+    if {[empty_string_p $node_id]} {
+        set host [regsub "www\." $host ""]
+        set node_id [rp_lookup_node_from_host $host]
+    }
+
     if { $node_id ne "" } {
 	set url [site_node::get_url -node_id $node_id]
 
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.73 -r1.74
--- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	29 May 2007 15:29:15 -0000	1.73
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	5 Jun 2007 09:01:15 -0000	1.74
@@ -261,9 +261,9 @@
     if { $root_node_id ne "" } {
         site_node::update_cache -node_id $root_node_id
     }
-    
+
     # Update the cache for the acs-* nodes
-    db_foreach acs_nodes {select node_id from site_nodes where name like 'acs-%'} {
+    db_foreach acs_nodes {select node_id from site_nodes s, apm_packages where parent_id = '502' and s.object_id = package_id and package_key != 'acs-subsite'} {
 	    site_node::update_cache -node_id $node_id -sync_children
     }
 }