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.6 -r1.69.2.7
--- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	8 Jun 2017 16:42:26 -0000	1.69.2.6
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	21 Jun 2017 21:09:45 -0000	1.69.2.7
@@ -22,10 +22,7 @@
 } {
     Returns the name of a folder. 
 } {
-    return [db_exec_plsql folder_name "
-    begin
-        :1 := file_storage.get_folder_name(:folder_id);
-    end;"]
+    return [db_string folder_name {}]
 }
 
 #
@@ -1488,7 +1485,8 @@
 } { 
     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"
+    set fs_package_url [lindex [site_node::get_url_from_object_id -object_id $package_id] 0]
+    return "[ad_url]${fs_package_url}index?folder_id=$folder_id"
 }
 
 ad_proc -public fs::file_copy {
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.3 -r1.20.10.4
--- openacs-4/packages/file-storage/tcl/file-storage-procs.xql	24 May 2017 18:49:21 -0000	1.20.10.3
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.xql	21 Jun 2017 21:09:45 -0000	1.20.10.4
@@ -224,12 +224,4 @@
          </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>