Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.200.2.31 -r1.200.2.32
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	2 May 2017 13:51:25 -0000	1.200.2.31
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	3 May 2017 07:12:52 -0000	1.200.2.32
@@ -4013,7 +4013,7 @@
     }
     #my log "queries done"
     if {[info exists wf]} {
-      set wf_link [$package_id pretty_link -parent_id $parent_id $wf]
+      set wf_link [$package_id pretty_link -parent_id $parent_id -path_encode false $wf]
     }
 
     foreach p [$items children] {
@@ -4026,7 +4026,7 @@
       set page_link [$p pretty_link]
 
       if {[info exists wf]} {
-        set view_link [export_vars -no_base_encode -base $wf_link {{m create-or-use} {p.form "[$p name]"}}]
+        set view_link [export_vars -base $wf_link {{m create-or-use} {p.form "[$p name]"}}]
       } else {
         set view_link $page_link
       }