diff --git a/product/ERP5Catalog/sql/erp5_mysql/properties.xml b/product/ERP5Catalog/sql/erp5_mysql/properties.xml
index 39b879e2d8dbf8406cde3d5dd86401ebdd21d807..444db8491f69374fad356bd848ae44e5b09a62ce 100755
--- a/product/ERP5Catalog/sql/erp5_mysql/properties.xml
+++ b/product/ERP5Catalog/sql/erp5_mysql/properties.xml
@@ -39,9 +39,24 @@
   <property id="sql_catalog_related_keys" type="tuple">
     <item type="str">allowedRolesAndUsers | roles_and_users/allowedRolesAndUsers/z_related_security</item>
     <item type="str">base_category_id | category,catalog/id/z_related_base_category_id</item>
-    <item type="str">default_destination_section_title | category,catalog/title/z_related_default_destination</item>
     <item type="str">deliveryLineType | movement,catalog/portal_type/z_related_uid_or_parent_uid</item>
-    <item type="str">destination_section_title | category,catalog/title/z_related_default_destination</item>
+    <item type="str">destination_section_id | category,catalog/id/z_related_default_destination_section</item>
+    <item type="str">default_destination_section_id | category,catalog/id/z_related_default_destination_section</item>
+    <item type="str">source_id | category,catalog/id/z_related_default_source</item>
+    <item type="str">default_source_id | category,catalog/id/z_related_default_source</item>
+    <item type="str">destination_id | category,catalog/id/z_related_default_destination</item>
+    <item type="str">default_destination_id | category,catalog/id/z_related_default_destination</item>
+
+    <item type="str">source_section_id | category,catalog/id/z_related_default_source_section</item>
+    <item type="str">default_source_section_id | category,catalog/id/z_related_default_source_section</item>
+    <item type="str">destination_section_title | category,catalog/title/z_related_default_destination_section</item>
+    <item type="str">default_destination_section_title | category,catalog/title/z_related_default_destination_section</item>
+    <item type="str">source_title | category,catalog/title/z_related_default_source</item>
+    <item type="str">default_source_title | category,catalog/title/z_related_default_source</item>
+    <item type="str">destination_title | category,catalog/title/z_related_default_destination</item>
+    <item type="str">default_destination_title | category,catalog/title/z_related_default_destination</item>
+    <item type="str">source_section_title | category,catalog/title/z_related_default_source_section</item>
+    <item type="str">default_source_section_title | category,catalog/title/z_related_default_source_section</item>
     <item type="str">explanation_portal_type | movement,catalog/portal_type/z_related_explanation</item>
     <item type="str">predicate_uid | predicate/uid/z_related_predicate</item>
     <item type="str">resourceType | movement,catalog/portal_type/z_related_resource</item>
@@ -53,6 +68,7 @@
     <item type="str">subordination_title | category,catalog/title/z_related_subordination</item>
     <item type="str">translated_portal_type | translation/translated_message/z_related_translated_portal_type</item>
     <item type="str">translated_simulation_state | translation/translated_message/z_related_translated_simulation_state</item>
+    <item type="str">translated_simulation_state_title | translation/translated_message/z_related_translated_simulation_state</item>
     <item type="str">variationCategory | category/category_uid/z_related_uid</item>
     <item type="str">parent_specialise_portal_type | category,catalog/portal_type/z_related_parent_specialise</item>
     <item type="str">grand_parent_portal_type | catalog,catalog/portal_type/z_related_grand_parent</item>
diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_related_default_destination.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_related_default_destination.zsql
index 203769b84d8494cb462a25c5e38d0928e3002dbf..35812f6f9466a68819958f1ed6e0f31fede6fb60 100755
--- a/product/ERP5Catalog/sql/erp5_mysql/z_related_default_destination.zsql
+++ b/product/ERP5Catalog/sql/erp5_mysql/z_related_default_destination.zsql
@@ -10,5 +10,5 @@ class_file:
 <params>table_0
 table_1</params>
 <dtml-var table_1>.uid = <dtml-var table_0>.category_uid
-AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.destination_section.getUid()">
+AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.destination.getUid()">
 AND <dtml-var table_0>.uid = catalog.uid
diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_related_default_destination_section.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_related_default_destination_section.zsql
new file mode 100755
index 0000000000000000000000000000000000000000..203769b84d8494cb462a25c5e38d0928e3002dbf
--- /dev/null
+++ b/product/ERP5Catalog/sql/erp5_mysql/z_related_default_destination_section.zsql
@@ -0,0 +1,14 @@
+<dtml-comment>
+title:
+connection_id:erp5_sql_connection
+max_rows:0
+max_cache:100
+cache_time:0
+class_name:
+class_file:
+</dtml-comment>
+<params>table_0
+table_1</params>
+<dtml-var table_1>.uid = <dtml-var table_0>.category_uid
+AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.destination_section.getUid()">
+AND <dtml-var table_0>.uid = catalog.uid
diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_related_default_source.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_related_default_source.zsql
new file mode 100755
index 0000000000000000000000000000000000000000..ebef61467599eefd54dde747337bb5b1aacd594c
--- /dev/null
+++ b/product/ERP5Catalog/sql/erp5_mysql/z_related_default_source.zsql
@@ -0,0 +1,14 @@
+<dtml-comment>
+title:
+connection_id:erp5_sql_connection
+max_rows:0
+max_cache:100
+cache_time:0
+class_name:
+class_file:
+</dtml-comment>
+<params>table_0
+table_1</params>
+<dtml-var table_1>.uid = <dtml-var table_0>.category_uid
+AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source.getUid()">
+AND <dtml-var table_0>.uid = catalog.uid
diff --git a/product/ERP5Catalog/sql/erp5_mysql/z_related_default_source_section.zsql b/product/ERP5Catalog/sql/erp5_mysql/z_related_default_source_section.zsql
new file mode 100755
index 0000000000000000000000000000000000000000..94e88894c21eb4c490baa881f9818a1211f386cd
--- /dev/null
+++ b/product/ERP5Catalog/sql/erp5_mysql/z_related_default_source_section.zsql
@@ -0,0 +1,14 @@
+<dtml-comment>
+title:
+connection_id:erp5_sql_connection
+max_rows:0
+max_cache:100
+cache_time:0
+class_name:
+class_file:
+</dtml-comment>
+<params>table_0
+table_1</params>
+<dtml-var table_1>.uid = <dtml-var table_0>.category_uid
+AND <dtml-var table_0>.base_category_uid = <dtml-var "portal_categories.source_section.getUid()">
+AND <dtml-var table_0>.uid = catalog.uid