diff --git a/pom.xml b/pom.xml
index ce261d5fc..da32987be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
 
 		<!-- Testing -->
 		<junit.version>4.12</junit.version>
-		<utflute.version>0.6.0B-RC2</utflute.version>
+		<utflute.version>0.6.0B-RC3</utflute.version>
 
 		<!-- Crawler -->
 		<crawler.version>1.0.1</crawler.version>
diff --git a/src/main/java/org/codelibs/fess/app/web/RootAction.java b/src/main/java/org/codelibs/fess/app/web/RootAction.java
index 6f2a6e0ff..2ca6c577c 100644
--- a/src/main/java/org/codelibs/fess/app/web/RootAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/RootAction.java
@@ -16,7 +16,6 @@
 package org.codelibs.fess.app.web;
 
 import org.codelibs.fess.app.web.base.FessSearchAction;
-import org.codelibs.fess.app.web.search.SearchForm;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.HtmlResponse;
 
diff --git a/src/main/java/org/codelibs/fess/app/web/search/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/SearchForm.java
similarity index 98%
rename from src/main/java/org/codelibs/fess/app/web/search/SearchForm.java
rename to src/main/java/org/codelibs/fess/app/web/SearchForm.java
index 31a3246d8..ea6c495ba 100644
--- a/src/main/java/org/codelibs/fess/app/web/search/SearchForm.java
+++ b/src/main/java/org/codelibs/fess/app/web/SearchForm.java
@@ -13,7 +13,7 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
-package org.codelibs.fess.app.web.search;
+package org.codelibs.fess.app.web;
 
 import java.io.Serializable;
 import java.util.HashMap;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java
index 4c7d5ea45..deaadaf81 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java
@@ -21,7 +21,6 @@ import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.DuplicateHostPager;
 import org.codelibs.fess.app.service.DuplicateHostService;
 import org.codelibs.fess.app.web.CrudMode;
-import org.codelibs.fess.app.web.admin.boostdoc.SearchForm;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.config.exentity.DuplicateHost;
 import org.codelibs.fess.helper.SystemHelper;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java
index 1d052fe84..5b3ccc29f 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java
@@ -33,7 +33,6 @@ import org.codelibs.fess.app.pager.ElevateWordPager;
 import org.codelibs.fess.app.service.ElevateWordService;
 import org.codelibs.fess.app.service.LabelTypeService;
 import org.codelibs.fess.app.web.CrudMode;
-import org.codelibs.fess.app.web.admin.badword.SearchForm;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.config.exentity.ElevateWord;
 import org.codelibs.fess.exception.FessSystemException;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java
index 4cb75a1b1..1e259c081 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java
@@ -28,7 +28,6 @@ import org.codelibs.fess.app.pager.FileAuthPager;
 import org.codelibs.fess.app.service.FileAuthenticationService;
 import org.codelibs.fess.app.service.FileConfigService;
 import org.codelibs.fess.app.web.CrudMode;
-import org.codelibs.fess.app.web.admin.boostdoc.SearchForm;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.config.exentity.FileAuthentication;
 import org.codelibs.fess.es.config.exentity.FileConfig;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java
index 068f46e21..60ab98677 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java
@@ -23,7 +23,6 @@ import org.codelibs.fess.app.service.FileConfigService;
 import org.codelibs.fess.app.service.LabelTypeService;
 import org.codelibs.fess.app.service.RoleTypeService;
 import org.codelibs.fess.app.web.CrudMode;
-import org.codelibs.fess.app.web.admin.boostdoc.SearchForm;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.config.exentity.FileConfig;
 import org.codelibs.fess.helper.SystemHelper;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java
index cdb331089..0c7481de3 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java
@@ -23,7 +23,6 @@ import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.GroupPager;
 import org.codelibs.fess.app.service.GroupService;
 import org.codelibs.fess.app.web.CrudMode;
-import org.codelibs.fess.app.web.admin.boostdoc.SearchForm;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.user.exentity.Group;
 import org.codelibs.fess.helper.SystemHelper;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java b/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java
index 049a51fe2..0cc31bdf7 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java
@@ -21,7 +21,6 @@ import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.JobLogPager;
 import org.codelibs.fess.app.service.JobLogService;
 import org.codelibs.fess.app.web.CrudMode;
-import org.codelibs.fess.app.web.admin.boostdoc.SearchForm;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.helper.SystemHelper;
 import org.lastaflute.web.Execute;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java
index 972abdb5e..22385c4c1 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java
@@ -21,7 +21,6 @@ import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.KeyMatchPager;
 import org.codelibs.fess.app.service.KeyMatchService;
 import org.codelibs.fess.app.web.CrudMode;
-import org.codelibs.fess.app.web.admin.boostdoc.SearchForm;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.config.exentity.KeyMatch;
 import org.codelibs.fess.helper.SystemHelper;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java
index 90195290e..f6653537e 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java
@@ -22,7 +22,6 @@ import org.codelibs.fess.app.pager.LabelTypePager;
 import org.codelibs.fess.app.service.LabelTypeService;
 import org.codelibs.fess.app.service.RoleTypeService;
 import org.codelibs.fess.app.web.CrudMode;
-import org.codelibs.fess.app.web.admin.boostdoc.SearchForm;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.config.exentity.LabelType;
 import org.codelibs.fess.helper.SystemHelper;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java
index e6ef1aeaa..012a1c068 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java
@@ -21,7 +21,6 @@ import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.PathMapPager;
 import org.codelibs.fess.app.service.PathMappingService;
 import org.codelibs.fess.app.web.CrudMode;
-import org.codelibs.fess.app.web.admin.boostdoc.SearchForm;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.config.exentity.PathMapping;
 import org.codelibs.fess.helper.SystemHelper;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java
index 1e134839d..711a24edc 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java
@@ -28,7 +28,6 @@ import org.codelibs.fess.app.pager.ReqHeaderPager;
 import org.codelibs.fess.app.service.RequestHeaderService;
 import org.codelibs.fess.app.service.WebConfigService;
 import org.codelibs.fess.app.web.CrudMode;
-import org.codelibs.fess.app.web.admin.boostdoc.SearchForm;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.config.exentity.RequestHeader;
 import org.codelibs.fess.es.config.exentity.WebConfig;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java
index a9b0dafda..e0c52efcd 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java
@@ -23,7 +23,6 @@ import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.RolePager;
 import org.codelibs.fess.app.service.RoleService;
 import org.codelibs.fess.app.web.CrudMode;
-import org.codelibs.fess.app.web.admin.boostdoc.SearchForm;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.user.exentity.Role;
 import org.codelibs.fess.helper.SystemHelper;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java
index db6874a94..23de63f78 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java
@@ -21,7 +21,6 @@ import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.RoleTypePager;
 import org.codelibs.fess.app.service.RoleTypeService;
 import org.codelibs.fess.app.web.CrudMode;
-import org.codelibs.fess.app.web.admin.boostdoc.SearchForm;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.config.exentity.RoleType;
 import org.codelibs.fess.helper.SystemHelper;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java
index 9c5f991ae..1ff92a394 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java
@@ -21,7 +21,6 @@ import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.SchedulerPager;
 import org.codelibs.fess.app.service.ScheduledJobService;
 import org.codelibs.fess.app.web.CrudMode;
-import org.codelibs.fess.app.web.admin.boostdoc.SearchForm;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.config.exentity.ScheduledJob;
 import org.codelibs.fess.helper.JobHelper;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java
index 50ecfc05d..c52c6e8c6 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java
@@ -29,7 +29,6 @@ import org.codelibs.fess.app.service.GroupService;
 import org.codelibs.fess.app.service.RoleService;
 import org.codelibs.fess.app.service.UserService;
 import org.codelibs.fess.app.web.CrudMode;
-import org.codelibs.fess.app.web.admin.boostdoc.SearchForm;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.user.exentity.User;
 import org.codelibs.fess.helper.SystemHelper;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java b/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java
index 4c2ccfd76..f5ba4a3c9 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java
@@ -28,7 +28,6 @@ import org.codelibs.fess.app.pager.WebAuthPager;
 import org.codelibs.fess.app.service.WebAuthenticationService;
 import org.codelibs.fess.app.service.WebConfigService;
 import org.codelibs.fess.app.web.CrudMode;
-import org.codelibs.fess.app.web.admin.boostdoc.SearchForm;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.config.exentity.WebAuthentication;
 import org.codelibs.fess.es.config.exentity.WebConfig;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java
index 7c668ce02..e8119bcb2 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java
@@ -24,7 +24,6 @@ import org.codelibs.fess.app.service.RoleTypeService;
 import org.codelibs.fess.app.service.ScheduledJobService;
 import org.codelibs.fess.app.service.WebConfigService;
 import org.codelibs.fess.app.web.CrudMode;
-import org.codelibs.fess.app.web.admin.boostdoc.SearchForm;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.helper.SystemHelper;
diff --git a/src/main/java/org/codelibs/fess/app/web/help/HelpAction.java b/src/main/java/org/codelibs/fess/app/web/help/HelpAction.java
index 657414410..98af14710 100644
--- a/src/main/java/org/codelibs/fess/app/web/help/HelpAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/help/HelpAction.java
@@ -15,8 +15,8 @@
  */
 package org.codelibs.fess.app.web.help;
 
+import org.codelibs.fess.app.web.SearchForm;
 import org.codelibs.fess.app.web.base.FessSearchAction;
-import org.codelibs.fess.app.web.search.SearchForm;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.HtmlResponse;
 
diff --git a/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java b/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java
index 3f3d48e46..df0d671df 100644
--- a/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java
@@ -27,6 +27,7 @@ import javax.servlet.http.HttpSession;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.service.SearchService;
+import org.codelibs.fess.app.web.SearchForm;
 import org.codelibs.fess.app.web.base.FessSearchAction;
 import org.codelibs.fess.entity.SearchRenderData;
 import org.codelibs.fess.exception.InvalidQueryException;
diff --git a/src/test/java/org/codelibs/fess/mylasta/FessActionDefTest.java b/src/test/java/org/codelibs/fess/mylasta/FessActionDefTest.java
index 5008925c4..f2363ac36 100644
--- a/src/test/java/org/codelibs/fess/mylasta/FessActionDefTest.java
+++ b/src/test/java/org/codelibs/fess/mylasta/FessActionDefTest.java
@@ -1,26 +1,31 @@
 package org.codelibs.fess.mylasta;
 
 import org.codelibs.fess.unit.UnitFessTestCase;
+import org.dbflute.utflute.lastaflute.police.HotDeployDestroyerPolice;
+import org.dbflute.utflute.lastaflute.police.NonActionExtendsActionPolice;
+import org.dbflute.utflute.lastaflute.police.NonWebHasWebReferencePolice;
+import org.dbflute.utflute.lastaflute.police.WebPackageNinjaReferencePolice;
 
 public class FessActionDefTest extends UnitFessTestCase {
 
-    public void test_component() throws Exception {
-        //        policeStoryOfJavaClassChase(new ActionComponentPolice(tp -> getComponent(tp)));
-    }
+    //    public void test_component() throws Exception {
+    //        policeStoryOfJavaClassChase(new ActionComponentPolice(tp -> getComponent(tp)));
+    //    }
 
-    public void test_hotDeployDestroyer() throws Exception {
-        //        policeStoryOfJavaClassChase(new HotDeployDestroyerPolice(tp -> getComponent(tp)));
-    }
+    // TODO
+    //    public void test_hotDeployDestroyer() throws Exception {
+    //        policeStoryOfJavaClassChase(new HotDeployDestroyerPolice(tp -> getComponent(tp)));
+    //    }
 
     public void test_nonActionExtendsAction() throws Exception {
-        //        policeStoryOfJavaClassChase(new NonActionExtendsActionPolice());
+        policeStoryOfJavaClassChase(new NonActionExtendsActionPolice());
     }
 
     public void test_nonWebHasWebReference() throws Exception {
-        //        policeStoryOfJavaClassChase(new NonWebHasWebReferencePolice());
+        policeStoryOfJavaClassChase(new NonWebHasWebReferencePolice());
     }
 
     public void test_webPackageNinjaReferencePolice() throws Exception {
-        //        policeStoryOfJavaClassChase(new WebPackageNinjaReferencePolice());
+        policeStoryOfJavaClassChase(new WebPackageNinjaReferencePolice());
     }
 }
\ No newline at end of file