Index: openacs-4/packages/xowiki/tcl/folder-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/folder-procs.tcl,v
diff -u -N -r1.31 -r1.32
--- openacs-4/packages/xowiki/tcl/folder-procs.tcl	7 Jun 2015 13:03:16 -0000	1.31
+++ openacs-4/packages/xowiki/tcl/folder-procs.tcl	8 Jun 2015 09:42:26 -0000	1.32
@@ -158,7 +158,9 @@
             #
             # reset the current_folder if necessary
             # 
-            if {$current_folder_id eq [$f parent_id]} {set current_folder_id [$l item_id]}
+            if {$current_folder_id eq [$f parent_id]} {
+              set current_folder_id [$l item_id]
+            }
             #
             # set the resolve_context
             #
@@ -191,6 +193,9 @@
     my get_parameters
 
     set page [my set __including_page]
+    if {[$page exists __link_source]} {
+      set page [$page set __link_source]
+    }
     set package_id [::xo::cc package_id]
     set with_links [$package_id get_parameter "MenuBarSymLinks" 0]
 
@@ -388,7 +393,6 @@
     foreach c $sub_folders {
 
       set label [$c title]
-      set object $c
       set folder_href [$c pretty_link]
 
       set is_current [expr {$current_folder_id eq [$c item_id]}]
@@ -467,6 +471,7 @@
       set current_folder [$current_folder parent_id]
       ::xo::db::CrClass get_instance_from_db -item_id $current_folder
     }
+
     if {![$current_folder istype ::xowiki::FormPage]} {
       # current folder has to be a FormPage
       set current_folder [$current_folder parent_id]
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.287 -r1.288
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	8 Jun 2015 07:39:17 -0000	1.287
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	8 Jun 2015 09:42:26 -0000	1.288
@@ -805,7 +805,10 @@
         if {$deref} {
           set target [$page_or_package get_target_from_link_page]
           #my log "delegate $method from $page_or_package [$page_or_package name] to $target [$target name]"
-          if {$target ne ""} {set page_or_package $target}
+          if {$target ne ""} {
+            $target set __link_source $page_or_package
+            set page_or_package $target
+          }
         }
       }
       if {[$page_or_package procsearch $method] eq ""} {