diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml
index ed4688c38fe88510ec7e980ddb3ec25ff86a3fd2..5486f45aaddd4b65ac35192166cc0e992e313936 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml
@@ -93,7 +93,7 @@ print "#### Indexing categories ####"\n
 folder_tag = \'module\'\n
 folder_after_tag = (\'person_stage_1\', \'group_person_stage_1\')\n
 object_tag = \'category\'\n
-object_after_tag = (\'module\', \'person_stage_1\', \'group_person_stage_1\')\n
+object_after_tag = folder_after_tag\n
 \n
 context.portal_categories.activate(\n
                   tag=folder_tag,\n
@@ -108,9 +108,9 @@ context.portal_categories.activate(\n
 print "#### Indexing alarms ####"\n
 print "#### Indexing preferences ####"\n
 folder_tag = \'module\'\n
-folder_after_tag = (\'person_stage_1\', \'group_person_stage_1\')\n
+folder_after_tag = (\'category\', \'person_stage_1\', \'group_person_stage_1\')\n
 object_tag = \'document\'\n
-object_after_tag = (\'module\', \'category\', \'person_stage_1\', \'group_person_stage_1\')\n
+object_after_tag = folder_after_tag\n
 object_priority = 2\n
 for folder in [context.portal_alarms, context.portal_preferences]:\n
   folder.activate(\n
@@ -128,9 +128,9 @@ for folder in [context.portal_alarms, context.portal_preferences]:\n
 # (ie. related quantity)\n
 print "#### Indexing simulation ####"\n
 folder_tag = \'module\'\n
-folder_after_tag = (\'person_stage_1\', \'group_person_stage_1\')\n
+folder_after_tag = (\'category\', \'document\', \'person_stage_1\', \'group_person_stage_1\')\n
 object_tag = \'simulation\'\n
-object_after_tag = (\'module\', \'category\', \'person_stage_1\', \'document\', \'group_person_stage_1\')\n
+object_after_tag = folder_after_tag\n
 object_priority = 3\n
 context.portal_simulation.activate(\n
                   tag=folder_tag,\n
@@ -156,9 +156,9 @@ print "#### Indexing delivery builders ####"\n
 print "#### Indexing order builders ####"\n
 \n
 folder_tag = \'module\'\n
-folder_after_tag = (\'person_stage_1\', \'group_person_stage_1\')\n
+folder_after_tag = (\'category\', \'person_stage_1\', \'group_person_stage_1\')\n
 object_tag = \'document\'\n
-object_after_tag = (\'module\', \'category\', \'person_stage_1\', \'group_person_stage_1\')\n
+object_after_tag = folder_after_tag\n
 object_priority = 2\n
 for folder in [context.portal_templates, context.portal_trash,\n
                context.portal_domains, context.portal_rules,\n
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 55f04f2ae2c5d17c6b2a2616018b96f869677221..25417dad5587609021599a8b8631c25059c0065c 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-365
\ No newline at end of file
+368
\ No newline at end of file