diff --git a/es_mapping.yml b/es_mapping.yml
index 1086fb2..14983d5 100644
--- a/es_mapping.yml
+++ b/es_mapping.yml
@@ -24,9 +24,9 @@ settings:
           - my_ngram
           - trim_zero
           - unique
-      # For exact matching - simple lowercase + whitespace delimiter
+      # For exact matching - separate each character for substring matching + lowercase
       exact_analyzer:
-        tokenizer: whitespace
+        tokenizer: exact_tokenizer
         filter:
           - lowercase
       # For matching full words longer than the ngram limit (15 chars)
@@ -43,6 +43,13 @@ settings:
           - fullword_min
           - unique
 
+    tokenizer:
+      # Splits input into characters, for exact substring matching
+      exact_tokenizer:
+        type: pattern
+        pattern: "(.)"
+        group: 1
+
     filter:
       my_ngram:
         type: edgeNGram
diff --git a/nyaa/templates/help.html b/nyaa/templates/help.html
index f7de873..47cbbf5 100644
--- a/nyaa/templates/help.html
+++ b/nyaa/templates/help.html
@@ -46,7 +46,7 @@
 	name, but not those which have <em>bar</em> in the name as well.
 </div>
 <div>
-	If you want to search for a several-word expression in its entirety, you can
+	If you want to search for a several-word expression (substring) in its entirety, you can
 	surround searches with <kbd>"</kbd> (double quotes), such as
 	<kbd>"foo bar"</kbd>, which would match torrents named <em>foo bar</em> but not
 	those named <em>bar foo</em>. You may also use the aforementioned <kbd>|</kbd> to group