diff --git a/developer/src/kmc-model/src/model-defaults.ts b/developer/src/kmc-model/src/model-defaults.ts
index 0fb44ffa5b..541cadcb49 100644
--- a/developer/src/kmc-model/src/model-defaults.ts
+++ b/developer/src/kmc-model/src/model-defaults.ts
@@ -25,11 +25,9 @@ export function defaultSearchTermToKey(wordform: string): string {
       // Remove any combining diacritics (if input is in NFKD)
       .replace(/[\u0300-\u036F]/g, '')
       // Replace directional quotation marks with plain apostrophes
-      .replace(/‘/, "'")
-      .replace(/’/, "'")
+      .replace(/[‘’]/g, "'")
       // Also double-quote marks.
-      .replace(/“/, '"')
-      .replace(/”/, '"');
+      .replace(/[“”]/g, '"');
 }
 
 /**
@@ -65,11 +63,9 @@ export function defaultCasedSearchTermToKey(wordform: string, applyCasing: Casin
       .map(function(c) { return applyCasing('lower', c)})
       .join('')
       // Replace directional quotation marks with plain apostrophes
-      .replace(/‘/, "'")
-      .replace(/’/, "'")
+      .replace(/[‘’]/g, "'")
       // Also double-quote marks.
-      .replace(/“/, '"')
-      .replace(/”/, '"');
+      .replace(/[“”]/g, '"');
 }
 
 /**