Index: openacs-4/packages/file-storage/file-storage.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/file-storage.info,v
diff -u -r1.56 -r1.57
--- openacs-4/packages/file-storage/file-storage.info	27 Apr 2015 15:28:20 -0000	1.56
+++ openacs-4/packages/file-storage/file-storage.info	27 Jun 2015 21:41:49 -0000	1.57
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="5.8.3a" url="http://openacs.org/repository/download/apm/file-storage-5.8.3a.apm">
+    <version name="5.9.0d1" url="http://openacs.org/repository/download/apm/file-storage-5.9.0d1.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Collaborative document storage</summary>
         <release-date>2013-09-08</release-date>
@@ -17,7 +17,7 @@
         <maturity>2</maturity>
         <package_instance_name>#file-storage.file-storage#</package_instance_name>
 
-        <provides url="file-storage" version="5.8.3a"/>
+        <provides url="file-storage" version="5.9.0d1"/>
 	<requires url="acs-kernel" version="5.8.1"/>
         <requires url="acs-content-repository" version="5.8.1"/>
         
Index: openacs-4/packages/file-storage/lib/folder-links.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/lib/folder-links.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/file-storage/lib/folder-links.tcl	27 Oct 2014 16:41:31 -0000	1.3
+++ openacs-4/packages/file-storage/lib/folder-links.tcl	27 Jun 2015 21:41:49 -0000	1.4
@@ -97,18 +97,18 @@
 	    }
 	    url {
 		set properties_link "properties"
-		set properties_url "${fs_url}simple?[export_vars {object_id return_url}]"
+		set properties_url [export_vars -base ${fs_url}simple {object_id return_url}]
 		set icon "/resources/acs-subsite/url-button.gif"
 		set file_url ${url}
 		set download_url $file_url
 	    }
 	    default {
 
 		set properties_link [_ file-storage.properties]
-		set properties_url "${fs_url}file?[export_vars {{file_id $object_id} return_url}]"
+		set properties_url [export_vars -base ${fs_url}file {{file_id $object_id} return_url}]
 		set icon "/resources/file-storage/file.gif"
 		set file_url "${base_url}${file_url}"
-		set download_url "${fs_url}download/?[export_vars {{file_id $object_id}}]"                
+		set download_url [export_vars -base ${fs_url}download {{file_id $object_id}}]
 	    }
 	}
 
Index: openacs-4/packages/file-storage/www/file-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-add.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/file-storage/www/file-add.tcl	12 Jun 2015 08:45:46 -0000	1.19
+++ openacs-4/packages/file-storage/www/file-add.tcl	27 Jun 2015 21:41:49 -0000	1.20
@@ -173,8 +173,8 @@
 	set upload_tmpfiles [list [template::util::file::get_property tmp_filename $upload_file]]
     }
     set mime_type ""
-    if { [empty_string_p [lindex $upload_files 0]]} {
-        if {[parameter::get -parameter AllowTextEdit -default 0] && [empty_string_p [template::util::richtext::get_property html_value $content_body]] } {
+    if { [lindex $upload_files 0] eq ""} {
+        if {[parameter::get -parameter AllowTextEdit -default 0] && [template::util::richtext::get_property html_value $content_body] eq "" } {
             ad_return_complaint 1 "You have to upload a file or create a new one"
             ad_script_abort
         }
@@ -281,7 +281,7 @@
     if {([info exists return_url] && $return_url ne "")} {
 	ad_returnredirect $return_url
     } else {
-	ad_returnredirect "./?[export_vars -url {folder_id}]"
+	ad_returnredirect [export_vars -base ./ {folder_id}]
     }
     ad_script_abort
 
Index: openacs-4/packages/file-storage/www/file.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file.tcl,v
diff -u -r1.34 -r1.35
--- openacs-4/packages/file-storage/www/file.tcl	12 Jun 2015 08:45:46 -0000	1.34
+++ openacs-4/packages/file-storage/www/file.tcl	27 Jun 2015 21:41:49 -0000	1.35
@@ -51,7 +51,7 @@
 set not_show_all_versions_p [expr {!$show_all_versions_p}]
 set show_versions_url [export_vars -base file {file_id {show_all_versions_p $not_show_all_versions_p}}]
 
-set return_url [ad_conn url]?[export_vars file_id]
+set return_url [export_vars -base [ad_conn url] file_id]
 
 set categories_p [parameter::get -parameter CategoriesP -package_id [ad_conn package_id] -default 0]
 if { $categories_p } {
@@ -60,14 +60,18 @@
     set rename_name [_ file-storage.Rename_File]
 }
 
-set actions [list "[_ file-storage.Upload_Revision]" file-add?[export_vars [list file_id return_url]] "Upload a new version of this file" \
-                 "$rename_name" file-edit?[export_vars file_id] "Rename file" \
-                 "[_ file-storage.Copy_File]" [export_vars -base copy {{object_id $file_id} return_url}] "Copy file" \
-                 "[_ file-storage.Move_File]" [export_vars -base move {{object_id $file_id} {return_url $folder_view_url}}] "Move file" \
-                 "[_ file-storage.Delete_File]" [export_vars -base delete {{object_id $file_id} {return_url $folder_view_url}}] "Delete file"]
+set actions [list \
+		 [_ file-storage.Upload_Revision] [export_vars -base file-add {file_id return_url}] "Upload a new version of this file" \
+                 $rename_name                 [export_vars -base file-edit file_id] "Rename file" \
+                 [_ file-storage.Copy_File]   [export_vars -base copy {{object_id $file_id} return_url}] "Copy file" \
+                 [_ file-storage.Move_File]   [export_vars -base move {{object_id $file_id} {return_url $folder_view_url}}] "Move file" \
+                 [_ file-storage.Delete_File] [export_vars -base delete {{object_id $file_id} {return_url $folder_view_url}}] "Delete file"]
 
 if {$delete_p == "t"} {
-    lappend actions [_ file-storage.Set_Permissions] [export_vars -base permissions {{object_id $file_id}}] [_ file-storage.lt_Modify_permissions_on]
+    lappend actions \
+	[_ file-storage.Set_Permissions] \
+	[export_vars -base permissions {{object_id $file_id}}] \
+	[_ file-storage.lt_Modify_permissions_on]
 }
 
 template::list::create \
@@ -121,7 +125,7 @@
         set version_url [export_vars -base "download/$title" {file_id}]
     }
     set version_delete [_ file-storage.Delete_Version]
-    set version_delete_url "version-delete?[export_vars version_id]"
+    set version_delete_url [export_vars -base version-delete version_id]
     set author_link [acs_community_member_link -user_id $author_id -label $author]
 }
 
Index: openacs-4/packages/file-storage/www/folder-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-add.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/file-storage/www/folder-add.tcl	12 Jun 2015 08:45:46 -0000	1.4
+++ openacs-4/packages/file-storage/www/folder-add.tcl	27 Jun 2015 21:41:49 -0000	1.5
@@ -26,7 +26,7 @@
 set user_id [ad_conn user_id]
 
 if {![acs_user::site_wide_admin_p]} {
-    ad_returnredirect "./?[export_vars -url {folder_id}]"
+    ad_returnredirect [export_vars -base ./ {folder_id}]
 }
 
 set package_id [ad_conn package_id]
@@ -58,7 +58,7 @@
 	lappend upload_tmpfiles $file
     }
     
-    if { [empty_string_p [lindex $upload_files 0]]} {
+    if { [lindex $upload_files 0] eq ""} {
 	ad_return_complaint 1 "You have to upload a file"
 	ad_script_abort
     }
@@ -140,7 +140,7 @@
     if {([info exists return_url] && $return_url ne "")} {
 	ad_returnredirect $return_url
     } else {
-	ad_returnredirect "./?[export_vars -url {folder_id}]"
+	ad_returnredirect [export_vars -base ./ {folder_id}]
     }
     ad_script_abort
     
Index: openacs-4/packages/file-storage/www/folder-zip-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-zip-add.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/file-storage/www/folder-zip-add.tcl	12 Jun 2015 08:45:46 -0000	1.6
+++ openacs-4/packages/file-storage/www/folder-zip-add.tcl	27 Jun 2015 21:41:49 -0000	1.7
@@ -118,7 +118,7 @@
         set upload_tmpfiles [list [template::util::file::get_property tmp_filename $upload_file]]
     }
     
-    if { [empty_string_p [lindex $upload_files 0]]} {
+    if { [lindex $upload_files 0] eq ""} {
         ad_return_complaint 1 "<li>You have to upload a file"
         ad_script_abort
     }
@@ -222,7 +222,7 @@
     if {([info exists return_url] && $return_url ne "")} {
 	ad_returnredirect $return_url
     } else {
-	ad_returnredirect "./?[export_vars -url {folder_id}]"
+	ad_returnredirect [export_vars -base ./ {folder_id}]
     }
     ad_script_abort
     
Index: openacs-4/packages/file-storage/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.tcl,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/file-storage/www/index.tcl	27 Oct 2014 16:41:33 -0000	1.31
+++ openacs-4/packages/file-storage/www/index.tcl	27 Jun 2015 21:41:49 -0000	1.32
@@ -8,7 +8,7 @@
 } {
     {folder_id:naturalnum,notnull [fs_get_root_folder]}
     {n_past_days:integer "99999"}
-    {orderby:optional}
+    {orderby:token,optional}
     {category_id:naturalnum ""}
     {return_url ""}
 } -validate {
Index: openacs-4/packages/file-storage/www/simple-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple-edit.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/file-storage/www/simple-edit.tcl	27 Oct 2014 16:41:34 -0000	1.11
+++ openacs-4/packages/file-storage/www/simple-edit.tcl	27 Jun 2015 21:41:49 -0000	1.12
@@ -38,7 +38,7 @@
 								       -container_object_id $package_id \
 								       -element_name category_id]
     }
-    ad_returnredirect "?[export_vars folder_id]"
+    ad_returnredirect [export_vars -base . folder_id]
 }
 
 set pretty_name "$name"
Index: openacs-4/packages/file-storage/www/version-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/version-delete.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/file-storage/www/version-delete.tcl	12 Jun 2015 08:45:46 -0000	1.14
+++ openacs-4/packages/file-storage/www/version-delete.tcl	27 Jun 2015 21:41:49 -0000	1.15
@@ -38,7 +38,7 @@
 set context [fs_context_bar_list -final [_ file-storage.Delete_Version] $item_id]
 
 set delete_message [_ file-storage.lt_Are_you_sure_that_you]
-ad_form -export version_id -cancel_url "file?[export_vars {{file_id $item_id}}]" -form {
+ad_form -export version_id -cancel_url [export_vars -base file {{file_id $item_id}}] -form {
     {delete_message:text(inform) {label $delete_message}}
 } -on_submit {