Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -N -r1.291.2.15 -r1.291.2.16
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	9 Feb 2016 11:06:35 -0000	1.291.2.15
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	21 Mar 2016 09:50:35 -0000	1.291.2.16
@@ -451,12 +451,13 @@
     } else {
       set encoded_name [::xowiki::utility urlencode $name]
     }
-    
+
     if {$parent_id eq -100} {
       # In case, we have a cr-toplevel entry, we assume, we can
       # resolve it at lease against the root folder of the current
       # package.
       set folder ""
+      set encoded_name ""
     } else {
       if {$parent_id eq ""} {
         ns_log notice "pretty_link of $name: you should consider to pass a parent_id to support folders"
@@ -996,7 +997,8 @@
       # We have no object, but as well no method callable on the
       # package If the method is "view", allow it to be called on the
       # root folder object.
-      if {[my query_parameter m] eq "list"} {
+      set m [my query_parameter m]
+      if {$m in {list show-object file-upload}} {
         my instvar folder_id
         array set "" [list \
                           name [$folder_id name] \