diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/answered.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/answered.xml
index 8acc2c1c8d4c93991318034d95bc01348dea3ef0..19c6decb5cbaf3a91251f790f6ba0001e479bd8c 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/answered.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/answered.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -54,17 +51,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -83,7 +77,9 @@
                 <item>
                     <key> <string>Modify portal content</string> </key>
                     <value>
-                      <tuple/>
+                      <tuple>
+                        <string>Manager</string>
+                      </tuple>
                     </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/cancelled.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/cancelled.xml
index f832340267cc83cd3ad08ff71db165733123e7c9..aa6ecc1201d6cbc1ef118819f230b962e84dd02a 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/cancelled.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/states/cancelled.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -54,17 +51,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -83,7 +77,9 @@
                 <item>
                     <key> <string>Modify portal content</string> </key>
                     <value>
-                      <tuple/>
+                      <tuple>
+                        <string>Manager</string>
+                      </tuple>
                     </value>
                 </item>
                 <item>
diff --git a/bt5/erp5_base/bt/change_log b/bt5/erp5_base/bt/change_log
index 2b8a0ecff2307f710742fbd1c81ae3dd2d958f3d..b7639e7fe8dd459c426e0315982d2d3c85424cac 100644
--- a/bt5/erp5_base/bt/change_log
+++ b/bt5/erp5_base/bt/change_log
@@ -1,5 +1,6 @@
 2008-06-03 vincentd
-* add security to manager in the assignment_workflow for Close and Open state
+* add security to manager in the assignment_workflow for Close and Open states
+and query_workflow for Cancelled and Answered states
 
 2008-04-21 jerome
 * Fix default images on Person and Organisation (for virtual hosting)
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index 194ba8cc7594b96181da7c25c73002be08d56ff5..059361f2464e150ad36f1317b66db501364219e1 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-320
\ No newline at end of file
+317
\ No newline at end of file