diff --git a/src/cls/EntityBrowser/API.cls b/src/cls/EntityBrowser/API.cls
index 790b32b..2b85a07 100644
--- a/src/cls/EntityBrowser/API.cls
+++ b/src/cls/EntityBrowser/API.cls
@@ -395,9 +395,16 @@ IsSimilar(tOriginIndex, tDestIndex, mode="")
 
 		set similar = 1
 		for posO = 1:1:pEntityTokens(tOriginIndex,0) {
-			set similar = 0
+			set similar = 0, length = $l(pEntityTokens(tOriginIndex,posO))
 			for posD = 1:1:pEntityTokens(tDestIndex,0) {
-				set similar = ''$find(pEntityTokens(tDestIndex,posD),pEntityTokens(tOriginIndex,posO))
+				
+				// for single-character tokens, require starting position
+				if length=1 {
+					set similar = ($e(pEntityTokens(tDestIndex,posD),1,length)=pEntityTokens(tOriginIndex,posO))
+				} else {
+					set similar = ''$find(pEntityTokens(tDestIndex,posD),pEntityTokens(tOriginIndex,posO))
+				}
+				
 				quit:similar
 			}
 			quit:'similar
@@ -459,4 +466,11 @@ ClassMethod TokenizeString(Output pTokens, pString As %String)
 	}
 }
 
+/// Enforce utf-8
+ClassMethod %ProcessResult(pSC As %Status, pResult As %DynamicObject = "") As %Status [ Internal ]
+{
+	set %response.CharSet = "utf-8"
+	quit ##super(pSC, pResult)
+}
+
 }
diff --git a/src/cls/EntityBrowser/ServeXData.cls b/src/cls/EntityBrowser/ServeXData.cls
index f717c5a..608ef92 100644
--- a/src/cls/EntityBrowser/ServeXData.cls
+++ b/src/cls/EntityBrowser/ServeXData.cls
@@ -26,7 +26,7 @@ Parameter Files As CONFIGVALUE;
 Parameter Encoding As %String = "utf-8";
 
 /// List of mime types second parts (delimited by slash), which will Encoding be set for.
-Parameter UseEncodingFor = {$LB("html", "css", "javascript", "plain")};
+Parameter UseEncodingFor = {$LB("html", "css", "javascript", "plain", "ttf", "woff")};
 
 /// A generator for Files parameter.
 ClassMethod FillFiles() As %Status [ CodeMode = objectgenerator ]