diff --git a/src/basic/compiler/mod.rs b/src/basic/compiler/mod.rs
index 13c4c66b..c041f78d 100644
--- a/src/basic/compiler/mod.rs
+++ b/src/basic/compiler/mod.rs
@@ -487,7 +487,10 @@ impl BasicCompiler {
             let normalized = trimmed
                 .replace("FOR EACH", "FOR_EACH")
                 .replace("EXIT FOR", "EXIT_FOR")
-                .replace("GROUP BY", "GROUP_BY");
+                .replace("GROUP BY", "GROUP_BY")
+                .replace("ADD SUGGESTION TOOL", "ADD_SUGG_TOOL")
+                .replace("ADD SUGGESTION TEXT", "ADD_SUGG_TEXT")
+                .replace("ADD SUGGESTION", "ADD_SUGG");
             if normalized.starts_with("SET SCHEDULE") || trimmed.starts_with("SET SCHEDULE") {
                 has_schedule = true;
                 let parts: Vec<&str> = normalized.split('"').collect();