diff --git a/src/main/kotlin/com/mituuz/fuzzier/entities/FuzzyMatchContainer.kt b/src/main/kotlin/com/mituuz/fuzzier/entities/FuzzyMatchContainer.kt
index 6a2c425c..b684c07d 100644
--- a/src/main/kotlin/com/mituuz/fuzzier/entities/FuzzyMatchContainer.kt
+++ b/src/main/kotlin/com/mituuz/fuzzier/entities/FuzzyMatchContainer.kt
@@ -29,8 +29,6 @@ import com.mituuz.fuzzier.settings.FuzzierSettingsService
 class FuzzyMatchContainer(val score: FuzzyScore, var filePath: String, var filename: String, private var module: String = "") {
     private val sm: String = "<font style='background-color: yellow;'>"
     private val em: String = "</font>"
-//    private val sm: String = "<mark>"
-//    private val em: String = "</mark>"
     private var initialPath: String? = null
     companion object {
         fun createOrderedContainer(order: Int, filePath: String, initialPath:String, filename: String): FuzzyMatchContainer {
@@ -57,8 +55,9 @@ class FuzzyMatchContainer(val score: FuzzyScore, var filePath: String, var filen
         for (i in score.highlightCharacters) {
             if (i < source.length) {
                 stringBuilder.insert(i + offset, sm)
-                stringBuilder.insert(i + offset + 41, em) // 7
-                offset += 6 + 41 // 7
+                offset += sm.length
+                stringBuilder.insert(i + offset + 1, em)
+                offset += em.length
             }
         }
         return stringBuilder.toString()
diff --git a/src/test/kotlin/com/mituuz/fuzzier/entities/FuzzyMatchContainerTest.kt b/src/test/kotlin/com/mituuz/fuzzier/entities/FuzzyMatchContainerTest.kt
index a16d98ca..60c62730 100644
--- a/src/test/kotlin/com/mituuz/fuzzier/entities/FuzzyMatchContainerTest.kt
+++ b/src/test/kotlin/com/mituuz/fuzzier/entities/FuzzyMatchContainerTest.kt
@@ -11,7 +11,6 @@ class FuzzyMatchContainerTest {
         s.highlightCharacters.add(0)
         s.highlightCharacters.add(4)
         val f = FuzzyMatchContainer(s, "", "Hello")
-        // assertEquals("<mark>H</mark>ell<mark>o</mark>", f.highlight(f.filename))
         assertEquals("<font style='background-color: yellow;'>H</font>ell<font style='background-color: yellow;'>o</font>", f.highlight(f.filename))
     }
 }
\ No newline at end of file