diff --git a/browser/add.pt b/browser/add.pt
index ab14bbd..7649331 100644
--- a/browser/add.pt
+++ b/browser/add.pt
@@ -5,7 +5,7 @@
 
   <div metal:define-macro="addform">
 
-    <form action="." tal:attributes="action view/requestUrl"
+    <form action="." tal:attributes="action request/URL"
           method="post" enctype="multipart/form-data">
 
       <div metal:define-macro="formbody">
diff --git a/browser/contents.pt b/browser/contents.pt
index 9cab0c9..5746ef2 100644
--- a/browser/contents.pt
+++ b/browser/contents.pt
@@ -15,7 +15,7 @@
     <tal:checkmove define="dummy view/checkMoveAction">
 
     <form name="contents" method="post" action="."
-          tal:attributes="action view/requestUrl"
+          tal:attributes="action request/URL"
           tal:define="container_contents view/listContentInfo">
       <metal:keep-batch define-macro="keep_batch_params">
         <tal:param repeat="param python:('b_page', 'b_size', 'b_overlap', 'b_orphan')">
diff --git a/browser/dataform.pt b/browser/dataform.pt
index df32d86..bcddfda 100644
--- a/browser/dataform.pt
+++ b/browser/dataform.pt
@@ -26,7 +26,7 @@
 <div metal:define-macro="content">
 
 <form action="." metal:define-macro="master"
-      tal:attributes="action view/requestUrl" method="post"
+      tal:attributes="action request/URL" method="post"
       class="edit-form" enctype="multipart/form-data"
       id="zc.page.browser_form">
 
diff --git a/browser/edit.pt b/browser/edit.pt
index 1b569ad..de78163 100644
--- a/browser/edit.pt
+++ b/browser/edit.pt
@@ -17,7 +17,7 @@
   <div metal:fill-slot="body">
   <div metal:define-macro="body">
 
-    <form action="." tal:attributes="action view/requestUrl" method="post"
+    <form action="." tal:attributes="action request/URL" method="post"
           enctype="multipart/form-data">
 
       <input type="hidden" name="form_submitted" value="true" />
diff --git a/browser/exportimport.pt b/browser/exportimport.pt
index 5c57572..4a74cc3 100644
--- a/browser/exportimport.pt
+++ b/browser/exportimport.pt
@@ -19,7 +19,7 @@
     </div>
 
     <form action="." method="post"
-          tal:attributes="action string:${view/requestUrl/-1}/export_nodes.html">
+          tal:attributes="action string:${request/URL/-1}/export_nodes.html">
       <input type="hidden" name="loops.action" value="export" />
       <div>&nbsp;</div>
       <h4>Export Nodes</h4>
@@ -32,7 +32,7 @@
     </form>
     
     <form action="." method="post" enctype="multipart/form-data"
-          tal:attributes="action view/requestUrl">
+          tal:attributes="action request/URL">
       <input type="hidden" name="loops.action" value="upload" />
       <div>&nbsp;</div>
       <h4>Import Nodes</h4>
diff --git a/browser/pageform.pt b/browser/pageform.pt
index 58e38bf..7071439 100644
--- a/browser/pageform.pt
+++ b/browser/pageform.pt
@@ -9,7 +9,7 @@
 <div metal:define-macro="form">
 
 <form action="." metal:define-macro="master"
-      tal:attributes="action view/requestUrl" method="post"
+      tal:attributes="action request/URL" method="post"
       class="edit-form" enctype="multipart/form-data"
       id="zc.page.browser_form">
 
diff --git a/external/exportimport.pt b/external/exportimport.pt
index 2f7c456..d739389 100644
--- a/external/exportimport.pt
+++ b/external/exportimport.pt
@@ -19,7 +19,7 @@
     </div>
 
     <form action="." method="post"
-          tal:attributes="action string:${view/requestUrl/-1}/export_loops.html">
+          tal:attributes="action string:${request/URL/-1}/export_loops.html">
       <input type="hidden" name="loops.action" value="export" />
       <div>&nbsp;</div>
       <h4>Export Site</h4>
@@ -93,7 +93,7 @@
     </form>
 
     <form action="." method="post" enctype="multipart/form-data"
-          tal:attributes="action view/requestUrl">
+          tal:attributes="action request/URL">
       <input type="hidden" name="loops.action" value="upload" />
       <div>&nbsp;</div>
       <h4>Import Site</h4>
diff --git a/organize/tracking/edit_track.pt b/organize/tracking/edit_track.pt
index 7e60e57..5ec535e 100644
--- a/organize/tracking/edit_track.pt
+++ b/organize/tracking/edit_track.pt
@@ -4,7 +4,7 @@
 <body>
 
 <div metal:fill-slot="body">
-  <form action="." tal:attributes="action view/requestUrl" method="post">
+  <form action="." tal:attributes="action request/URL" method="post">
     <input type="hidden" name="form_submitted" value="true" />
     <h1>Edit Track <span tal:content="view/id" /></h1>
     <div class="row">