From 153f3fc0a59b9f0e46f95fc82c8d89ac06603732 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Thu, 14 Jun 2018 12:04:23 -0400
Subject: [PATCH] Improve search query construction.

---
 SignalServiceKit/src/Storage/FullTextSearchFinder.swift | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SignalServiceKit/src/Storage/FullTextSearchFinder.swift b/SignalServiceKit/src/Storage/FullTextSearchFinder.swift
index afe507080..bb35d8f52 100644
--- a/SignalServiceKit/src/Storage/FullTextSearchFinder.swift
+++ b/SignalServiceKit/src/Storage/FullTextSearchFinder.swift
@@ -92,7 +92,8 @@ public class FullTextSearchFinder: NSObject {
         var charactersToFilter = CharacterSet.punctuationCharacters
         charactersToFilter.formUnion(CharacterSet.illegalCharacters)
         charactersToFilter.formUnion(CharacterSet.controlCharacters)
-        charactersToFilter.formUnion(CharacterSet(charactersIn: "+~$^=|<>`"))
+        // Note that we strip the Unicode "subtitute" character (26).
+        charactersToFilter.formUnion(CharacterSet(charactersIn: "+~$^=|<>`_\u{26}"))
         return charactersToFilter
     }