1 files changed, 15 insertions, 5 deletions
diff --git a/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js b/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js
index 9bf1b1ced88..a2729dc0e95 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_tokenizer.js
@@ -8,21 +8,31 @@ require('./filtered_search_token_keys');
       // Values that start with a double quote must end in a double quote (same for single)
       const tokenRegex = new RegExp(`(${allowedKeys.join('|')}):([~%@]?)(?:('[^']*'{0,1})|("[^"]*"{0,1})|(\\S+))`, 'g');
       const tokens = [];
+      const tokenIndexes = []; // stores key+value for simple search
       let lastToken = null;
       const searchToken = input.replace(tokenRegex, (match, key, symbol, v1, v2, v3) => {
         let tokenValue = v1 || v2 || v3;
         let tokenSymbol = symbol;
+        let tokenIndex = '';
 
         if (tokenValue === '~' || tokenValue === '%' || tokenValue === '@') {
           tokenSymbol = tokenValue;
           tokenValue = '';
         }
 
-        tokens.push({
-          key,
-          value: tokenValue || '',
-          symbol: tokenSymbol || '',
-        });
+        tokenIndex = `${key}:${tokenValue}`;
+
+        // Prevent adding duplicates
+        if (tokenIndexes.indexOf(tokenIndex) === -1) {
+          tokenIndexes.push(tokenIndex);
+
+          tokens.push({
+            key,
+            value: tokenValue || '',
+            symbol: tokenSymbol || '',
+          });
+        }
+
         return '';
       }).replace(/\s{2,}/g, ' ').trim() || '';