3 files changed, 7 insertions, 4 deletions
diff --git a/src/storage/pinyin_parser2.cpp b/src/storage/pinyin_parser2.cpp
index ce640c3..47c5876 100644
--- a/src/storage/pinyin_parser2.cpp
+++ b/src/storage/pinyin_parser2.cpp
@@ -46,8 +46,8 @@ static bool check_pinyin_options(pinyin_option_t options, const pinyin_index_ite
     }
 
     /* handle correct pinyin, currently only one flag per item. */
-    flags &= PINYIN_CORRECT_ALL;
-    options &= PINYIN_CORRECT_ALL;
+    flags &= PINYIN_CORRECT_ALL | PINYIN_AMB_ALL;
+    options &= PINYIN_CORRECT_ALL | PINYIN_AMB_ALL;
 
     if (flags) {
         if ((flags & options) != flags)
diff --git a/src/storage/pinyin_parser_table.h b/src/storage/pinyin_parser_table.h
index 031a629..b1a5f95 100644
--- a/src/storage/pinyin_parser_table.h
+++ b/src/storage/pinyin_parser_table.h
@@ -502,6 +502,7 @@ const pinyin_index_item_t pinyin_index[] = {
 {"song", IS_ZHUYIN|IS_PINYIN, 333, 0},
 {"sou", IS_ZHUYIN|IS_PINYIN, 334, 0},
 {"su", IS_ZHUYIN|IS_PINYIN, 335, 0},
+{"sua", IS_PINYIN|PINYIN_AMB_S_SH, 325, 1},
 {"suan", IS_ZHUYIN|IS_PINYIN, 336, 0},
 {"suei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 337, 1},
 {"suen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 338, 1},
@@ -661,6 +662,7 @@ const pinyin_index_item_t pinyin_index[] = {
 {"zong", IS_ZHUYIN|IS_PINYIN, 434, 0},
 {"zou", IS_ZHUYIN|IS_PINYIN, 435, 0},
 {"zu", IS_ZHUYIN|IS_PINYIN, 436, 0},
+{"zua", IS_PINYIN|PINYIN_AMB_Z_ZH, 426, 1},
 {"zuan", IS_ZHUYIN|IS_PINYIN, 437, 0},
 {"zuei", IS_PINYIN|PINYIN_CORRECT_UEI_UI, 438, 1},
 {"zuen", IS_PINYIN|PINYIN_CORRECT_UEN_UN, 439, 1},
diff --git a/src/storage/zhuyin_parser2.cpp b/src/storage/zhuyin_parser2.cpp
index 3f14eab..4ef4500 100644
--- a/src/storage/zhuyin_parser2.cpp
+++ b/src/storage/zhuyin_parser2.cpp
@@ -26,6 +26,7 @@
 #include "stl_lite.h"
 #include "pinyin_phrase3.h"
 #include "pinyin_custom2.h"
+#include "zhuyin_custom2.h"
 #include "chewing_key.h"
 #include "pinyin_parser_table.h"
 #include "zhuyin_table.h"
@@ -51,8 +52,8 @@ static bool check_chewing_options(pinyin_option_t options, const chewing_index_i
     }
 
     /* handle correct chewing, currently only one flag per item. */
-    flags &= ZHUYIN_CORRECT_ALL;
-    options &= ZHUYIN_CORRECT_ALL;
+    flags &= ZHUYIN_CORRECT_ALL | ZHUYIN_AMB_ALL;
+    options &= ZHUYIN_CORRECT_ALL | ZHUYIN_AMB_ALL;
 
     if (flags) {
         if ((flags & options) != flags)