Index: openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql,v
diff -u -N -r1.35.4.2 -r1.35.4.3
--- openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql	3 Jul 2016 18:27:32 -0000	1.35.4.2
+++ openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql	24 May 2017 18:49:21 -0000	1.35.4.3
@@ -242,20 +242,6 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="fs::notification::get_url.select_fs_package_url">
-    <querytext>
-      select site_node.url(node_id) 
-      from site_nodes
-      where object_id = (select r.package_id
-	from fs_root_folders r,
-	     (select item_id as folder_id
-              from cr_items
-              connect by prior parent_id = item_id 
-              start with item_id = :folder_id) t
-        where r.folder_id = t.folder_id)
-    </querytext>
-  </fullquery>
-
     <fullquery name="fs::get_object_prettyname.select_object_prettyname">
         <querytext>
             select nvl(title,name) as prettyname
Index: openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql,v
diff -u -N -r1.46.4.2 -r1.46.4.3
--- openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql	3 Jul 2016 18:27:32 -0000	1.46.4.2
+++ openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql	24 May 2017 18:49:21 -0000	1.46.4.3
@@ -237,23 +237,6 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="fs::notification::get_url.select_fs_package_url">
-    <querytext>
-      select site_node__url(node_id) 
-      from site_nodes
-      where object_id = (select package_id
-         from fs_root_folders r,
-             (select parent.item_id as folder_id
-               from cr_items parent,
-                   cr_items children
-              where children.item_id = :folder_id
-               and children.tree_sortkey
-                between parent.tree_sortkey
-                and tree_right(parent.tree_sortkey)) t
-      where r.folder_id = t.folder_id)
-    </querytext>
-  </fullquery>
-
   <fullquery name="fs::add_created_version.new_file_revision">
     <querytext>
 	select content_revision__new (
Index: openacs-4/packages/file-storage/tcl/file-storage-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs.tcl,v
diff -u -N -r1.69.2.4 -r1.69.2.5
--- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	21 Apr 2017 20:04:34 -0000	1.69.2.4
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	24 May 2017 18:49:21 -0000	1.69.2.5
@@ -1471,6 +1471,7 @@
     @creation-date 2005-02-28
 } { 
     set folder_id $object_id
+    set package_id [lindex [fs::get_folder_package_and_root $folder_id] 0]
     return "[ad_url][db_string select_fs_package_url {}]index?folder_id=$folder_id"
 }
 
Index: openacs-4/packages/file-storage/tcl/file-storage-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs.xql,v
diff -u -N -r1.20.10.2 -r1.20.10.3
--- openacs-4/packages/file-storage/tcl/file-storage-procs.xql	3 Jul 2016 18:27:32 -0000	1.20.10.2
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.xql	24 May 2017 18:49:21 -0000	1.20.10.3
@@ -224,4 +224,12 @@
          </querytext>
    </fullquery>
 
+   <fullquery name="fs::notification::get_url.select_fs_package_url">
+    <querytext>
+      select site_node__url(node_id) 
+      from site_nodes
+      where object_id = :package_id
+    </querytext>
+  </fullquery>
+
 </queryset>