diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValueListBase.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValueListBase.xml
index 8750a7abc12543dce15a2b76489eb2ec0ffb8632..13150a2f48cace5467204ac12cb7d925bb88e81a 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValueListBase.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getDocumentValueListBase.xml
@@ -107,6 +107,11 @@ try:\n
 \n
   # First find the Web Section or Web Site we belong to\n
   current_section = context.getWebSectionValue()\n
+\n
+  if all_versions is None:\n
+    all_versions = context.getLayoutProperty(\'layout_all_versions\', default=False)\n
+  if all_languages is None:\n
+    all_languages = context.getLayoutProperty(\'layout_all_languages\', default=False)\n
 \n
   # Build the list of parameters\n
   if language is None:\n
@@ -146,7 +151,7 @@ except Unauthorized:\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>language=None, validation_state=None, all_languages=False, all_versions=None, src__=0, **kw</string> </value>
+            <value> <string>language=None, validation_state=None, all_languages=None, all_versions=None, src__=0, **kw</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -186,6 +191,7 @@ except Unauthorized:\n
                             <string>context</string>
                             <string>current_section</string>
                             <string>None</string>
+                            <string>False</string>
                             <string>_write_</string>
                             <string>_apply_</string>
                           </tuple>
@@ -202,7 +208,7 @@ except Unauthorized:\n
               <tuple>
                 <none/>
                 <none/>
-                <int>0</int>
+                <none/>
                 <none/>
                 <int>0</int>
               </tuple>
diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision
index cb225603316a1950cb97a32db5bb5c9e7a44618b..7bed0227374ae83cc50da61fd773b5770ea2c733 100644
--- a/bt5/erp5_web/bt/revision
+++ b/bt5/erp5_web/bt/revision
@@ -1 +1 @@
-827
\ No newline at end of file
+828
\ No newline at end of file