diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.xml
index 99935bfee1a7a19a3d14b2cae1bc02783dbc1239..cbfdd2e60ab0c9634e4c556525254464734548c0 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.xml
@@ -193,9 +193,7 @@
         <h1 data-i18n="0 items selected" class="ui-title ui-override-theme">0 items selected</h1>\n
         <div class="ui-controlgroup ui-controlgroup-horizontal ui-btn-right">\n
           <div class="ui-controlgroup-controls">\n
-            <form class="sort_form">  \n
-              <button data-rel="Sort" data-i18n="Sort" name="Sort" type="submit" class="submit responsive ui-last-child ui-btn ui-icon-sort-amount-desc ui-btn-icon-left">Sort</button>\n
-            </form>\n
+            <button data-rel="Sort" data-i18n="Sort" name="Sort" type="submit" class="submit responsive ui-last-child ui-btn ui-icon-sort-amount-desc ui-btn-icon-left">Sort</button>\n
           </div>\n
         </div>\n
       </div>\n
@@ -349,7 +347,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>948.8752.11008.17032</string> </value>
+                <value> <string>948.8773.24940.60996</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -367,7 +365,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1451486619.47</float>
+                        <float>1451487984.08</float>
                         <string>UTC</string>
                       </tuple>
                     </state>
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
index 6e5b76f2e49344407d47aee70d474ccd4d9ced41..438e676452c89af932b2d35cd9351553d2229fc4 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
@@ -532,10 +532,10 @@
       var gadget = this,\n
         url,\n
         options = {},\n
-        sort_form = gadget.props.element.querySelector(".sort_form");\n
+        sort_button = gadget.props.element.querySelector(\'button[name="Sort"]\');\n
       return loopEventListener(\n
-        sort_form,\n
-        "submit",\n
+        sort_button,\n
+        "click",\n
         false,\n
         function () {\n
           url = "gadget_erp5_sort_editor.html";\n
@@ -692,7 +692,7 @@
             </item>
             <item>
                 <key> <string>serial</string> </key>
-                <value> <string>948.8764.40835.23040</string> </value>
+                <value> <string>948.8776.58910.16264</string> </value>
             </item>
             <item>
                 <key> <string>state</string> </key>
@@ -710,7 +710,7 @@
                     </tuple>
                     <state>
                       <tuple>
-                        <float>1451487251.61</float>
+                        <float>1451487991.68</float>
                         <string>UTC</string>
                       </tuple>
                     </state>
diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSort.xml b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSort.xml
index 31a037a8790b02491b306567cf895acf37c49c28..3e56bd455460216684b361089d03c883eec89aae 100644
--- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSort.xml
+++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSort.xml
@@ -113,13 +113,13 @@
 \n
 <tr>\n
   <td>waitForElementPresent</td>\n
-  <td>//form[@class=\'sort_form\']</td>\n
+  <td>//button[@data-i18n=\'Sort\']</td>\n
   <td></td>\n
 </tr>\n
 \n
 <tr>\n
   <td>click</td>\n
-  <td>//form[@class=\'sort_form\']/button</td>\n
+  <td>//button[@data-i18n=\'Sort\']</td>\n
   <td></td>\n
 </tr>\n
 \n
diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortItemAutoBuild.xml b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortItemAutoBuild.xml
index d2b331c4a1e985dd3c3b36fffdf087a71e80a2a9..a2a7a8119ed988f996f7da56c02a0e1359194458 100644
--- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortItemAutoBuild.xml
+++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortItemAutoBuild.xml
@@ -111,13 +111,13 @@
 \n
 <tr>\n
   <td>waitForElementPresent</td>\n
-  <td>//form[@class=\'sort_form\']</td>\n
+  <td>//button[@data-i18n=\'Sort\']</td>\n
   <td></td>\n
 </tr>\n
 \n
 <tr>\n
   <td>click</td>\n
-  <td>//form[@class=\'sort_form\']/button</td>\n
+  <td>//button[@data-i18n=\'Sort\']</td>\n
   <td></td>\n
 </tr>\n
 \n
@@ -189,13 +189,13 @@
 \n
 <tr>\n
   <td>waitForElementPresent</td>\n
-  <td>//form[@class=\'sort_form\']</td>\n
+  <td>//button[@data-i18n=\'Sort\']</td>\n
   <td></td>\n
 </tr>\n
 \n
 <tr>\n
   <td>click</td>\n
-  <td>//form[@class=\'sort_form\']/button</td>\n
+  <td>//button[@data-i18n=\'Sort\']</td>\n
   <td></td>\n
 </tr>\n
 \n
diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortItemDelete.xml b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortItemDelete.xml
index 07490fccb997a0217026ff305b1949e811cdf7cc..2cf431441f3f14e6d22a7f62d705e5b920c0426e 100644
--- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortItemDelete.xml
+++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortItemDelete.xml
@@ -112,13 +112,13 @@
 \n
 <tr>\n
   <td>waitForElementPresent</td>\n
-  <td>//form[@class=\'sort_form\']</td>\n
+  <td>//button[@data-i18n=\'Sort\']</td>\n
   <td></td>\n
 </tr>\n
 \n
 <tr>\n
   <td>click</td>\n
-  <td>//form[@class=\'sort_form\']/button</td>\n
+  <td>//button[@data-i18n=\'Sort\']</td>\n
   <td></td>\n
 </tr>\n
 \n
diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortWithPager.xml b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortWithPager.xml
index 8208c8c17777b05afcd940a733a1eb56fdcb47ea..818937d0d057e3166d3d388eb5b9bb9a1d488198 100644
--- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortWithPager.xml
+++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortWithPager.xml
@@ -111,13 +111,13 @@
 \n
 <tr>\n
   <td>waitForElementPresent</td>\n
-  <td>//form[@class=\'sort_form\']</td>\n
+  <td>//button[@data-i18n=\'Sort\']</td>\n
   <td></td>\n
 </tr>\n
 \n
 <tr>\n
   <td>click</td>\n
-  <td>//form[@class=\'sort_form\']/button</td>\n
+  <td>//button[@data-i18n=\'Sort\']</td>\n
   <td></td>\n
 </tr>\n
 \n
diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortWithPreviousNext.xml b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortWithPreviousNext.xml
index 6d2d64ecf7445a41d684db60f632bcc80b002964..7fe4ade56f51d9eec013fb6a4a1607d84ebfa7a5 100644
--- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortWithPreviousNext.xml
+++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testSortWithPreviousNext.xml
@@ -111,13 +111,13 @@
 \n
 <tr>\n
   <td>waitForElementPresent</td>\n
-  <td>//form[@class=\'sort_form\']</td>\n
+  <td>//button[@data-i18n=\'Sort\']</td>\n
   <td></td>\n
 </tr>\n
 \n
 <tr>\n
   <td>click</td>\n
-  <td>//form[@class=\'sort_form\']/button</td>\n
+  <td>//button[@data-i18n=\'Sort\']</td>\n
   <td></td>\n
 </tr>\n
 \n
diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandSelectionNextJumpToNextDocument.xml b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandSelectionNextJumpToNextDocument.xml
index 16960e58141dd25babfe6cb4fe40f924ea89c9d0..b2220e09f8c2803c50ebcbb7af948aede0b98491 100644
--- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandSelectionNextJumpToNextDocument.xml
+++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandSelectionNextJumpToNextDocument.xml
@@ -125,13 +125,13 @@
 <!-- Sort -->\n
 <tr>\n
   <td>waitForElementPresent</td>\n
-  <td>//form[@class=\'sort_form\']</td>\n
+  <td>//button[@data-i18n=\'Sort\']</td>\n
   <td></td>\n
 </tr>\n
 \n
 <tr>\n
   <td>click</td>\n
-  <td>//form[@class=\'sort_form\']/button</td>\n
+  <td>//button[@data-i18n=\'Sort\']</td>\n
   <td></td>\n
 </tr>\n
 \n
diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandSelectionPreviousJumpToPreviousDocument.xml b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandSelectionPreviousJumpToPreviousDocument.xml
index 966710a9cf22d2f13309453777a6d70afd5c29d1..552683bbfe1700727cd75fe775ea07a79ca1e6e7 100644
--- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandSelectionPreviousJumpToPreviousDocument.xml
+++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandSelectionPreviousJumpToPreviousDocument.xml
@@ -126,13 +126,13 @@
 <!-- Sort -->\n
 <tr>\n
   <td>waitForElementPresent</td>\n
-  <td>//form[@class=\'sort_form\']</td>\n
+  <td>//button[@data-i18n=\'Sort\']</td>\n
   <td></td>\n
 </tr>\n
 \n
 <tr>\n
   <td>click</td>\n
-  <td>//form[@class=\'sort_form\']/button</td>\n
+  <td>//button[@data-i18n=\'Sort\']</td>\n
   <td></td>\n
 </tr>\n
 \n