diff --git a/.idea/dictionaries/project.xml b/.idea/dictionaries/project.xml
index fa009839..47a98367 100644
--- a/.idea/dictionaries/project.xml
+++ b/.idea/dictionaries/project.xml
@@ -27,6 +27,7 @@
       <w>libevent</w>
       <w>libime</w>
       <w>libintl</w>
+      <w>libthai</w>
       <w>ljava</w>
       <w>nihaoshijie</w>
       <w>orphis</w>
diff --git a/app/src/main/cpp/androidfrontend/androidfrontend.cpp b/app/src/main/cpp/androidfrontend/androidfrontend.cpp
index f62eeab1..a7bd4107 100644
--- a/app/src/main/cpp/androidfrontend/androidfrontend.cpp
+++ b/app/src/main/cpp/androidfrontend/androidfrontend.cpp
@@ -87,7 +87,7 @@ public:
                         auto &candidate = bulk->candidateFromAll(i);
                         // maybe unnecessary; I don't see anywhere using `CandidateWord::setPlaceHolder`
                         // if (candidate.isPlaceHolder()) continue;
-                        candidates.emplace_back(filterString(candidate.textWithComment()));
+                        candidates.emplace_back(filterString(candidate.textWithComment("")));
                     } catch (const std::invalid_argument &e) {
                         size = static_cast<int>(candidates.size());
                         break;
@@ -96,7 +96,7 @@ public:
             } else {
                 size = list->size();
                 for (int i = 0; i < size; i++) {
-                    candidates.emplace_back(filterString(list->candidate(i).textWithComment()));
+                    candidates.emplace_back(filterString(list->candidate(i).textWithComment("")));
                 }
             }
         }
diff --git a/plugin/thai/licenses/libraries/fcitx5-libthai.json b/plugin/thai/licenses/libraries/fcitx5-libthai.json
index 97f93edd..0de45c0c 100644
--- a/plugin/thai/licenses/libraries/fcitx5-libthai.json
+++ b/plugin/thai/licenses/libraries/fcitx5-libthai.json
@@ -1,6 +1,6 @@
 {
     "uniqueId": "fcitx/fcitx5-libthai",
-    "artifactVersion": "5.1.8",
+    "artifactVersion": "5.1.7",
     "description": "Thai Wrapper for Fcitx",
     "name": "fcitx/fcitx5-libthai",
     "website": "https://github.com/fcitx/fcitx5-libthai",
diff --git a/plugin/thai/src/main/cpp/CMakeLists.txt b/plugin/thai/src/main/cpp/CMakeLists.txt
index 951213a4..7ea565d8 100644
--- a/plugin/thai/src/main/cpp/CMakeLists.txt
+++ b/plugin/thai/src/main/cpp/CMakeLists.txt
@@ -23,5 +23,7 @@ set_target_properties(Thai_static PROPERTIES
         INTERFACE_INCLUDE_DIRECTORIES "${PREBUILT_DIR}/libthai/${ANDROID_ABI}/include"
         )
 
+option(ENABLE_TEST "" OFF)
+option(ENABLE_COVERAGE "" OFF)
 set(THAI_TARGET Thai_static)
 add_subdirectory(fcitx5-libthai)
diff --git a/plugin/thai/src/main/cpp/fcitx5-libthai b/plugin/thai/src/main/cpp/fcitx5-libthai
index 9f219d39..334b2a97 160000
--- a/plugin/thai/src/main/cpp/fcitx5-libthai
+++ b/plugin/thai/src/main/cpp/fcitx5-libthai
@@ -1 +1 @@
-Subproject commit 9f219d3998ce768551d98f513f243c2e01260296
+Subproject commit 334b2a972245eaa412cd5c6c7c52c6edf7fd520f