diff --git a/dbflute.xml b/dbflute.xml
index 2ebb6004c..213e28ac8 100644
--- a/dbflute.xml
+++ b/dbflute.xml
@@ -2,7 +2,7 @@
 <project name="dbflute" basedir=".">
 	<property name="mydbflute.dir" value="${basedir}/mydbflute" />
 	<property name="target.dir" value="${basedir}/target" />
-	<property name="branch.name" value="es-6.5" />
+	<property name="branch.name" value="es-7.0" />
 	<property name="mydbflute.url" value="https://github.com/lastaflute/lastaflute-example-waterfront/archive/${branch.name}.zip" />
 
 	<target name="mydbflute.check">
diff --git a/plugin.xml b/plugin.xml
index 66d495c98..a09828a65 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -13,66 +13,48 @@
 		<mkdir dir="${plugins.dir}" />
 		<!-- analysis-extension -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="analysis-extension" />
-			<param name="plugin.version" value="6.6.0" />
-			<param name="plugin.zip.version" value="6.6.0" />
+			<param name="plugin.version" value="7.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="7.0.0-20190223.213759-3" />
 		</antcall>
 		<!-- analysis-fess -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="analysis-fess" />
-			<param name="plugin.version" value="6.6.0" />
-			<param name="plugin.zip.version" value="6.6.0" />
+			<param name="plugin.version" value="7.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="7.0.0-20190216.114819-1" />
 		</antcall>
 		<!-- configsync -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="configsync" />
-			<param name="plugin.version" value="6.6.0" />
-			<param name="plugin.zip.version" value="6.6.0" />
+			<param name="plugin.version" value="7.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="7.0.0-20190223.130530-1" />
 		</antcall>
 		<!-- dataformat -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="dataformat" />
-			<param name="plugin.version" value="6.6.0" />
-			<param name="plugin.zip.version" value="6.6.0" />
-		</antcall>
-		<!-- langfield -->
-		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
-			<param name="plugin.groupId" value="org/codelibs" />
-			<param name="plugin.name.prefix" value="elasticsearch-" />
-			<param name="plugin.name" value="langfield" />
-			<param name="plugin.version" value="6.6.0" />
-			<param name="plugin.zip.version" value="6.6.0" />
-		</antcall>
-		<!-- learning-to-rank -->
-		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
-			<param name="plugin.groupId" value="org/codelibs" />
-			<param name="plugin.name.prefix" value="elasticsearch-" />
-			<param name="plugin.name" value="learning-to-rank" />
-			<param name="plugin.version" value="6.6.0" />
-			<param name="plugin.zip.version" value="6.6.0" />
+			<param name="plugin.version" value="7.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="7.0.0-20190223.130717-1" />
 		</antcall>
 		<!-- minhash -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="minhash" />
-			<param name="plugin.version" value="6.6.0" />
-			<param name="plugin.zip.version" value="6.6.0" />
+			<param name="plugin.version" value="7.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="7.0.0-20190223.131554-1" />
 		</antcall>
 
 		<antcall target="remove.jars" />
@@ -103,13 +85,7 @@
 				<include name="dataformat/poi-*" />
 				<include name="dataformat/stax-api-*" />
 				<include name="dataformat/xmlbeans-*" />
-				<include name="langfield/jackson-*" />
 				<include name="minhash/guava-*" />
-				<include name="learning-to-rank/lucene-expressions-*" />
-				<include name="learning-to-rank/antlr4-runtime-*" />
-				<include name="learning-to-rank/compiler-*" />
-				<include name="learning-to-rank/asm-*" />
-				<include name="learning-to-rank/commons-math3-*" />
 			</fileset>
 		</delete>
 	</target>
diff --git a/pom.xml b/pom.xml
index 295d7b6f3..b332a3ada 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,11 +63,11 @@
 		<crawler.version>3.0.0-SNAPSHOT</crawler.version>
 
 		<!-- Suggest -->
-		<suggest.version>6.6.0-SNAPSHOT</suggest.version>
+		<suggest.version>7.0.0-SNAPSHOT</suggest.version>
 
 		<!-- Elasticsearch -->
-		<elasticsearch.version>6.6.0</elasticsearch.version>
-		<elasticsearch.httpclient.version>6.6.0-SNAPSHOT</elasticsearch.httpclient.version>
+		<elasticsearch.version>7.0.0-beta1</elasticsearch.version>
+		<elasticsearch.httpclient.version>7.0.0-SNAPSHOT</elasticsearch.httpclient.version>
 		<cluster.runner.version>${elasticsearch.version}.0</cluster.runner.version>
 
 		<!-- Tomcat -->
@@ -1068,6 +1068,17 @@
 				<enabled>true</enabled>
 			</snapshots>
 		</repository>
+		<repository>
+			<id>elastic-lucene-snapshots</id>
+			<name>Elastic Lucene Snapshots</name>
+			<url>http://s3.amazonaws.com/download.elasticsearch.org/lucenesnapshots/83f9835</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
 	</repositories>
 	<dependencies>
 		<!-- lastaflute -->
diff --git a/src/main/java/org/codelibs/fess/app/service/SearchLogService.java b/src/main/java/org/codelibs/fess/app/service/SearchLogService.java
index 9fc619aab..e26e38374 100644
--- a/src/main/java/org/codelibs/fess/app/service/SearchLogService.java
+++ b/src/main/java/org/codelibs/fess/app/service/SearchLogService.java
@@ -56,8 +56,8 @@ import org.elasticsearch.search.aggregations.BucketOrder;
 import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
 import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
-import org.elasticsearch.search.aggregations.metrics.avg.Avg;
-import org.elasticsearch.search.aggregations.metrics.cardinality.Cardinality;
+import org.elasticsearch.search.aggregations.metrics.Avg;
+import org.elasticsearch.search.aggregations.metrics.Cardinality;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/codelibs/fess/app/service/SearchService.java b/src/main/java/org/codelibs/fess/app/service/SearchService.java
index 76759a7e6..425c261f8 100644
--- a/src/main/java/org/codelibs/fess/app/service/SearchService.java
+++ b/src/main/java/org/codelibs/fess/app/service/SearchService.java
@@ -111,7 +111,7 @@ public class SearchService {
             query = ComponentUtil.getQueryStringBuilder().params(params).build() + " sort:" + sortField;
         }
         final List<Map<String, Object>> documentItems =
-                fessEsClient.search(fessConfig.getIndexDocumentSearchIndex(), fessConfig.getIndexDocumentType(),
+                fessEsClient.search(fessConfig.getIndexDocumentSearchIndex(),
                         searchRequestBuilder -> {
                             queryHelper.processSearchPreference(searchRequestBuilder, userBean, query);
                             return SearchConditionBuilder.builder(searchRequestBuilder).query(query).offset(pageStart).size(pageSize)
@@ -208,7 +208,6 @@ public class SearchService {
         }
         return fessEsClient.<Map<String, Object>> scrollSearch(
                 fessConfig.getIndexDocumentSearchIndex(),
-                fessConfig.getIndexDocumentType(),
                 searchRequestBuilder -> {
                     queryHelper.processSearchPreference(searchRequestBuilder, userBean, query);
                     return SearchConditionBuilder.builder(searchRequestBuilder).scroll().query(query).size(pageSize)
@@ -251,8 +250,7 @@ public class SearchService {
         final QueryContext queryContext = queryHelper.build(params.getType(), query, context -> {
             context.skipRoleQuery();
         });
-        return fessEsClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(),
-                queryContext.getQueryBuilder());
+        return fessEsClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), queryContext.getQueryBuilder());
     }
 
     public String[] getLanguages(final HttpServletRequest request, final SearchRequestParams params) {
@@ -299,7 +297,6 @@ public class SearchService {
             final OptionalThing<FessUserBean> userBean) {
         return fessEsClient.getDocument(
                 fessConfig.getIndexDocumentSearchIndex(),
-                fessConfig.getIndexDocumentType(),
                 builder -> {
                     final BoolQueryBuilder boolQuery =
                             QueryBuilders.boolQuery().must(QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), docId));
@@ -323,7 +320,6 @@ public class SearchService {
             final OptionalThing<FessUserBean> userBean, final SearchRequestType searchRequestType) {
         return fessEsClient.getDocumentList(
                 fessConfig.getIndexDocumentSearchIndex(),
-                fessConfig.getIndexDocumentType(),
                 builder -> {
                     final BoolQueryBuilder boolQuery =
                             QueryBuilders.boolQuery().must(QueryBuilders.termsQuery(fessConfig.getIndexFieldDocId(), docIds));
@@ -346,13 +342,12 @@ public class SearchService {
     }
 
     public boolean update(final String id, final String field, final Object value) {
-        return fessEsClient.update(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(), id, field, value);
+        return fessEsClient.update(fessConfig.getIndexDocumentUpdateIndex(), id, field, value);
     }
 
     public boolean update(final String id, final Consumer<UpdateRequestBuilder> builderLambda) {
         try {
-            final UpdateRequestBuilder builder =
-                    fessEsClient.prepareUpdate(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(), id);
+            final UpdateRequestBuilder builder = fessEsClient.prepareUpdate().setIndex(fessConfig.getIndexDocumentUpdateIndex()).setId(id);
             builderLambda.accept(builder);
             final UpdateResponse response = builder.execute().actionGet(fessConfig.getIndexIndexTimeout());
             return response.getResult() == Result.CREATED || response.getResult() == Result.UPDATED;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java
index 205337441..decfbf3dd 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java
@@ -198,7 +198,7 @@ public class AdminSearchlistAction extends FessAdminAction {
         final String docId = form.docId;
         try {
             final QueryBuilder query = QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), docId);
-            fessEsClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(), query);
+            fessEsClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), query);
             saveInfo(messages -> messages.addSuccessDeleteDocFromIndex(GLOBAL));
         } catch (final Exception e) {
             throwValidationError(messages -> messages.addErrorsFailedToDeleteDocInAdmin(GLOBAL), () -> asListHtml());
@@ -262,8 +262,7 @@ public class AdminSearchlistAction extends FessAdminAction {
                         entity.put(fessConfig.getIndexFieldId(), newId);
 
                         final String index = fessConfig.getIndexDocumentUpdateIndex();
-                        final String type = fessConfig.getIndexDocumentType();
-                        fessEsClient.store(index, type, entity);
+                        fessEsClient.store(index, entity);
                         saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
                     } catch (final Exception e) {
                         logger.error("Failed to add " + entity, e);
@@ -285,7 +284,6 @@ public class AdminSearchlistAction extends FessAdminAction {
         getDoc(form).ifPresent(
                 entity -> {
                     final String index = fessConfig.getIndexDocumentUpdateIndex();
-                    final String type = fessConfig.getIndexDocumentType();
                     try {
                         entity.putAll(fessConfig.convertToStorableDoc(form.doc));
 
@@ -295,11 +293,11 @@ public class AdminSearchlistAction extends FessAdminAction {
                             entity.put(fessConfig.getIndexFieldId(), newId);
                             final Long version = (Long) entity.remove(fessConfig.getIndexFieldVersion());
                             if (version != null && oldId != null) {
-                                fessEsClient.delete(index, type, oldId, version);
+                                fessEsClient.delete(index, oldId, version);
                             }
                         }
 
-                        fessEsClient.store(index, type, entity);
+                        fessEsClient.store(index, entity);
                         saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
                     } catch (final Exception e) {
                         logger.error("Failed to update " + entity, e);
@@ -381,7 +379,7 @@ public class AdminSearchlistAction extends FessAdminAction {
                 docId = null;
             }
             if (StringUtil.isNotBlank(docId)) {
-                return fessEsClient.getDocument(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(), builder -> {
+                return fessEsClient.getDocument(fessConfig.getIndexDocumentUpdateIndex(), builder -> {
                     builder.setQuery(QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), docId));
                     return true;
                 });
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java
index e3f7a39f1..06e44a208 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java
@@ -104,14 +104,13 @@ public class ApiAdminSearchlistAction extends FessApiAdminAction {
     // GET /api/admin/searchlist/doc/{doc_id}
     @Execute
     public JsonResponse<ApiResult> get$doc(final String id) {
-        return asJson(new ApiDocResponse()
-                .doc(fessEsClient.getDocument(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(), builder -> {
-                    builder.setQuery(QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), id));
-                    return true;
-                }).orElseGet(() -> {
-                    throwValidationErrorApi(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id));
-                    return null;
-                })).status(Status.OK).result());
+        return asJson(new ApiDocResponse().doc(fessEsClient.getDocument(fessConfig.getIndexDocumentUpdateIndex(), builder -> {
+            builder.setQuery(QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), id));
+            return true;
+        }).orElseGet(() -> {
+            throwValidationErrorApi(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id));
+            return null;
+        })).status(Status.OK).result());
     }
 
     // PUT /api/admin/searchlist/doc
@@ -131,8 +130,7 @@ public class ApiAdminSearchlistAction extends FessApiAdminAction {
                 entity.put(fessConfig.getIndexFieldId(), newId);
 
                 final String index = fessConfig.getIndexDocumentUpdateIndex();
-                final String type = fessConfig.getIndexDocumentType();
-                fessEsClient.store(index, type, entity);
+                fessEsClient.store(index, entity);
                 saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
             } catch (final Exception e) {
                 logger.error("Failed to add " + entity, e);
@@ -158,7 +156,6 @@ public class ApiAdminSearchlistAction extends FessApiAdminAction {
         body.crudMode = CrudMode.EDIT;
         final Map<String, Object> doc = getDoc(body).map(entity -> {
             final String index = fessConfig.getIndexDocumentUpdateIndex();
-            final String type = fessConfig.getIndexDocumentType();
             try {
                 entity.putAll(fessConfig.convertToStorableDoc(body.doc));
 
@@ -168,11 +165,11 @@ public class ApiAdminSearchlistAction extends FessApiAdminAction {
                     entity.put(fessConfig.getIndexFieldId(), newId);
                     final Number version = (Number) entity.remove(fessConfig.getIndexFieldVersion());
                     if (version != null && oldId != null) {
-                        fessEsClient.delete(index, type, oldId, version.longValue());
+                        fessEsClient.delete(index, oldId, version.longValue());
                     }
                 }
 
-                fessEsClient.store(index, type, entity);
+                fessEsClient.store(index, entity);
                 saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
             } catch (final Exception e) {
                 logger.error("Failed to update " + entity, e);
@@ -192,7 +189,7 @@ public class ApiAdminSearchlistAction extends FessApiAdminAction {
     public JsonResponse<ApiResult> delete$doc(final String id) {
         try {
             final QueryBuilder query = QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), id);
-            fessEsClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(), query);
+            fessEsClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), query);
             saveInfo(messages -> messages.addSuccessDeleteDocFromIndex(GLOBAL));
         } catch (final Exception e) {
             throwValidationErrorApi(messages -> messages.addErrorsFailedToDeleteDocInAdmin(GLOBAL));
diff --git a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
index f61fa1b9b..f29b71c0e 100644
--- a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
+++ b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
@@ -71,7 +71,6 @@ import org.elasticsearch.action.Action;
 import org.elasticsearch.action.ActionFuture;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.ActionRequest;
-import org.elasticsearch.action.ActionRequestBuilder;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.DocWriteRequest;
 import org.elasticsearch.action.DocWriteRequest.OpType;
@@ -399,7 +398,7 @@ public class FessEsClient implements Client {
         final GetMappingsResponse getMappingsResponse =
                 client.admin().indices().prepareGetMappings(indexName).execute().actionGet(fessConfig.getIndexIndicesTimeout());
         final ImmutableOpenMap<String, MappingMetaData> indexMappings = getMappingsResponse.mappings().get(indexName);
-        if (indexMappings == null || !indexMappings.containsKey(docType)) {
+        if (indexMappings == null || !indexMappings.containsKey("properties")) {
             String source = null;
             final String mappingFile = indexConfigPath + "/" + index + "/" + docType + ".json";
             try {
@@ -409,8 +408,8 @@ public class FessEsClient implements Client {
             }
             try {
                 final AcknowledgedResponse putMappingResponse =
-                        client.admin().indices().preparePutMapping(indexName).setType(docType).setSource(source, XContentType.JSON)
-                                .execute().actionGet(fessConfig.getIndexIndicesTimeout());
+                        client.admin().indices().preparePutMapping(indexName).setSource(source, XContentType.JSON).execute()
+                                .actionGet(fessConfig.getIndexIndicesTimeout());
                 if (putMappingResponse.isAcknowledged()) {
                     logger.info("Created " + indexName + "/" + docType + " mapping.");
                 } else {
@@ -545,7 +544,7 @@ public class FessEsClient implements Client {
                                         });
                                 if (result.keySet().contains("index")) {
                                     final IndexRequestBuilder requestBuilder =
-                                            client.prepareIndex(configIndex, configType, result.get("index").get("_id")).setSource(line,
+                                            client.prepareIndex(configIndex, result.get("index").get("_id")).setSource(line,
                                                     XContentType.JSON);
                                     builder.add(requestBuilder);
                                 }
@@ -644,11 +643,11 @@ public class FessEsClient implements Client {
         }
     }
 
-    public long deleteByQuery(final String index, final String type, final QueryBuilder queryBuilder) {
+    public long deleteByQuery(final String index, final QueryBuilder queryBuilder) {
 
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
         SearchResponse response =
-                client.prepareSearch(index).setTypes(type).setScroll(scrollForDelete).setSize(sizeForDelete)
+                client.prepareSearch(index).setScroll(scrollForDelete).setSize(sizeForDelete)
                         .setFetchSource(new String[] { fessConfig.getIndexFieldId() }, null).setQuery(queryBuilder)
                         .setPreference(Constants.SEARCH_PREFERENCE_LOCAL).execute().actionGet(fessConfig.getIndexScrollSearchTimeout());
 
@@ -664,7 +663,7 @@ public class FessEsClient implements Client {
 
             final BulkRequestBuilder bulkRequest = client.prepareBulk();
             for (final SearchHit hit : hits) {
-                bulkRequest.add(client.prepareDelete(index, type, hit.getId()));
+                bulkRequest.add(client.prepareDelete().setIndex(index).setId(hit.getId()));
                 count++;
             }
             final BulkResponse bulkResponse = bulkRequest.execute().actionGet(fessConfig.getIndexBulkTimeout());
@@ -693,12 +692,12 @@ public class FessEsClient implements Client {
         return searchResult.build(requestBuilder, execTime, OptionalEntity.ofNullable(response, () -> {}));
     }
 
-    public <T> T search(final String index, final String type, final SearchCondition<SearchRequestBuilder> condition,
+    public <T> T search(final String index, final SearchCondition<SearchRequestBuilder> condition,
             final SearchResult<T, SearchRequestBuilder, SearchResponse> searchResult) {
         final long startTime = System.currentTimeMillis();
 
         SearchResponse searchResponse = null;
-        final SearchRequestBuilder searchRequestBuilder = client.prepareSearch(index).setTypes(type);
+        final SearchRequestBuilder searchRequestBuilder = client.prepareSearch(index);
         if (condition.build(searchRequestBuilder)) {
 
             final FessConfig fessConfig = ComponentUtil.getFessConfig();
@@ -722,11 +721,11 @@ public class FessEsClient implements Client {
         return searchResult.build(searchRequestBuilder, execTime, OptionalEntity.ofNullable(searchResponse, () -> {}));
     }
 
-    public <T> long scrollSearch(final String index, final String type, final SearchCondition<SearchRequestBuilder> condition,
+    public <T> long scrollSearch(final String index, final SearchCondition<SearchRequestBuilder> condition,
             final EntityCreator<T, SearchResponse, SearchHit> creator, final Function<T, Boolean> cursor) {
         long count = 0;
 
-        final SearchRequestBuilder searchRequestBuilder = client.prepareSearch(index).setTypes(type).setScroll(scrollForSearch);
+        final SearchRequestBuilder searchRequestBuilder = client.prepareSearch(index).setScroll(scrollForSearch);
         if (condition.build(searchRequestBuilder)) {
             final FessConfig fessConfig = ComponentUtil.getFessConfig();
 
@@ -767,11 +766,9 @@ public class FessEsClient implements Client {
         return count;
     }
 
-    public OptionalEntity<Map<String, Object>> getDocument(final String index, final String type,
-            final SearchCondition<SearchRequestBuilder> condition) {
+    public OptionalEntity<Map<String, Object>> getDocument(final String index, final SearchCondition<SearchRequestBuilder> condition) {
         return getDocument(
                 index,
-                type,
                 condition,
                 (response, hit) -> {
                     final FessConfig fessConfig = ComponentUtil.getFessConfig();
@@ -795,9 +792,9 @@ public class FessEsClient implements Client {
                 });
     }
 
-    protected <T> OptionalEntity<T> getDocument(final String index, final String type,
-            final SearchCondition<SearchRequestBuilder> condition, final EntityCreator<T, SearchResponse, SearchHit> creator) {
-        return search(index, type, searchRequestBuilder -> {
+    protected <T> OptionalEntity<T> getDocument(final String index, final SearchCondition<SearchRequestBuilder> condition,
+            final EntityCreator<T, SearchResponse, SearchHit> creator) {
+        return search(index, searchRequestBuilder -> {
             searchRequestBuilder.setVersion(true);
             return condition.build(searchRequestBuilder);
         }, (queryBuilder, execTime, searchResponse) -> {
@@ -811,11 +808,9 @@ public class FessEsClient implements Client {
         });
     }
 
-    public List<Map<String, Object>> getDocumentList(final String index, final String type,
-            final SearchCondition<SearchRequestBuilder> condition) {
+    public List<Map<String, Object>> getDocumentList(final String index, final SearchCondition<SearchRequestBuilder> condition) {
         return getDocumentList(
                 index,
-                type,
                 condition,
                 (response, hit) -> {
                     final FessConfig fessConfig = ComponentUtil.getFessConfig();
@@ -837,9 +832,9 @@ public class FessEsClient implements Client {
                 });
     }
 
-    protected <T> List<T> getDocumentList(final String index, final String type, final SearchCondition<SearchRequestBuilder> condition,
+    protected <T> List<T> getDocumentList(final String index, final SearchCondition<SearchRequestBuilder> condition,
             final EntityCreator<T, SearchResponse, SearchHit> creator) {
-        return search(index, type, condition, (searchRequestBuilder, execTime, searchResponse) -> {
+        return search(index, condition, (searchRequestBuilder, execTime, searchResponse) -> {
             final List<T> list = new ArrayList<>();
             searchResponse.ifPresent(response -> {
                 response.getHits().forEach(hit -> {
@@ -850,10 +845,10 @@ public class FessEsClient implements Client {
         });
     }
 
-    public boolean update(final String index, final String type, final String id, final String field, final Object value) {
+    public boolean update(final String index, final String id, final String field, final Object value) {
         try {
             final Result result =
-                    client.prepareUpdate(index, type, id).setDoc(field, value).execute()
+                    client.prepareUpdate().setIndex(index).setId(id).setDoc(field, value).execute()
                             .actionGet(ComponentUtil.getFessConfig().getIndexIndexTimeout()).getResult();
             return result == Result.CREATED || result == Result.UPDATED;
         } catch (final ElasticsearchException e) {
@@ -906,13 +901,13 @@ public class FessEsClient implements Client {
         }
     }
 
-    public void addAll(final String index, final String type, final List<Map<String, Object>> docList,
+    public void addAll(final String index, final List<Map<String, Object>> docList,
             final BiConsumer<Map<String, Object>, IndexRequestBuilder> options) {
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
         final BulkRequestBuilder bulkRequestBuilder = client.prepareBulk();
         for (final Map<String, Object> doc : docList) {
             final Object id = doc.remove(fessConfig.getIndexFieldId());
-            final IndexRequestBuilder builder = client.prepareIndex(index, type, id.toString()).setSource(new DocMap(doc));
+            final IndexRequestBuilder builder = client.prepareIndex().setIndex(index).setId(id.toString()).setSource(new DocMap(doc));
             options.accept(doc, builder);
             bulkRequestBuilder.add(builder);
         }
@@ -1130,7 +1125,7 @@ public class FessEsClient implements Client {
         }
     }
 
-    public boolean store(final String index, final String type, final Object obj) {
+    public boolean store(final String index, final Object obj) {
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
         @SuppressWarnings("unchecked")
         final Map<String, Object> source = obj instanceof Map ? (Map<String, Object>) obj : BeanUtil.copyBeanToNewMap(obj);
@@ -1142,13 +1137,13 @@ public class FessEsClient implements Client {
                 // TODO throw Exception in next release
                 // create
                 response =
-                        client.prepareIndex(index, type).setSource(new DocMap(source)).setRefreshPolicy(RefreshPolicy.IMMEDIATE)
+                        client.prepareIndex().setIndex(index).setSource(new DocMap(source)).setRefreshPolicy(RefreshPolicy.IMMEDIATE)
                                 .setOpType(OpType.CREATE).execute().actionGet(fessConfig.getIndexIndexTimeout());
             } else {
                 // create or update
                 final IndexRequestBuilder builder =
-                        client.prepareIndex(index, type, id).setSource(new DocMap(source)).setRefreshPolicy(RefreshPolicy.IMMEDIATE)
-                                .setOpType(OpType.INDEX);
+                        client.prepareIndex().setIndex(index).setId(id).setSource(new DocMap(source))
+                                .setRefreshPolicy(RefreshPolicy.IMMEDIATE).setOpType(OpType.INDEX);
                 if (version != null && version.longValue() > 0) {
                     builder.setVersion(version.longValue());
                 }
@@ -1161,16 +1156,16 @@ public class FessEsClient implements Client {
         }
     }
 
-    public boolean delete(final String index, final String type, final String id, final long version) {
+    public boolean delete(final String index, final String id, final long version) {
         try {
-            final DeleteRequestBuilder builder = client.prepareDelete(index, type, id).setRefreshPolicy(RefreshPolicy.IMMEDIATE);
+            final DeleteRequestBuilder builder = client.prepareDelete().setIndex(index).setId(id).setRefreshPolicy(RefreshPolicy.IMMEDIATE);
             if (version > 0) {
                 builder.setVersion(version);
             }
             final DeleteResponse response = builder.execute().actionGet(ComponentUtil.getFessConfig().getIndexDeleteTimeout());
             return response.getResult() == Result.DELETED;
         } catch (final ElasticsearchException e) {
-            throw new FessEsClientException("Failed to delete: " + index + "/" + type + "/" + id + "/" + version, e);
+            throw new FessEsClientException("Failed to delete: " + index + "/" + id + "/" + version, e);
         }
     }
 
@@ -1423,30 +1418,6 @@ public class FessEsClient implements Client {
         return client.prepareTermVectors(index, type, id);
     }
 
-    @Override
-    @Deprecated
-    public ActionFuture<TermVectorsResponse> termVector(final TermVectorsRequest request) {
-        return client.termVector(request);
-    }
-
-    @Override
-    @Deprecated
-    public void termVector(final TermVectorsRequest request, final ActionListener<TermVectorsResponse> listener) {
-        client.termVector(request, listener);
-    }
-
-    @Override
-    @Deprecated
-    public TermVectorsRequestBuilder prepareTermVector() {
-        return client.prepareTermVector();
-    }
-
-    @Override
-    @Deprecated
-    public TermVectorsRequestBuilder prepareTermVector(final String index, final String type, final String id) {
-        return client.prepareTermVector(index, type, id);
-    }
-
     @Override
     public ActionFuture<MultiTermVectorsResponse> multiTermVectors(final MultiTermVectorsRequest request) {
         return client.multiTermVectors(request);
@@ -1488,23 +1459,17 @@ public class FessEsClient implements Client {
     }
 
     @Override
-    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> ActionFuture<Response> execute(
-            final Action<Request, Response, RequestBuilder> action, final Request request) {
+    public <Request extends ActionRequest, Response extends ActionResponse> ActionFuture<Response> execute(Action<Response> action,
+            Request request) {
         return client.execute(action, request);
     }
 
     @Override
-    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> void execute(
-            final Action<Request, Response, RequestBuilder> action, final Request request, final ActionListener<Response> listener) {
+    public <Request extends ActionRequest, Response extends ActionResponse> void execute(Action<Response> action, Request request,
+            ActionListener<Response> listener) {
         client.execute(action, request, listener);
     }
 
-    @Override
-    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> RequestBuilder prepareExecute(
-            final Action<Request, Response, RequestBuilder> action) {
-        return client.prepareExecute(action);
-    }
-
     @Override
     public FieldCapabilitiesRequestBuilder prepareFieldCaps(final String... indices) {
         return client.prepareFieldCaps(indices);
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java
index a3e05c357..349156975 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java
@@ -104,7 +104,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         if (esCb.getPreference() != null) {
             builder.setPreference(esCb.getPreference());
         }
-        return (int) esCb.build(builder).execute().actionGet(searchTimeout).getHits().getTotalHits();
+        return (int) esCb.build(builder).execute().actionGet(searchTimeout).getHits().getTotalHits().value;
     }
 
     @Override
@@ -154,13 +154,14 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         });
 
         list.setPageSize(size);
-        list.setAllRecordCount((int) searchHits.getTotalHits());
+        list.setAllRecordCount((int) searchHits.getTotalHits().value);
         list.setCurrentPageNumber(cb.getFetchPageNumber());
 
         list.setTook(response.getTook().getMillis());
         list.setTotalShards(response.getTotalShards());
         list.setSuccessfulShards(response.getSuccessfulShards());
         list.setFailedShards(response.getFailedShards());
+        list.setTotalHits(searchHits.getTotalHits());
 
         list.setAggregation(response.getAggregations());
 
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java
index 7c6270078..6b546ee1f 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java
@@ -35,18 +35,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java
index 7bad4ecb6..488a33df8 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java
@@ -15,6 +15,7 @@
  */
 package org.codelibs.fess.es.config.allcommon;
 
+import org.apache.lucene.search.TotalHits;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.search.aggregations.Aggregations;
@@ -31,6 +32,7 @@ public class EsPagingResultBean<ENTITY> extends PagingResultBean<ENTITY> {
     private int totalShards;
     private int successfulShards;
     private int failedShards;
+    private TotalHits totalHits;
     private Aggregations aggregations;
 
     private SearchRequestBuilder builder;
@@ -83,4 +85,11 @@ public class EsPagingResultBean<ENTITY> extends PagingResultBean<ENTITY> {
         this.aggregations = aggregations;
     }
 
+    public TotalHits getTotalHits() {
+        return totalHits;
+    }
+
+    public void setTotalHits(TotalHits totalHits) {
+        this.totalHits = totalHits;
+    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
index 1f6f4cc88..859f17a23 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
index ee9cd2b9a..d35034215 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
index 67fbfebca..c326fa0b8 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
index 583aea2c7..c70feb233 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
index caa42d23f..a108250fa 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
index 975da468d..751d920f7 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
index 902ae577e..99c068e12 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
index 6621a60d0..e327ed02d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
index 47f31c147..6196a87fd 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
@@ -27,10 +27,10 @@ import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuil
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
index b8b1dbacf..ccdf6f59e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
index 5e96ed995..a480f5f73 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
index 4bc3f061c..c6b3ee547 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
index 539cd6613..e64588ddc 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
index 75a1d3ede..86d501734 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
index 0b0d09f3c..ca87cabd5 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
index e3c9c1446..271634261 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
index c4b58719c..d664ce2f3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
index af3c85f8e..71fd92ca8 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
index 0c9af50da..5922047b4 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
index 7b1742766..9f7ae7c2c 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
index e6cfac38b..dd326df2a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
index 25fd29651..b2eac4a57 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
index 96f3610f3..0c6e06dea 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
index d85f2db4c..1f88cd4a3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java
index 2b0788eed..b64876506 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java
@@ -104,7 +104,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         if (esCb.getPreference() != null) {
             builder.setPreference(esCb.getPreference());
         }
-        return (int) esCb.build(builder).execute().actionGet(searchTimeout).getHits().getTotalHits();
+        return (int) esCb.build(builder).execute().actionGet(searchTimeout).getHits().getTotalHits().value;
     }
 
     @Override
@@ -154,13 +154,14 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         });
 
         list.setPageSize(size);
-        list.setAllRecordCount((int) searchHits.getTotalHits());
+        list.setAllRecordCount((int) searchHits.getTotalHits().value);
         list.setCurrentPageNumber(cb.getFetchPageNumber());
 
         list.setTook(response.getTook().getMillis());
         list.setTotalShards(response.getTotalShards());
         list.setSuccessfulShards(response.getSuccessfulShards());
         list.setFailedShards(response.getFailedShards());
+        list.setTotalHits(searchHits.getTotalHits());
 
         list.setAggregation(response.getAggregations());
 
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java
index 75d29d12c..7d646e924 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java
@@ -35,18 +35,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java
index b1398af58..51ebe045c 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java
@@ -15,6 +15,7 @@
  */
 package org.codelibs.fess.es.log.allcommon;
 
+import org.apache.lucene.search.TotalHits;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.search.aggregations.Aggregations;
@@ -31,6 +32,7 @@ public class EsPagingResultBean<ENTITY> extends PagingResultBean<ENTITY> {
     private int totalShards;
     private int successfulShards;
     private int failedShards;
+    private TotalHits totalHits;
     private Aggregations aggregations;
 
     private SearchRequestBuilder builder;
@@ -83,4 +85,11 @@ public class EsPagingResultBean<ENTITY> extends PagingResultBean<ENTITY> {
         this.aggregations = aggregations;
     }
 
+    public TotalHits getTotalHits() {
+        return totalHits;
+    }
+
+    public void setTotalHits(TotalHits totalHits) {
+        this.totalHits = totalHits;
+    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java
index d3cb769cb..9bcba5668 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java
@@ -31,18 +31,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java
index cda86f85d..74dbdf1c4 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java
@@ -29,10 +29,10 @@ import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuil
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java
index 837660c83..3c3f2b574 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java
@@ -31,18 +31,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java
index dbe5b675f..7fec6c17f 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java
@@ -26,10 +26,10 @@ import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggre
 import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java
index 0f0f50932..c7db1ce06 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java
@@ -104,7 +104,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         if (esCb.getPreference() != null) {
             builder.setPreference(esCb.getPreference());
         }
-        return (int) esCb.build(builder).execute().actionGet(searchTimeout).getHits().getTotalHits();
+        return (int) esCb.build(builder).execute().actionGet(searchTimeout).getHits().getTotalHits().value;
     }
 
     @Override
@@ -154,13 +154,14 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         });
 
         list.setPageSize(size);
-        list.setAllRecordCount((int) searchHits.getTotalHits());
+        list.setAllRecordCount((int) searchHits.getTotalHits().value);
         list.setCurrentPageNumber(cb.getFetchPageNumber());
 
         list.setTook(response.getTook().getMillis());
         list.setTotalShards(response.getTotalShards());
         list.setSuccessfulShards(response.getSuccessfulShards());
         list.setFailedShards(response.getFailedShards());
+        list.setTotalHits(searchHits.getTotalHits());
 
         list.setAggregation(response.getAggregations());
 
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java
index d2a4a52cc..3e4aa19c6 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java
@@ -35,18 +35,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java
index a0734a49f..7c2bf72ca 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java
@@ -15,6 +15,7 @@
  */
 package org.codelibs.fess.es.user.allcommon;
 
+import org.apache.lucene.search.TotalHits;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.search.aggregations.Aggregations;
@@ -31,6 +32,7 @@ public class EsPagingResultBean<ENTITY> extends PagingResultBean<ENTITY> {
     private int totalShards;
     private int successfulShards;
     private int failedShards;
+    private TotalHits totalHits;
     private Aggregations aggregations;
 
     private SearchRequestBuilder builder;
@@ -83,4 +85,11 @@ public class EsPagingResultBean<ENTITY> extends PagingResultBean<ENTITY> {
         this.aggregations = aggregations;
     }
 
+    public TotalHits getTotalHits() {
+        return totalHits;
+    }
+
+    public void setTotalHits(TotalHits totalHits) {
+        this.totalHits = totalHits;
+    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java
index f37580a13..e3f10d326 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java
index 28c85bbca..0f44769ed 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java
@@ -27,10 +27,10 @@ import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuil
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java
index 3ea7b23e0..bc8f029b6 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java
@@ -29,18 +29,18 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilde
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
index e35391634..180b9b9b7 100644
--- a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
@@ -183,7 +183,6 @@ public class CrawlingInfoHelper {
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
         return fessEsClient.search(
                 fessConfig.getIndexDocumentSearchIndex(),
-                fessConfig.getIndexDocumentType(),
                 queryRequestBuilder -> {
                     queryRequestBuilder.setQuery(QueryBuilders.matchAllQuery());
                     final TermsAggregationBuilder termsBuilder =
diff --git a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
index 3217eb5aa..9c68951cb 100644
--- a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
@@ -257,7 +257,7 @@ public class DataIndexHelper {
                 final FessEsClient fessEsClient = ComponentUtil.getFessEsClient();
                 final String index = fessConfig.getIndexDocumentUpdateIndex();
                 fessEsClient.admin().indices().prepareRefresh(index).execute().actionGet();
-                final long numOfDeleted = fessEsClient.deleteByQuery(index, fessConfig.getIndexDocumentType(), queryBuilder);
+                final long numOfDeleted = fessEsClient.deleteByQuery(index, queryBuilder);
                 logger.info("Deleted {} old docs.", numOfDeleted);
             } catch (final Exception e) {
                 logger.error("Could not delete old docs at " + dataConfig, e);
diff --git a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
index 48914f6cd..24d0cb9f7 100644
--- a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
@@ -71,11 +71,10 @@ public class IndexingHelper {
             final CrawlingConfigHelper crawlingConfigHelper = ComponentUtil.getCrawlingConfigHelper();
             synchronized (fessEsClient) {
                 deleteOldDocuments(fessEsClient, docList);
-                fessEsClient.addAll(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(), docList,
-                        (doc, builder) -> {
-                            final String configId = (String) doc.get(fessConfig.getIndexFieldConfigId());
-                            crawlingConfigHelper.getPipeline(configId).ifPresent(s -> builder.setPipeline(s));
-                        });
+                fessEsClient.addAll(fessConfig.getIndexDocumentUpdateIndex(), docList, (doc, builder) -> {
+                    final String configId = (String) doc.get(fessConfig.getIndexFieldConfigId());
+                    crawlingConfigHelper.getPipeline(configId).ifPresent(s -> builder.setPipeline(s));
+                });
             }
             if (logger.isInfoEnabled()) {
                 if (docList.getContentSize() > 0) {
@@ -129,38 +128,38 @@ public class IndexingHelper {
             }
         }
         if (!docIdList.isEmpty()) {
-            fessEsClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(),
-                    QueryBuilders.idsQuery(fessConfig.getIndexDocumentType()).addIds(docIdList.stream().toArray(n -> new String[n])));
+            fessEsClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(),
+                    QueryBuilders.idsQuery().addIds(docIdList.stream().toArray(n -> new String[n])));
 
         }
     }
 
     public boolean updateDocument(final FessEsClient fessEsClient, final String id, final String field, final Object value) {
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
-        return fessEsClient.update(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(), id, field, value);
+        return fessEsClient.update(fessConfig.getIndexDocumentUpdateIndex(), id, field, value);
     }
 
     public boolean deleteDocument(final FessEsClient fessEsClient, final String id) {
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
-        return fessEsClient.delete(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(), id, 0);
+        return fessEsClient.delete(fessConfig.getIndexDocumentUpdateIndex(), id, 0);
     }
 
     public long deleteDocumentByUrl(final FessEsClient fessEsClient, final String url) {
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
-        return fessEsClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(),
+        return fessEsClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(),
                 QueryBuilders.termQuery(fessConfig.getIndexFieldUrl(), url));
     }
 
     public long deleteDocumentsByDocId(final FessEsClient fessEsClient, final List<String> docIdList) {
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
-        return fessEsClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(), QueryBuilders
-                .idsQuery(fessConfig.getIndexDocumentType()).addIds(docIdList.stream().toArray(n -> new String[n])));
+        return fessEsClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(),
+                QueryBuilders.idsQuery().addIds(docIdList.stream().toArray(n -> new String[n])));
     }
 
     public Map<String, Object> getDocument(final FessEsClient fessEsClient, final String id, final String[] fields) {
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
-        return fessEsClient.getDocument(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(), builder -> {
-            builder.setQuery(QueryBuilders.idsQuery(fessConfig.getIndexDocumentType()).addIds(id));
+        return fessEsClient.getDocument(fessConfig.getIndexDocumentUpdateIndex(), builder -> {
+            builder.setQuery(QueryBuilders.idsQuery().addIds(id));
             builder.setFetchSource(fields, null);
             return true;
         }).orElse(null);
@@ -174,7 +173,7 @@ public class IndexingHelper {
 
     public void deleteChildDocument(final FessEsClient fessEsClient, final String id) {
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
-        fessEsClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(),
+        fessEsClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(),
                 QueryBuilders.termQuery(fessConfig.getIndexFieldParentId(), id));
     }
 
@@ -189,19 +188,18 @@ public class IndexingHelper {
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
 
         final SearchResponse countResponse =
-                fessEsClient.prepareSearch(fessConfig.getIndexDocumentUpdateIndex()).setTypes(fessConfig.getIndexDocumentType())
-                        .setQuery(queryBuilder).setSize(0).execute().actionGet(fessConfig.getIndexSearchTimeout());
-        final long numFound = countResponse.getHits().getTotalHits();
+                fessEsClient.prepareSearch(fessConfig.getIndexDocumentUpdateIndex()).setQuery(queryBuilder).setSize(0).execute()
+                        .actionGet(fessConfig.getIndexSearchTimeout());
+        final long numFound = countResponse.getHits().getTotalHits().value;
         // TODO max threshold
 
-        return fessEsClient.getDocumentList(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(),
-                requestBuilder -> {
-                    requestBuilder.setQuery(queryBuilder).setSize((int) numFound);
-                    if (fields != null) {
-                        requestBuilder.setFetchSource(fields, null);
-                    }
-                    return true;
-                });
+        return fessEsClient.getDocumentList(fessConfig.getIndexDocumentUpdateIndex(), requestBuilder -> {
+            requestBuilder.setQuery(queryBuilder).setSize((int) numFound);
+            if (fields != null) {
+                requestBuilder.setFetchSource(fields, null);
+            }
+            return true;
+        });
 
     }
 
diff --git a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
index 8b1f678a5..583adf52c 100644
--- a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
@@ -120,7 +120,7 @@ public class KeyMatchHelper {
     protected List<Map<String, Object>> getDocumentList(final KeyMatch keyMatch) {
         final FessEsClient fessEsClient = ComponentUtil.getFessEsClient();
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
-        return fessEsClient.getDocumentList(fessConfig.getIndexDocumentSearchIndex(), fessConfig.getIndexDocumentType(),
+        return fessEsClient.getDocumentList(fessConfig.getIndexDocumentSearchIndex(),
                 searchRequestBuilder -> {
                     return SearchConditionBuilder.builder(searchRequestBuilder.setPreference(Constants.SEARCH_PREFERENCE_LOCAL))
                             .searchRequestType(SearchRequestType.ADMIN_SEARCH).size(keyMatch.getMaxSize()).query(keyMatch.getQuery())
@@ -161,11 +161,10 @@ public class KeyMatchHelper {
             return Collections.emptyList();
         }
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
-        return fessEsClient.getDocumentList(fessConfig.getIndexDocumentSearchIndex(), fessConfig.getIndexDocumentType(),
-                searchRequestBuilder -> {
-                    searchRequestBuilder.setPreference(Constants.SEARCH_PREFERENCE_LOCAL).setQuery(pair.getFirst()).setSize(size);
-                    return true;
-                });
+        return fessEsClient.getDocumentList(fessConfig.getIndexDocumentSearchIndex(), searchRequestBuilder -> {
+            searchRequestBuilder.setPreference(Constants.SEARCH_PREFERENCE_LOCAL).setQuery(pair.getFirst()).setSize(size);
+            return true;
+        });
     }
 
     private String toLowerCase(final String term) {
diff --git a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
index 6d32ac20c..6a87fbcb7 100644
--- a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
@@ -357,8 +357,8 @@ public class SearchLogHelper {
                                             new Script("ctx._source." + fessConfig.getIndexFieldClickCount() + "+=" + count.toString());
                                     final Map<String, Object> upsertMap = new HashMap<>();
                                     upsertMap.put(fessConfig.getIndexFieldClickCount(), count);
-                                    builder.add(new UpdateRequest(fessConfig.getIndexDocumentUpdateIndex(), fessConfig
-                                            .getIndexDocumentType(), id).script(script).upsert(upsertMap));
+                                    builder.add(new UpdateRequest(fessConfig.getIndexDocumentUpdateIndex(), id).script(script).upsert(
+                                            upsertMap));
                                 }
                             });
                 });
diff --git a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
index 5d8c79aad..7d1570742 100644
--- a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
@@ -206,7 +206,7 @@ public class SuggestHelper {
                         () -> {
                             final ESSourceReader reader =
                                     new ESSourceReader(ComponentUtil.getFessEsClient(), suggester.settings(),
-                                            fessConfig.getIndexDocumentSearchIndex(), fessConfig.getIndexDocumentType());
+                                            fessConfig.getIndexDocumentSearchIndex(), "_doc"); // TODO remove type
                             reader.setScrollSize(fessConfig.getSuggestSourceReaderScrollSizeAsInteger());
                             reader.setLimitDocNumPercentage(fessConfig.getSuggestUpdateContentsLimitNumPercentage());
                             reader.setLimitNumber(fessConfig.getSuggestUpdateContentsLimitNumAsInteger());
diff --git a/src/main/java/org/codelibs/fess/job/PurgeDocJob.java b/src/main/java/org/codelibs/fess/job/PurgeDocJob.java
index 61c2ed5ae..d5691d817 100644
--- a/src/main/java/org/codelibs/fess/job/PurgeDocJob.java
+++ b/src/main/java/org/codelibs/fess/job/PurgeDocJob.java
@@ -36,7 +36,7 @@ public class PurgeDocJob {
         // clean up
         final QueryBuilder queryBuilder = QueryBuilders.rangeQuery(fessConfig.getIndexFieldExpires()).to("now");
         try {
-            fessEsClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(), queryBuilder);
+            fessEsClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), queryBuilder);
 
         } catch (final Exception e) {
             logger.error("Could not delete expired documents: " + queryBuilder.toString(), e);
diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
index 136ab12ef..a61f76314 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
@@ -525,9 +525,6 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     /** The key of the configuration. e.g. fess.update */
     String INDEX_DOCUMENT_UPDATE_INDEX = "index.document.update.index";
 
-    /** The key of the configuration. e.g. doc */
-    String INDEX_DOCUMENT_TYPE = "index.document.type";
-
     /** The key of the configuration. e.g. fess */
     String INDEX_DOCUMENT_SUGGEST_INDEX = "index.document.suggest.index";
 
@@ -2969,13 +2966,6 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
      */
     String getIndexDocumentUpdateIndex();
 
-    /**
-     * Get the value for the key 'index.document.type'. <br>
-     * The value is, e.g. doc <br>
-     * @return The value of found property. (NotNull: if not found, exception but basically no way)
-     */
-    String getIndexDocumentType();
-
     /**
      * Get the value for the key 'index.document.suggest.index'. <br>
      * The value is, e.g. fess <br>
@@ -6877,10 +6867,6 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
             return get(FessConfig.INDEX_DOCUMENT_UPDATE_INDEX);
         }
 
-        public String getIndexDocumentType() {
-            return get(FessConfig.INDEX_DOCUMENT_TYPE);
-        }
-
         public String getIndexDocumentSuggestIndex() {
             return get(FessConfig.INDEX_DOCUMENT_SUGGEST_INDEX);
         }
@@ -8701,7 +8687,6 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
             defaultMap.put(FessConfig.RESPONSE_HIGHLIGHT_content_title_ENABLED, "true");
             defaultMap.put(FessConfig.INDEX_DOCUMENT_SEARCH_INDEX, "fess.search");
             defaultMap.put(FessConfig.INDEX_DOCUMENT_UPDATE_INDEX, "fess.update");
-            defaultMap.put(FessConfig.INDEX_DOCUMENT_TYPE, "doc");
             defaultMap.put(FessConfig.INDEX_DOCUMENT_SUGGEST_INDEX, "fess");
             defaultMap.put(FessConfig.INDEX_DOCUMENT_CRAWLER_INDEX, ".crawler");
             defaultMap.put(FessConfig.INDEX_DOCUMENT_CRAWLER_QUEUE_number_of_shards, "10");
diff --git a/src/main/java/org/codelibs/fess/score/ScoreBooster.java b/src/main/java/org/codelibs/fess/score/ScoreBooster.java
index fc777a734..0281dab70 100644
--- a/src/main/java/org/codelibs/fess/score/ScoreBooster.java
+++ b/src/main/java/org/codelibs/fess/score/ScoreBooster.java
@@ -73,10 +73,9 @@ public abstract class ScoreBooster {
             bulkRequestBuilder = client.prepareBulk();
         }
         final String index = fessConfig.getIndexDocumentUpdateIndex();
-        final String type = fessConfig.getIndexDocumentType();
         for (final String id : ids) {
-            bulkRequestBuilder.add(client.prepareUpdate(index, type, id).setScript(
-                    new Script(ScriptType.INLINE, scriptLang, scriptCode, params)));
+            bulkRequestBuilder.add(client.prepareUpdate().setIndex(index).setId(id)
+                    .setScript(new Script(ScriptType.INLINE, scriptLang, scriptCode, params)));
         }
         if (bulkRequestBuilder.numberOfActions() > requestCacheSize) {
             flush();
diff --git a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
index b83d278b7..2a9879ab5 100644
--- a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
+++ b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
@@ -380,7 +380,6 @@ public class ThumbnailManager {
                 final String docIdField = fessConfig.getIndexFieldDocId();
                 fessEsClient.getDocumentList(
                         fessConfig.getIndexDocumentSearchIndex(),
-                        fessConfig.getIndexDocumentType(),
                         searchRequestBuilder -> {
                             searchRequestBuilder.setQuery(QueryBuilders.termsQuery(docIdField,
                                     deleteFileMap.keySet().toArray(new String[deleteFileMap.size()])));
diff --git a/src/main/java/org/codelibs/fess/util/QueryResponseList.java b/src/main/java/org/codelibs/fess/util/QueryResponseList.java
index 0e4e6ba35..76bb53a1f 100644
--- a/src/main/java/org/codelibs/fess/util/QueryResponseList.java
+++ b/src/main/java/org/codelibs/fess/util/QueryResponseList.java
@@ -92,7 +92,7 @@ public class QueryResponseList implements List<Map<String, Object>> {
         searchResponseOpt.ifPresent(searchResponse -> {
             final FessConfig fessConfig = ComponentUtil.getFessConfig();
             final SearchHits searchHits = searchResponse.getHits();
-            allRecordCount = searchHits.getTotalHits();
+            allRecordCount = searchHits.getTotalHits().value;
             queryTime = searchResponse.getTook().millis();
 
             if (searchResponse.getTotalShards() != searchResponse.getSuccessfulShards()) {
@@ -110,7 +110,7 @@ public class QueryResponseList implements List<Map<String, Object>> {
                         if (innerHits != null) {
                             final SearchHits innerSearchHits = innerHits.get(fessConfig.getQueryCollapseInnerHitsName());
                             if (innerSearchHits != null) {
-                                final long totalHits = innerSearchHits.getTotalHits();
+                                final long totalHits = innerSearchHits.getTotalHits().value;
                                 if (totalHits > 1) {
                                     docMap.put(fessConfig.getQueryCollapseInnerHitsName() + "_count", totalHits);
                                     final DocumentField bitsField = searchHit.getFields().get(fessConfig.getIndexFieldContentMinhashBits());
diff --git a/src/main/java/org/codelibs/fess/util/UpgradeUtil.java b/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
index cc0039c0e..0c166fe5c 100644
--- a/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
+++ b/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
@@ -104,7 +104,7 @@ public final class UpgradeUtil {
             }
             try {
                 final AcknowledgedResponse putMappingResponse =
-                        indicesClient.preparePutMapping(index).setType(type).setSource(source, XContentType.JSON).execute()
+                        indicesClient.preparePutMapping(index).setSource(source, XContentType.JSON).execute()
                                 .actionGet(fessConfig.getIndexIndicesTimeout());
                 if (putMappingResponse.isAcknowledged()) {
                     logger.info("Created " + index + "/" + type + " mapping.");
@@ -128,7 +128,7 @@ public final class UpgradeUtil {
         if (fieldMappings == null || fieldMappings.isNull()) {
             try {
                 final AcknowledgedResponse pmResponse =
-                        indicesClient.preparePutMapping(index).setType(type).setSource(source, XContentType.JSON).execute().actionGet();
+                        indicesClient.preparePutMapping(index).setSource(source, XContentType.JSON).execute().actionGet();
                 if (!pmResponse.isAcknowledged()) {
                     logger.warn("Failed to add " + field + " to " + index + "/" + type);
                 } else {
@@ -148,9 +148,6 @@ public final class UpgradeUtil {
     public static boolean putMapping(final IndicesAdminClient indicesClient, final String index, final String type, final String source) {
         try {
             final PutMappingRequestBuilder builder = indicesClient.preparePutMapping(index).setSource(source, XContentType.JSON);
-            if (type != null) {
-                builder.setType(type);
-            }
             final AcknowledgedResponse pmResponse = builder.execute().actionGet();
             if (!pmResponse.isAcknowledged()) {
                 logger.warn("Failed to update " + index + " settings.");
diff --git a/src/main/resources/esclient.xml b/src/main/resources/esclient.xml
index ee2bc1f94..2d53c1de5 100644
--- a/src/main/resources/esclient.xml
+++ b/src/main/resources/esclient.xml
@@ -6,6 +6,8 @@
 		<property name="settings">
 			{"http.cors.enabled":"true",
 			 "http.cors.allow-origin":"*",
+			 "discovery.seed_hosts":"127.0.0.1:9301",
+			 "cluster.initial_master_nodes":"127.0.0.1:9301",
 			 "action.auto_create_index":"-*"}
 <!--
 			{"http.cors.enabled":"true",
diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties
index 0437554e5..cca87865d 100644
--- a/src/main/resources/fess_config.properties
+++ b/src/main/resources/fess_config.properties
@@ -272,7 +272,6 @@ response.highlight.content_title.enabled=true
 # document index
 index.document.search.index=fess.search
 index.document.update.index=fess.update
-index.document.type=doc
 index.document.suggest.index=fess
 index.document.crawler.index=.crawler
 index.document.crawler.queue.number_of_shards=10
diff --git a/src/main/resources/fess_indices/.fess_config.access_token/access_token.json b/src/main/resources/fess_indices/.fess_config.access_token/access_token.json
index 46b5f9cf4..abc9b34d2 100644
--- a/src/main/resources/fess_indices/.fess_config.access_token/access_token.json
+++ b/src/main/resources/fess_indices/.fess_config.access_token/access_token.json
@@ -1,8 +1,4 @@
 {
-  "access_token": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "name": {
         "type": "keyword"
@@ -32,5 +28,4 @@
         "type": "long"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.bad_word/bad_word.json b/src/main/resources/fess_indices/.fess_config.bad_word/bad_word.json
index f1e9a750f..5e9ec95f2 100644
--- a/src/main/resources/fess_indices/.fess_config.bad_word/bad_word.json
+++ b/src/main/resources/fess_indices/.fess_config.bad_word/bad_word.json
@@ -1,8 +1,4 @@
 {
-  "bad_word": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "suggestWord": {
         "type": "keyword"
@@ -26,5 +22,4 @@
         "type": "long"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.boost_document_rule/boost_document_rule.json b/src/main/resources/fess_indices/.fess_config.boost_document_rule/boost_document_rule.json
index 80d10c5ed..52385133f 100644
--- a/src/main/resources/fess_indices/.fess_config.boost_document_rule/boost_document_rule.json
+++ b/src/main/resources/fess_indices/.fess_config.boost_document_rule/boost_document_rule.json
@@ -1,8 +1,4 @@
 {
-  "boost_document_rule": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "urlExpr": {
         "type": "keyword"
@@ -26,5 +22,4 @@
         "type": "long"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.crawling_info/crawling_info.json b/src/main/resources/fess_indices/.fess_config.crawling_info/crawling_info.json
index 0b01f1020..28caac33d 100644
--- a/src/main/resources/fess_indices/.fess_config.crawling_info/crawling_info.json
+++ b/src/main/resources/fess_indices/.fess_config.crawling_info/crawling_info.json
@@ -1,8 +1,4 @@
 {
-  "crawling_info": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "sessionId": {
         "type": "keyword"
@@ -17,5 +13,4 @@
         "type": "long"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.crawling_info_param/crawling_info_param.json b/src/main/resources/fess_indices/.fess_config.crawling_info_param/crawling_info_param.json
index bfb64a528..0c192cfac 100644
--- a/src/main/resources/fess_indices/.fess_config.crawling_info_param/crawling_info_param.json
+++ b/src/main/resources/fess_indices/.fess_config.crawling_info_param/crawling_info_param.json
@@ -1,8 +1,4 @@
 {
-  "crawling_info_param": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "crawlingInfoId": {
         "type": "keyword"
@@ -17,5 +13,4 @@
         "type": "long"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.data_config/data_config.json b/src/main/resources/fess_indices/.fess_config.data_config/data_config.json
index 55aad7c25..dea7529e0 100644
--- a/src/main/resources/fess_indices/.fess_config.data_config/data_config.json
+++ b/src/main/resources/fess_indices/.fess_config.data_config/data_config.json
@@ -1,8 +1,4 @@
 {
-  "data_config": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "name": {
         "type": "keyword"
@@ -47,5 +43,4 @@
         "type": "text"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.duplicate_host/duplicate_host.json b/src/main/resources/fess_indices/.fess_config.duplicate_host/duplicate_host.json
index 454b83e8d..e3f7fa341 100644
--- a/src/main/resources/fess_indices/.fess_config.duplicate_host/duplicate_host.json
+++ b/src/main/resources/fess_indices/.fess_config.duplicate_host/duplicate_host.json
@@ -1,8 +1,4 @@
 {
-  "duplicate_host": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "regularName": {
         "type": "keyword"
@@ -26,5 +22,4 @@
         "type": "long"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.elevate_word/elevate_word.json b/src/main/resources/fess_indices/.fess_config.elevate_word/elevate_word.json
index 3cf06ff15..723b4b870 100644
--- a/src/main/resources/fess_indices/.fess_config.elevate_word/elevate_word.json
+++ b/src/main/resources/fess_indices/.fess_config.elevate_word/elevate_word.json
@@ -1,8 +1,4 @@
 {
-  "elevate_word": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "suggestWord": {
         "type": "keyword"
@@ -35,5 +31,4 @@
         "type": "long"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.elevate_word_to_label/elevate_word_to_label.json b/src/main/resources/fess_indices/.fess_config.elevate_word_to_label/elevate_word_to_label.json
index af8f98a3c..c20b58dfc 100644
--- a/src/main/resources/fess_indices/.fess_config.elevate_word_to_label/elevate_word_to_label.json
+++ b/src/main/resources/fess_indices/.fess_config.elevate_word_to_label/elevate_word_to_label.json
@@ -1,8 +1,4 @@
 {
-  "elevate_word_to_label": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "elevateWordId": {
         "type": "keyword"
@@ -11,5 +7,4 @@
         "type": "keyword"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.failure_url/failure_url.json b/src/main/resources/fess_indices/.fess_config.failure_url/failure_url.json
index 180b676b5..9915feb9a 100644
--- a/src/main/resources/fess_indices/.fess_config.failure_url/failure_url.json
+++ b/src/main/resources/fess_indices/.fess_config.failure_url/failure_url.json
@@ -1,8 +1,4 @@
 {
-  "failure_url": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "url": {
         "type": "keyword"
@@ -26,5 +22,4 @@
         "type": "keyword"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.file_authentication/file_authentication.json b/src/main/resources/fess_indices/.fess_config.file_authentication/file_authentication.json
index 5c66adb25..e085b8d35 100644
--- a/src/main/resources/fess_indices/.fess_config.file_authentication/file_authentication.json
+++ b/src/main/resources/fess_indices/.fess_config.file_authentication/file_authentication.json
@@ -1,8 +1,4 @@
 {
-  "file_authentication": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "hostname": {
         "type": "keyword"
@@ -38,5 +34,4 @@
         "type": "long"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.file_config/file_config.json b/src/main/resources/fess_indices/.fess_config.file_config/file_config.json
index 87dd794b2..78b5f1af1 100644
--- a/src/main/resources/fess_indices/.fess_config.file_config/file_config.json
+++ b/src/main/resources/fess_indices/.fess_config.file_config/file_config.json
@@ -1,8 +1,4 @@
 {
-  "file_config": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "name": {
         "type": "keyword"
@@ -71,5 +67,4 @@
         "type": "text"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.job_log/job_log.json b/src/main/resources/fess_indices/.fess_config.job_log/job_log.json
index 6ba852dec..93ceb8fd4 100644
--- a/src/main/resources/fess_indices/.fess_config.job_log/job_log.json
+++ b/src/main/resources/fess_indices/.fess_config.job_log/job_log.json
@@ -1,8 +1,4 @@
 {
-  "job_log": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "jobName": {
         "type": "keyword"
@@ -32,5 +28,4 @@
         "type": "long"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.key_match/key_match.json b/src/main/resources/fess_indices/.fess_config.key_match/key_match.json
index 4cc8677d6..a56b21a00 100644
--- a/src/main/resources/fess_indices/.fess_config.key_match/key_match.json
+++ b/src/main/resources/fess_indices/.fess_config.key_match/key_match.json
@@ -1,8 +1,4 @@
 {
-  "key_match": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "term": {
         "type": "keyword"
@@ -32,5 +28,4 @@
         "type": "long"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.label_type/label_type.json b/src/main/resources/fess_indices/.fess_config.label_type/label_type.json
index fd4254ab2..ffcbef381 100644
--- a/src/main/resources/fess_indices/.fess_config.label_type/label_type.json
+++ b/src/main/resources/fess_indices/.fess_config.label_type/label_type.json
@@ -1,8 +1,4 @@
 {
-  "label_type": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "name": {
         "type": "keyword"
@@ -38,5 +34,4 @@
         "type": "long"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.path_mapping/path_mapping.json b/src/main/resources/fess_indices/.fess_config.path_mapping/path_mapping.json
index 65e3a7f5e..6d50f049c 100644
--- a/src/main/resources/fess_indices/.fess_config.path_mapping/path_mapping.json
+++ b/src/main/resources/fess_indices/.fess_config.path_mapping/path_mapping.json
@@ -1,8 +1,4 @@
 {
-  "path_mapping": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "regex": {
         "type": "keyword"
@@ -32,5 +28,4 @@
         "type": "long"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.related_content/related_content.json b/src/main/resources/fess_indices/.fess_config.related_content/related_content.json
index 0b9238dd4..30ec1926b 100644
--- a/src/main/resources/fess_indices/.fess_config.related_content/related_content.json
+++ b/src/main/resources/fess_indices/.fess_config.related_content/related_content.json
@@ -1,8 +1,4 @@
 {
-  "related_content": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "term": {
         "type": "keyword"
@@ -29,5 +25,4 @@
         "type": "long"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.related_query/related_query.json b/src/main/resources/fess_indices/.fess_config.related_query/related_query.json
index d8baece59..9e48837c7 100644
--- a/src/main/resources/fess_indices/.fess_config.related_query/related_query.json
+++ b/src/main/resources/fess_indices/.fess_config.related_query/related_query.json
@@ -1,8 +1,4 @@
 {
-  "related_query": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "term": {
         "type": "keyword"
@@ -26,5 +22,4 @@
         "type": "long"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.request_header/request_header.json b/src/main/resources/fess_indices/.fess_config.request_header/request_header.json
index d29c5fcfd..e652418bc 100644
--- a/src/main/resources/fess_indices/.fess_config.request_header/request_header.json
+++ b/src/main/resources/fess_indices/.fess_config.request_header/request_header.json
@@ -1,8 +1,4 @@
 {
-  "request_header": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "name": {
         "type": "keyword"
@@ -26,5 +22,4 @@
         "type": "long"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.role_type/role_type.json b/src/main/resources/fess_indices/.fess_config.role_type/role_type.json
index e7f306819..75a3dc5c1 100644
--- a/src/main/resources/fess_indices/.fess_config.role_type/role_type.json
+++ b/src/main/resources/fess_indices/.fess_config.role_type/role_type.json
@@ -1,8 +1,4 @@
 {
-  "role_type": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "name": {
         "type": "keyword"
@@ -26,5 +22,4 @@
         "type": "long"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.bulk b/src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.bulk
index 32222db64..a746312dc 100644
--- a/src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.bulk
+++ b/src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.bulk
@@ -1,20 +1,20 @@
-{"index":{"_index":".fess_config","_type":"scheduled_job","_id":"default_crawler"}}
+{"index":{"_index":".fess_config.scheduled_job","_id":"default_crawler"}}
 {"name":"Default Crawler","target":"all","cronExpression":"0 0 * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"crawlJob\").logLevel(\"info\").execute(executor);","jobLogging":true,"crawler":true,"available":true,"sortOrder":1,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
-{"index":{"_index":".fess_config","_type":"scheduled_job","_id":"suggest_indexer"}}
+{"index":{"_index":".fess_config.scheduled_job","_id":"suggest_indexer"}}
 {"name":"Suggest Indexer","target":"all","cronExpression":"0 12 * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"suggestJob\").logLevel(\"info\").sessionId(\"SUGGEST\").execute(executor);","jobLogging":true,"crawler":false,"available":true,"sortOrder":2,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
-{"index":{"_index":".fess_config","_type":"scheduled_job","_id":"log_aggregator"}}
+{"index":{"_index":".fess_config.scheduled_job","_id":"log_aggregator"}}
 {"name":"Log Aggregator","target":"all","cronExpression":"* * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"aggregateLogJob\").execute();","jobLogging":false,"crawler":false,"available":true,"sortOrder":3,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
-{"index":{"_index":".fess_config","_type":"scheduled_job","_id":"log_purger"}}
+{"index":{"_index":".fess_config.scheduled_job","_id":"log_purger"}}
 {"name":"Log Purger","target":"all","cronExpression":"0 0 * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"purgeLogJob\").execute();","jobLogging":false,"crawler":false,"available":true,"sortOrder":4,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
-{"index":{"_index":".fess_config","_type":"scheduled_job","_id":"doc_purger"}}
+{"index":{"_index":".fess_config.scheduled_job","_id":"doc_purger"}}
 {"name":"Doc Purger","target":"all","cronExpression":"* * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"purgeDocJob\").execute();","jobLogging":false,"crawler":false,"available":true,"sortOrder":5,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
-{"index":{"_index":".fess_config","_type":"scheduled_job","_id":"thumbnail_generate"}}
+{"index":{"_index":".fess_config.scheduled_job","_id":"thumbnail_generate"}}
 {"name":"Thumbnail Generator","target":"all","cronExpression":"* * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"generateThumbnailJob\").execute();","jobLogging":false,"crawler":false,"available":true,"sortOrder":6,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
-{"index":{"_index":".fess_config","_type":"scheduled_job","_id":"thumbnail_purger"}}
+{"index":{"_index":".fess_config.scheduled_job","_id":"thumbnail_purger"}}
 {"name":"Thumbnail Purger","target":"all","cronExpression":"0 0 * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"purgeThumbnailJob\").expiry(30 * 24 * 60 * 60 * 1000L).execute();","jobLogging":true,"crawler":false,"available":true,"sortOrder":7,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
-{"index":{"_index":".fess_config","_type":"scheduled_job","_id":"reload_config"}}
+{"index":{"_index":".fess_config.scheduled_job","_id":"reload_config"}}
 {"name":"Config Reloader","target":"all","cronExpression":"*/10 * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"systemHelper\").updateConfiguration();","jobLogging":false,"crawler":false,"available":true,"sortOrder":8,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
-{"index":{"_index":".fess_config","_type":"scheduled_job","_id":"ping_es"}}
+{"index":{"_index":".fess_config.scheduled_job","_id":"ping_es"}}
 {"name":"Ping Elasticsearch","target":"all","cronExpression":"* * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"pingEsJob\").execute();","jobLogging":false,"crawler":false,"available":true,"sortOrder":9,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
-{"index":{"_index":".fess_config","_type":"scheduled_job","_id":"score_booster"}}
+{"index":{"_index":".fess_config.scheduled_job","_id":"score_booster"}}
 {"name":"Score Updater","target":"all","cronExpression":"0 * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"scoreUpdater\").execute();","jobLogging":false,"crawler":false,"available":true,"sortOrder":10,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
diff --git a/src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.json b/src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.json
index b9e0e1489..42eace7d3 100644
--- a/src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.json
+++ b/src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.json
@@ -1,8 +1,4 @@
 {
-  "scheduled_job": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "name": {
         "type": "keyword"
@@ -44,5 +40,4 @@
         "type": "long"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.thumbnail_queue/thumbnail_queue.json b/src/main/resources/fess_indices/.fess_config.thumbnail_queue/thumbnail_queue.json
index 5b85873c0..26df30f07 100644
--- a/src/main/resources/fess_indices/.fess_config.thumbnail_queue/thumbnail_queue.json
+++ b/src/main/resources/fess_indices/.fess_config.thumbnail_queue/thumbnail_queue.json
@@ -1,8 +1,4 @@
 {
-  "thumbnail_queue": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "thumbnail_id": {
         "type": "keyword"
@@ -23,5 +19,4 @@
         "type": "keyword"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.web_authentication/web_authentication.json b/src/main/resources/fess_indices/.fess_config.web_authentication/web_authentication.json
index b5541fa17..685ad5be9 100644
--- a/src/main/resources/fess_indices/.fess_config.web_authentication/web_authentication.json
+++ b/src/main/resources/fess_indices/.fess_config.web_authentication/web_authentication.json
@@ -1,8 +1,4 @@
 {
-  "web_authentication": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "hostname": {
         "type": "keyword"
@@ -41,5 +37,4 @@
         "type": "long"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_config.web_config/web_config.json b/src/main/resources/fess_indices/.fess_config.web_config/web_config.json
index d4cc59530..9c700f048 100644
--- a/src/main/resources/fess_indices/.fess_config.web_config/web_config.json
+++ b/src/main/resources/fess_indices/.fess_config.web_config/web_config.json
@@ -1,8 +1,4 @@
 {
-  "web_config": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "name": {
         "type": "keyword"
@@ -74,5 +70,4 @@
         "type": "text"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_user.group/group.json b/src/main/resources/fess_indices/.fess_user.group/group.json
index c73ca1771..dfc212ed9 100644
--- a/src/main/resources/fess_indices/.fess_user.group/group.json
+++ b/src/main/resources/fess_indices/.fess_user.group/group.json
@@ -1,8 +1,4 @@
 {
-  "group": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "name": {
         "type": "keyword"
@@ -11,5 +7,4 @@
         "type" : "long"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_user.role/role.bulk b/src/main/resources/fess_indices/.fess_user.role/role.bulk
index b656f3d15..1227c0a27 100644
--- a/src/main/resources/fess_indices/.fess_user.role/role.bulk
+++ b/src/main/resources/fess_indices/.fess_user.role/role.bulk
@@ -1,4 +1,4 @@
-{"index":{"_index":".fess_user","_type":"role","_id":"YWRtaW4="}}
+{"index":{"_index":".fess_user.role","_id":"YWRtaW4="}}
 {"name":"admin"}
-{"index":{"_index":".fess_user","_type":"role","_id":"Z3Vlc3Q="}}
+{"index":{"_index":".fess_user.role","_id":"Z3Vlc3Q="}}
 {"name":"guest"}
diff --git a/src/main/resources/fess_indices/.fess_user.role/role.json b/src/main/resources/fess_indices/.fess_user.role/role.json
index 89ab16f58..fcfec8986 100644
--- a/src/main/resources/fess_indices/.fess_user.role/role.json
+++ b/src/main/resources/fess_indices/.fess_user.role/role.json
@@ -1,12 +1,7 @@
 {
-  "role": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "name": {
         "type": "keyword"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/.fess_user.user/user.bulk b/src/main/resources/fess_indices/.fess_user.user/user.bulk
index c74717ca6..0a50302ce 100644
--- a/src/main/resources/fess_indices/.fess_user.user/user.bulk
+++ b/src/main/resources/fess_indices/.fess_user.user/user.bulk
@@ -1,2 +1,2 @@
-{"index":{"_index":".fess_user","_type":"user","_id":"YWRtaW4="}}
+{"index":{"_index":".fess_user.user","_id":"YWRtaW4="}}
 {"password":"8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918","surname":"admin","roles":["YWRtaW4=","Z3Vlc3Q="],"name":"admin"}
diff --git a/src/main/resources/fess_indices/.fess_user.user/user.json b/src/main/resources/fess_indices/.fess_user.user/user.json
index 39b16425d..36cc26142 100644
--- a/src/main/resources/fess_indices/.fess_user.user/user.json
+++ b/src/main/resources/fess_indices/.fess_user.user/user.json
@@ -1,8 +1,4 @@
 {
-  "user": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "name": {
         "type": "keyword"
@@ -125,5 +121,4 @@
         "type": "keyword"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/fess/doc.json b/src/main/resources/fess_indices/fess/doc.json
index 66ed20e66..8b5bcdae7 100644
--- a/src/main/resources/fess_indices/fess/doc.json
+++ b/src/main/resources/fess_indices/fess/doc.json
@@ -1,8 +1,4 @@
 {
-  "doc": {
-    "_source": {
-      "enabled": true
-    },
     "dynamic_templates": [
       {
         "lang_ar": {
@@ -496,14 +492,11 @@
         "type": "keyword"
       },
       "important_content": {
-        "type": "langstring",
-        "lang_field": "lang",
-        "lang_base_name": "title",
+        "type": "text",
         "index": false
       },
       "content": {
-        "type": "langstring",
-        "lang_field": "lang",
+        "type": "text",
         "analyzer": "standard_analyzer",
         "term_vector": "with_positions_offsets"
       },
@@ -581,8 +574,7 @@
         "type": "keyword"
       },
       "title": {
-        "type": "langstring",
-        "lang_field": "lang",
+        "type": "text",
         "analyzer": "standard_analyzer",
         "term_vector": "with_positions_offsets"
       },
@@ -593,5 +585,4 @@
         "type": "keyword"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/fess_log.click_log/click_log.json b/src/main/resources/fess_indices/fess_log.click_log/click_log.json
index 05f74702f..f1ad5b4e0 100644
--- a/src/main/resources/fess_indices/fess_log.click_log/click_log.json
+++ b/src/main/resources/fess_indices/fess_log.click_log/click_log.json
@@ -1,8 +1,4 @@
 {
-  "click_log": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "urlId": {
         "type": "keyword"
@@ -31,5 +27,4 @@
         "format": "date_optional_time"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/fess_log.favorite_log/favorite_log.json b/src/main/resources/fess_indices/fess_log.favorite_log/favorite_log.json
index 5370319e2..2b25a1e00 100644
--- a/src/main/resources/fess_indices/fess_log.favorite_log/favorite_log.json
+++ b/src/main/resources/fess_indices/fess_log.favorite_log/favorite_log.json
@@ -1,8 +1,4 @@
 {
-  "favorite_log": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "userInfoId": {
         "type": "keyword"
@@ -21,5 +17,4 @@
         "format": "date_optional_time"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/fess_log.search_log/search_log.json b/src/main/resources/fess_indices/fess_log.search_log/search_log.json
index d2addf8fc..315160ce2 100644
--- a/src/main/resources/fess_indices/fess_log.search_log/search_log.json
+++ b/src/main/resources/fess_indices/fess_log.search_log/search_log.json
@@ -1,8 +1,4 @@
 {
-  "search_log": {
-    "_source": {
-      "enabled": true
-    },
     "dynamic_templates": [
       {
         "search_fields": {
@@ -78,5 +74,4 @@
         "type" : "keyword"
       }
     }
-  }
 }
diff --git a/src/main/resources/fess_indices/fess_log.user_info/user_info.json b/src/main/resources/fess_indices/fess_log.user_info/user_info.json
index e8ef63317..fb3b14080 100644
--- a/src/main/resources/fess_indices/fess_log.user_info/user_info.json
+++ b/src/main/resources/fess_indices/fess_log.user_info/user_info.json
@@ -1,8 +1,4 @@
 {
-  "user_info": {
-    "_source": {
-      "enabled": true
-    },
     "properties": {
       "createdAt": {
         "type": "date",
@@ -13,5 +9,4 @@
         "format": "date_optional_time"
       }
     }
-  }
 }