diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewContentListAsRSS.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewContentListAsRSS.xml
index 31f5c5e7c0dd4b8decd4d9533774897a7daa907f..091307cdf4387e5d1db48d6d81b2342fa74e248f 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewContentListAsRSS.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewContentListAsRSS.xml
@@ -62,9 +62,6 @@
             <key> <string>group_list</string> </key>
             <value>
               <list>
-                <string>left</string>
-                <string>right</string>
-                <string>center</string>
                 <string>bottom</string>
                 <string>hidden</string>
               </list>
@@ -82,20 +79,8 @@
                       </list>
                     </value>
                 </item>
-                <item>
-                    <key> <string>center</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
                 <item>
                     <key> <string>hidden</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>left</string> </key>
                     <value>
                       <list>
                         <string>listbox_link</string>
@@ -103,12 +88,6 @@
                       </list>
                     </value>
                 </item>
-                <item>
-                    <key> <string>right</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
               </dictionary>
             </value>
         </item>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewContentListAsRSS/listbox.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewContentListAsRSS/listbox.xml
index 9c053be4edc108e85d9d7c5e0a9f598d6c734875..4a9bf7e4a8a30d757536ec9c01d042f4139f8095 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewContentListAsRSS/listbox.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewContentListAsRSS/listbox.xml
@@ -311,7 +311,32 @@
                 <item>
                     <key> <string>all_columns</string> </key>
                     <value>
-                      <list/>
+                      <list>
+                        <tuple>
+                          <string>title</string>
+                          <string>title</string>
+                        </tuple>
+                        <tuple>
+                          <string>creation_date</string>
+                          <string>pubDate</string>
+                        </tuple>
+                        <tuple>
+                          <string>author</string>
+                          <string>author</string>
+                        </tuple>
+                        <tuple>
+                          <string>link</string>
+                          <string>link</string>
+                        </tuple>
+                        <tuple>
+                          <string>description</string>
+                          <string>description</string>
+                        </tuple>
+                        <tuple>
+                          <string>link</string>
+                          <string>guid</string>
+                        </tuple>
+                      </list>
                     </value>
                 </item>
                 <item>
@@ -328,27 +353,23 @@
                       <list>
                         <tuple>
                           <string>title</string>
-                          <string>rss_title</string>
+                          <string>title</string>
                         </tuple>
                         <tuple>
                           <string>creation_date</string>
-                          <string>rss_pubDate</string>
-                        </tuple>
-                        <tuple>
-                          <string>Base_getRSSAuthor</string>
-                          <string>rss_author</string>
+                          <string>pubDate</string>
                         </tuple>
                         <tuple>
                           <string>link</string>
-                          <string>rss_link</string>
+                          <string>link</string>
                         </tuple>
                         <tuple>
-                          <string>Base_getRSSDescription</string>
-                          <string>rss_description</string>
+                          <string>description</string>
+                          <string>description</string>
                         </tuple>
                         <tuple>
-                          <string>absolute_url</string>
-                          <string>rss_guid</string>
+                          <string>link</string>
+                          <string>guid</string>
                         </tuple>
                       </list>
                     </value>
@@ -409,6 +430,10 @@
                     <key> <string>hidden</string> </key>
                     <value> <int>0</int> </value>
                 </item>
+                <item>
+                    <key> <string>hide_rows_on_no_search_criterion</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
                 <item>
                     <key> <string>lines</string> </key>
                     <value> <int>20</int> </value>
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewContentListAsRSS/listbox_link.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewContentListAsRSS/listbox_link.xml
index 7e4065860dd6a83e665349aeabce08ed488ff279..a4c773921cc8a994b953618741981ae10ed456d9 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewContentListAsRSS/listbox_link.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewContentListAsRSS/listbox_link.xml
@@ -265,18 +265,15 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: cell.absolute_url() + \'/view\'</string> </value>
+            <value> <string>python:(cell.getPortalType() == \'Web Page\' and cell.getPermanentURL(cell) or cell.absolute_url() + \'/view\')</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision
index 203bd07e6d263140da9b77baddf991832c4d81fa..6ae4142a6ef4744c94dd6f1a08638f641c9fd802 100644
--- a/bt5/erp5_web/bt/revision
+++ b/bt5/erp5_web/bt/revision
@@ -1 +1 @@
-846
\ No newline at end of file
+847
\ No newline at end of file