diff --git a/kcpp_adapters/AutoGuess.json b/kcpp_adapters/AutoGuess.json
index 2ac961342..86e3848c3 100644
--- a/kcpp_adapters/AutoGuess.json
+++ b/kcpp_adapters/AutoGuess.json
@@ -135,12 +135,12 @@
     "search": ["'<|' + message['role'] + '|>'"],
     "name": "Phi 4 (mini)",
     "adapter": {
-        "system_start": "<|system|>\n",
-        "system_end": "<|end|>\n",
-        "user_start": "<|user|>\n",
-        "user_end": "<|end|>\n",
-        "assistant_start": "<|assistant|>\n",
-        "assistant_end": "<|end|>\n"
+        "system_start": "<|system|>",
+        "system_end": "<|end|>",
+        "user_start": "<|user|>",
+        "user_end": "<|end|>",
+        "assistant_start": "<|assistant|>",
+        "assistant_end": "<|end|>"
     }
 }, {
     "search": ["<|START_OF_TURN_TOKEN|>"],
@@ -179,23 +179,23 @@
     "search": ["<|userprompt|>", "<|endofuserprompt|>", "<|response|>", "<|endofresponse|>"],
     "name": "Dots",
     "adapter": {
-        "system_start": "<|system|>\n",
-        "system_end": "<|endofsystem|>\n",
-        "user_start": "<|userprompt|>\n",
-        "user_end": "<|endofuserprompt|>\n",
-        "assistant_start": "<|response|>\n",
-        "assistant_end": "<|endofresponse|>\n"
+        "system_start": "<|system|>",
+        "system_end": "<|endofsystem|>",
+        "user_start": "<|userprompt|>",
+        "user_end": "<|endofuserprompt|>",
+        "assistant_start": "<|response|>",
+        "assistant_end": "<|endofresponse|>"
     }
 }, {
-    "search": ["rwkv-world"],
+    "search": ["rwkv_", "'User: '"],
     "name": "RWKV World",
     "adapter": {
         "system_start": "",
         "system_end": "\n\n",
-        "user_start": "USER: ",
-        "user_end": "\n",
-        "assistant_start": "ASSISTANT: ",
-        "assistant_end": "</s>\n"
+        "user_start": "User: ",
+        "user_end": "\n\n",
+        "assistant_start": "Assistant: ",
+        "assistant_end": "\n\n"
     }
 }, {
     "search": ["[/INST]"],