diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseDomain_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseDomain_view.xml
index 4e4e9e6cd66f57a6663f09030fe3863f5b58eddc..ed971294e061717083378fe1c607618058258506 100755
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseDomain_view.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseDomain_view.xml
@@ -100,7 +100,9 @@
                 <item>
                     <key>                 <string>right</string> </key>
                     <value>
-                      <list/>
+                      <list>
+                        <string>my_domain_generator_method_id</string>
+                      </list>
                     </value>
                 </item>
               </dictionary>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml
index 7f0d085c7ea78747ca1220a4a66e3e9a13434710..55ce7995407564cb78ad4322148f859031dc2ae2 100755
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_edit.xml
@@ -247,9 +247,9 @@ try:\n
     \n
   # Maybe we should build a list of objects we need\n
   # Update basic attributes\n
+  context.edit(REQUEST=request,**kw)\n
   for encapsulated_editor in encapsulated_editor_list:\n
     encapsulated_editor.edit(context)\n
-  context.edit(REQUEST=request,**kw)\n
 \n
 except FormValidationError, validation_errors:\n
   # Pack errors into the request\n
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 7e2f4b30026951a26d2cc9edfe5642036906ed25..d787c538bb3154de75796b8633962863fa4e139a 100755
--- 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
@@ -97,6 +97,12 @@ context.portal_trash.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id
 for o in list(context.portal_trash.objectValues()):\n
   o.reindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2, sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n
 \n
+# Next we index domains\n
+print "#### Indexing domains ####"\n
+context.portal_domains.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n
+for o in list(context.portal_domains.objectValues()):\n
+  o.reindexObject(after_tag=(\'module\',\'category\'),tag=\'document\',priority=2, sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n
+\n
 # Next we index applied rules\n
 print "#### Indexing applied rules ####"\n
 context.portal_rules.reindexObject(tag=\'module\', sql_catalog_id=sql_catalog_id, passive_commit=passive_commit)\n