Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -N -r1.284.2.168 -r1.284.2.169
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	3 Aug 2021 18:58:47 -0000	1.284.2.168
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	7 Aug 2021 09:43:41 -0000	1.284.2.169
@@ -5725,9 +5725,7 @@
 
   Class create redirect -superclass text
   redirect instproc pretty_value {v} {
-    #ad_returnredirect -allow_complete_url $v
-    #ad_script_abort
-    return [[${:object} package_id] returnredirect $v]
+    return [[${:object} package_id] returnredirect [ad_urlencode_url $v]]
   }
 
   ###########################################################
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.332.2.86 -r1.332.2.87
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	30 May 2021 18:52:03 -0000	1.332.2.86
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	7 Aug 2021 09:43:42 -0000	1.332.2.87
@@ -2183,7 +2183,7 @@
                   -add_revision $add_revision]
 
     if {[info exists via_url] && [:exists_query_parameter "return_url"]} {
-      :returnredirect [:query_parameter "return_url" [:package_url]]
+      :returnredirect [:query_parameter "return_url" [ad_urlencode_folder_path ${:package_url}]]
     } else {
       return $page
     }
@@ -2686,7 +2686,7 @@
 
     set href [export_vars \
                   -base [site_node::get_package_url -package_key categories]cadmin/object-map {
-                    {ctx_id $object_id} {object_id}
+                    {ctx_id $object_id} object_id
                   }]
     :returnredirect $href
   }
@@ -2707,8 +2707,10 @@
 
     # flush could be made more precise in the future
     :flush_page_fragment_cache -scope agg
-    :returnredirect [site_node::get_package_url \
-                         -package_key categories]cadmin/tree-view?tree_id=$tree_id&ctx_id=$object_id&object_id=$object_id
+    :returnredirect [export_vars \
+                         -base [site_node::get_package_url -package_key categories]/cadmin/tree-view {
+                           tree_id {ctx_id $object_id} object_id
+                         }]
   }
 
 
@@ -2827,7 +2829,7 @@
     } else {
       :log "--D nothing to delete!"
     }
-    :returnredirect [:query_parameter "return_url" [${:id} package_url]]
+    :returnredirect [:query_parameter "return_url" [ad_urlencode_folder_path ${:package_url}]]
   }
 
   #
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -N -r1.368.2.95 -r1.368.2.96
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	2 Aug 2021 14:45:02 -0000	1.368.2.95
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	7 Aug 2021 09:43:42 -0000	1.368.2.96
@@ -67,7 +67,7 @@
       return OK
     } else {
       ns_log notice "HEADERS: no X-Requested-With"
-      ${:package_id} returnredirect [:query_parameter return_url:localurl [::xo::cc url]]
+      ${:package_id} returnredirect [:query_parameter return_url:localurl [ad_return_url]]
     }
   }
 
@@ -81,7 +81,7 @@
 
   } {
     ::xowiki::clipboard clear
-    ${:package_id} returnredirect [:query_parameter return_url:localurl [::xo::cc url]]
+    ${:package_id} returnredirect [:query_parameter return_url:localurl [ad_return_url]]
   }
 
   #
@@ -105,7 +105,7 @@
         }
       }
     }
-    ${:package_id} returnredirect [:query_parameter return_url:localurl [::xo::cc url]]
+    ${:package_id} returnredirect [:query_parameter return_url:localurl [ad_return_url]]
   }
 
   #
@@ -135,7 +135,7 @@
                  -parent_id $folder_id -objects $item_ids]
     util_user_message -html -message $msg
     ::xowiki::clipboard clear
-    ::${:package_id} returnredirect [:query_parameter return_url:localurl [::xo::cc url]]
+    ::${:package_id} returnredirect [:query_parameter return_url:localurl [ad_return_url]]
   }
 
   #
@@ -488,7 +488,7 @@
       :save
       #:msg "ok $msg"
     }
-    ::${:package_id} returnredirect [::xo::cc url]
+    ::${:package_id} returnredirect [ad_return_url]
   }
 
 
@@ -1524,7 +1524,7 @@
       return [:www-view [:include [list child-resources -publish_status all]]]
     }
     #:msg "method list undefined for this kind of object"
-    ${:package_id} returnredirect [::xo::cc url]
+    ${:package_id} returnredirect [ad_return_url]
   }
 
   #
@@ -1782,7 +1782,7 @@
         [:form_parameter new_tags]
 
     ::${:package_id} returnredirect \
-        [:query_parameter return_url:localurl [::${:package_id} url]]
+        [:query_parameter return_url:localurl [ad_return_url]]
   }
 
   #