diff --git a/javascript/prompt_format.js b/javascript/prompt_format.js
index 35305f0..2386464 100644
--- a/javascript/prompt_format.js
+++ b/javascript/prompt_format.js
@@ -292,7 +292,7 @@ class LeFormatter {
 				const multiline = !paste.includes(",");
 
 				if (config.booru) {
-					paste = paste.replace(/\s*[\d.]+[kM]\s*|\s*[\d]{3,}\s*|[\?\+\-]\s+/g, ", ");
+					paste = paste.replace(/\s*[\d.]+[kM]\s*|(?:^|,|\s+)\d{2,}(?:\s+|,|\?|$)|[\?\+\-]\s+/g, ", ");
 					for (const excl of ["Artist", "Characters", "Character", "Copyright", "Tags", "Tag", "General"])
 						paste = paste.replace(excl, "");