diff --git a/browser/target_macros.pt b/browser/target_macros.pt
index ced513a..dce40c0 100644
--- a/browser/target_macros.pt
+++ b/browser/target_macros.pt
@@ -45,17 +45,16 @@
                                 checked python: targetToken == token" />
                 </td>
                 <td>
-                  <a href="#"
-                     tal:omit-tag="not:nocall:item"
+                  <a tal:omit-tag="not:nocall:item"
                      tal:content="title"
+                     tal:define="baseUrl item/url|string:"
                      tal:attributes="href
-                        string:${item/url|nothing}/@@SelectedManagementView.html">
+                        string:$baseUrl/@@SelectedManagementView.html">
                     Title
                   </a>
                 </td>
                 <td>
                   <a tal:condition="type"
-                     href="#"
                      tal:attributes="href
                         string:${item/typeUrl}/@@SelectedManagementView.html"
                      tal:omit-tag="not:item/typeUrl">
diff --git a/organize/stateful/view_macros.pt b/organize/stateful/view_macros.pt
index e89c2e3..6fcf28d 100755
--- a/organize/stateful/view_macros.pt
+++ b/organize/stateful/view_macros.pt
@@ -89,7 +89,8 @@
           <li tal:repeat="action stf/getAvailableTransitionsForUser">
             <a i18n:translate=""
                tal:define="baseUrl view/virtualTargetUrl;
-                           url string:$baseUrl/${stf/formUrl|string:change_state.html}?action=${action/name}&stdef=${stf/statesDefinition}"
+                           formName stf/formUrl|string:change_state.html;
+                           url string:$baseUrl/$formName?action=${action/name}&stdef=${stf/statesDefinition}"
                tal:attributes="href url;
                                onClick string:objectDialog('change_state', '$url');;
                                               return false;"