diff --git a/src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java b/src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java
index ffa9719b1..95f4d0c70 100644
--- a/src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java
+++ b/src/main/java/org/codelibs/fess/api/suggest/SuggestApiManager.java
@@ -72,8 +72,6 @@ public class SuggestApiManager extends BaseApiManager {
             }
             builder.setSize(parameter.getNum());
 
-            final SuggestResponse suggestResponse = builder.execute().getResponse();
-
             builder.addKind(SuggestItem.Kind.USER.toString());
             if (Constants.TRUE.equals(crawlerProperties.getProperty(Constants.SUGGEST_SEARCH_LOG_PROPERTY, Constants.TRUE))) {
                 builder.addKind(SuggestItem.Kind.QUERY.toString());
@@ -82,6 +80,8 @@ public class SuggestApiManager extends BaseApiManager {
                 builder.addKind(SuggestItem.Kind.DOCUMENT.toString());
             }
 
+            final SuggestResponse suggestResponse = builder.execute().getResponse();
+
             buf.append("\"result\":{");
             buf.append("\"took\":\"").append(suggestResponse.getTookMs()).append('\"');
 
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java b/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java
index 36eb996f8..b91e83119 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java
@@ -146,7 +146,8 @@ public class AdminGeneralAction extends FessAdminAction {
         form.suggestSearchLog = crawlerProperties.getProperty(Constants.SUGGEST_SEARCH_LOG_PROPERTY, Constants.TRUE);
         form.suggestDocuments = crawlerProperties.getProperty(Constants.SUGGEST_DOCUMENTS_PROPERTY, Constants.TRUE);
         form.purgeSuggestSearchLogDay =
-                Integer.parseInt(crawlerProperties.getProperty(Constants.PURGE_SUGGEST_SEARCH_LOG_DAY_PROPERTY, "-1"));
+                Integer.parseInt(crawlerProperties
+                        .getProperty(Constants.PURGE_SUGGEST_SEARCH_LOG_DAY_PROPERTY, Constants.DEFAULT_PURGE_DAY));
     }
 
     private void updateProperty(final String key, final String value) {
diff --git a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
index d489bedb3..80aee9c39 100644
--- a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
+++ b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
@@ -147,7 +147,9 @@ public class SuggestCreator implements Serializable {
 
         try {
             suggestHelper.purgeDocumentSuggest(time);
-            final long cleanupDay = Long.parseLong(crawlerProperties.getProperty(Constants.PURGE_SUGGEST_SEARCH_LOG_DAY_PROPERTY, "-1"));
+            final long cleanupDay =
+                    Long.parseLong(crawlerProperties.getProperty(Constants.PURGE_SUGGEST_SEARCH_LOG_DAY_PROPERTY,
+                            Constants.DEFAULT_PURGE_DAY));
             if (cleanupDay > 0) {
                 suggestHelper.purgeSearchlogSuggest(time.minusDays(cleanupDay));
             }