diff --git a/src/main/resources/fess_indices/fess/fa/mapping.txt b/src/main/resources/fess_indices/fess/fa/mapping.txt
index 753bf19b5..3633bee7b 100644
--- a/src/main/resources/fess_indices/fess/fa/mapping.txt
+++ b/src/main/resources/fess_indices/fess/fa/mapping.txt
@@ -1,5 +1,33 @@
 
-\u0009,\u000A,\u000B,\u000C,\u000D,\u001C,\u001D,\u001E,\u001F,\u00A0,\u1680,\u180E,\u2000,\u2001,\u2002,\u2003,\u2004,\u2005,\u2006,\u2007,\u2008,\u2009,\u200A,\u200B,\u200C,\u202F,\u205F,\u3000,\uFEFF=>\u0020
+\u0009 => \u0020
+\u000A => \u0020
+\u000B => \u0020
+\u000C => \u0020
+\u000D => \u0020
+\u001C => \u0020
+\u001D => \u0020
+\u001E => \u0020
+\u001F => \u0020
+\u00A0 => \u0020
+\u1680 => \u0020
+\u180E => \u0020
+\u2000 => \u0020
+\u2001 => \u0020
+\u2002 => \u0020
+\u2003 => \u0020
+\u2004 => \u0020
+\u2005 => \u0020
+\u2006 => \u0020
+\u2007 => \u0020
+\u2008 => \u0020
+\u2009 => \u0020
+\u200A => \u0020
+\u200B => \u0020
+\u200C => \u0020
+\u202F => \u0020
+\u205F => \u0020
+\u3000 => \u0020
+\uFEFF => \u0020
 
 \u064A => \u06CC
 \u0643 => \u06A9
diff --git a/src/main/resources/fess_indices/fess/ja/mapping.txt b/src/main/resources/fess_indices/fess/ja/mapping.txt
index 9f886030a..cae877c25 100644
--- a/src/main/resources/fess_indices/fess/ja/mapping.txt
+++ b/src/main/resources/fess_indices/fess/ja/mapping.txt
@@ -14,8 +14,41 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-\u0009,\u000A,\u000B,\u000C,\u000D,\u001C,\u001D,\u001E,\u001F,\u00A0,\u1680,\u180E,\u2000,\u2001,\u2002,\u2003,\u2004,\u2005,\u2006,\u2007,\u2008,\u2009,\u200A,\u200B,\u202F,\u205F,\u3000,\uFEFF => \u0020
-~,˜,῀,⁓,∼,∿,～ => 〜
+\u0009 => \u0020
+\u000A => \u0020
+\u000B => \u0020
+\u000C => \u0020
+\u000D => \u0020
+\u001C => \u0020
+\u001D => \u0020
+\u001E => \u0020
+\u001F => \u0020
+\u00A0 => \u0020
+\u1680 => \u0020
+\u180E => \u0020
+\u2000 => \u0020
+\u2001 => \u0020
+\u2002 => \u0020
+\u2003 => \u0020
+\u2004 => \u0020
+\u2005 => \u0020
+\u2006 => \u0020
+\u2007 => \u0020
+\u2008 => \u0020
+\u2009 => \u0020
+\u200A => \u0020
+\u200B => \u0020
+\u202F => \u0020
+\u205F => \u0020
+\u3000 => \u0020
+\uFEFF => \u0020
+~ => 〜
+˜ => 〜
+῀ => 〜
+⁓ => 〜
+∼ => 〜
+∿ => 〜
+～ => 〜
 
 Ａ => A
 Ｂ => B
@@ -708,7 +741,9 @@
 杤 => 栃
 屆 => 届
 繩 => 縄
-貳,貮,弍  => 弐
+貳 => 弐
+貮 => 弐
+弍 => 弐
 邇 => 迩
 韭 => 韮
 姙 => 妊
@@ -737,11 +772,13 @@
 桧 => 檜
 冰 => 氷
 斌 => 彬
-濱,濵 => 浜
+濱 => 浜
+濵 => 浜
 甁 => 瓶
 冨 => 富
 凬 => 風
-淵,渊 => 渕
+淵 => 渕
+渊 => 渕
 拂 => 払
 佛 => 仏
 幤 => 幣
@@ -966,7 +1003,8 @@
 羡 => 羨
 閠 => 閏
 薗 => 園
-謌,哥 => 歌
+謌 => 歌
+哥 => 歌
 籏 => 旗
 竸 => 競
 堯 => 尭
@@ -1013,7 +1051,6 @@
 渕 => 淵
 渴 => 渇
 溫 => 温
-濱 => 浜
 牀 => 床
 狀 => 状
 瘦 => 痩
@@ -1023,7 +1060,6 @@
 脫 => 脱
 虛 => 虚
 說 => 説
-貳 => 弐
 銳 => 鋭
 錄 => 録
 鍊 => 錬
diff --git a/src/main/resources/fess_indices/fess/mapping.txt b/src/main/resources/fess_indices/fess/mapping.txt
index 5bb2062c7..f89ea5434 100644
--- a/src/main/resources/fess_indices/fess/mapping.txt
+++ b/src/main/resources/fess_indices/fess/mapping.txt
@@ -1,7 +1,4 @@
-#
-#   Copyright (C) 2016 Shinji Ikeda All Rights Reserved.
-#   Copyright 2009-2017 CodeLibs Project
-#
+# #   Copyright (C) 2016 Shinji Ikeda All Rights Reserved.  #   Copyright 2009-2017 CodeLibs Project #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 #   You may obtain a copy of the License at
@@ -14,8 +11,41 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-\u0009,\u000A,\u000B,\u000C,\u000D,\u001C,\u001D,\u001E,\u001F,\u00A0,\u1680,\u180E,\u2000,\u2001,\u2002,\u2003,\u2004,\u2005,\u2006,\u2007,\u2008,\u2009,\u200A,\u200B,\u202F,\u205F,\u3000,\uFEFF => \u0020
-~,˜,῀,⁓,∼,∿,～ => 〜
+\u0009 => \u0020
+\u000A => \u0020
+\u000B => \u0020
+\u000C => \u0020
+\u000D => \u0020
+\u001C => \u0020
+\u001D => \u0020
+\u001E => \u0020
+\u001F => \u0020
+\u00A0 => \u0020
+\u1680 => \u0020
+\u180E => \u0020
+\u2000 => \u0020
+\u2001 => \u0020
+\u2002 => \u0020
+\u2003 => \u0020
+\u2004 => \u0020
+\u2005 => \u0020
+\u2006 => \u0020
+\u2007 => \u0020
+\u2008 => \u0020
+\u2009 => \u0020
+\u200A => \u0020
+\u200B => \u0020
+\u202F => \u0020
+\u205F => \u0020
+\u3000 => \u0020
+\uFEFF => \u0020
+~ => 〜
+˜ => 〜
+῀ => 〜
+⁓ => 〜
+∼ => 〜
+∿ => 〜
+～ => 〜
 
 Ａ => A
 Ｂ => B
@@ -799,7 +829,9 @@
 杤 => 栃
 屆 => 届
 繩 => 縄
-貳,貮,弍  => 弐
+貳 => 弐
+貮 => 弐
+弍 => 弐
 邇 => 迩
 韭 => 韮
 姙 => 妊
@@ -828,11 +860,13 @@
 桧 => 檜
 冰 => 氷
 斌 => 彬
-濱,濵 => 浜
+濱 => 浜
+濵 => 浜
 甁 => 瓶
 冨 => 富
 凬 => 風
-淵,渊 => 渕
+淵 => 渕
+渊 => 渕
 拂 => 払
 佛 => 仏
 幤 => 幣
@@ -1057,7 +1091,8 @@
 羡 => 羨
 閠 => 閏
 薗 => 園
-謌,哥 => 歌
+謌 => 歌
+哥 => 歌
 籏 => 旗
 竸 => 競
 堯 => 尭
@@ -1104,7 +1139,6 @@
 渕 => 淵
 渴 => 渇
 溫 => 温
-濱 => 浜
 牀 => 床
 狀 => 状
 瘦 => 痩
@@ -1114,7 +1148,6 @@
 脫 => 脱
 虛 => 虚
 說 => 説
-貳 => 弐
 銳 => 鋭
 錄 => 録
 鍊 => 錬