diff --git a/plugin.xml b/plugin.xml
index 567a37319..8412a9d59 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -22,12 +22,12 @@
 		</antcall>
 		<!-- 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.3.1" />
-			<param name="plugin.zip.version" value="6.3.1" />
+			<param name="plugin.version" value="6.3.2-SNAPSHOT" />
+			<param name="plugin.zip.version" value="6.3.2-20180805.010401-1" />
 		</antcall>
 		<!-- configsync -->
 		<antcall target="install.plugin">
diff --git a/src/main/resources/fess_indices/fess.json b/src/main/resources/fess_indices/fess.json
index 7510eaf1b..9362a0909 100644
--- a/src/main/resources/fess_indices/fess.json
+++ b/src/main/resources/fess_indices/fess.json
@@ -686,14 +686,18 @@
             "ambiguities_resolved": false
         },
         "unigram_tokenizer": {
-          "type": "ngram",
-          "min_gram": "1",
-          "max_gram": "1"
+          "type": "ngram_synonym",
+          "n": "1",
+          "synonyms_path": "${fess.dictionary.path}synonym.txt",
+          "dynamic_reload": true,
+          "reload_interval": "1m"
         },
         "bigram_tokenizer": {
-          "type": "ngram",
-          "min_gram": "2",
-          "max_gram": "2"
+          "type": "ngram_synonym",
+          "n": "2",
+          "synonyms_path": "${fess.dictionary.path}synonym.txt",
+          "dynamic_reload": true,
+          "reload_interval": "1m"
         }
       },
       "analyzer": {
@@ -1137,10 +1141,9 @@
           "tokenizer": "unigram_tokenizer",
           "filter": [
             "alphanum_word_filter",
+            "cjk_bigram",
             "lowercase",
             "stopword_en_filter",
-            "synonym_filter",
-            "cjk_bigram",
             "english_keywords",
             "english_override",
             "stemmer_en_filter"
@@ -1161,10 +1164,9 @@
           "tokenizer": "unigram_tokenizer",
           "filter": [
             "alphanum_word_filter",
+            "cjk_bigram",
             "lowercase",
             "stopword_en_filter",
-            "synonym_filter",
-            "cjk_bigram",
             "english_keywords",
             "english_override",
             "stemmer_en_filter",