diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java
index c68d5441ba2e87b296b0628f65a3b687748adb01..04adeb26c50154aa9e146a302f97434ffad3fbf5 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java
@@ -654,7 +654,7 @@ public abstract class EsAbstractConditionBean implements ConditionBean {
             if (searchType != null) {
                 builder.setSearchType(searchType);
             }
-            if (timeoutInMillis == -1) {
+            if (timeoutInMillis != -1) {
                 builder.setTimeout(new TimeValue(timeoutInMillis));
             }
             if (version != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
index 0b40e9ef0a32f32ae8889b2ce61155a6cdf9af4d..ac237d82246a10203c28838aa6dd70f1bdebff96 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
@@ -164,6 +164,7 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         filterList.forEach(query -> {
             boolQuery.filter(query);
         });
+        regQ(boolQuery);
         return boolQuery;
     }
 
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java
index 8408c324404a798764b265f44970ee9271cf14b5..29f0c17beb422462cac71c2d10fdd60f8e6b669a 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java
@@ -654,7 +654,7 @@ public abstract class EsAbstractConditionBean implements ConditionBean {
             if (searchType != null) {
                 builder.setSearchType(searchType);
             }
-            if (timeoutInMillis == -1) {
+            if (timeoutInMillis != -1) {
                 builder.setTimeout(new TimeValue(timeoutInMillis));
             }
             if (version != null) {
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
index f43ba1b97c2c8ebce7d9aad44a4cdf0a0c5d9892..5e7cb3a84162f66b1a5e8318505e59c5529d7ce3 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
@@ -164,6 +164,7 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         filterList.forEach(query -> {
             boolQuery.filter(query);
         });
+        regQ(boolQuery);
         return boolQuery;
     }
 
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java
index 8a23f9df1ee1b9d1edfa00263c1450c1b29b6296..4e25d5bed0f507e3429048ed16be19ea99449c9f 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java
@@ -654,7 +654,7 @@ public abstract class EsAbstractConditionBean implements ConditionBean {
             if (searchType != null) {
                 builder.setSearchType(searchType);
             }
-            if (timeoutInMillis == -1) {
+            if (timeoutInMillis != -1) {
                 builder.setTimeout(new TimeValue(timeoutInMillis));
             }
             if (version != null) {
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
index 4bc28c23821939e6ca2071a0925b65570c2544ba..91e6c312eae8462c62b9a0df4ef46a115922dfd4 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
@@ -164,6 +164,7 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         filterList.forEach(query -> {
             boolQuery.filter(query);
         });
+        regQ(boolQuery);
         return boolQuery;
     }