diff --git a/es_mapping.yml b/es_mapping.yml
index 4d4e39b..6001305 100644
--- a/es_mapping.yml
+++ b/es_mapping.yml
@@ -32,13 +32,19 @@ settings:
         filter:
           - lowercase
           - word_delimit
-          # These should be enough, as my_index_analyzer will match the rest
+          # Skip tokens shorter than N characters,
+          # since they're already indexed in the main field
+          - fullword_min
 
     filter:
       my_ngram:
         type: edgeNGram
         min_gram: 1
         max_gram: 15
+      fullword_min:
+        type: length
+        # Remember to change this if you change the max_gram below!
+        min: 16
       resolution:
         type: pattern_capture
         patterns: ["(\\d+)[xX](\\d+)"]