diff --git a/ckeditor.html b/ckeditor.html
index 9692128..5fb11b6 100644
--- a/ckeditor.html
+++ b/ckeditor.html
@@ -9,7 +9,8 @@
   </head>
   <body>
     <div id="editor">
-      <p>Na mizo nisem položil knjigo.</p>
+      <!-- <p>Na mizo nisem položil knjigo.</p> -->
+      <p>Na mizo nisem položil <b>knjigo</b>.</p>
     </div>
     <bes-popup-el></bes-popup-el>
     <script>
diff --git a/service.js b/service.js
index ff66d87..17fcc9b 100644
--- a/service.js
+++ b/service.js
@@ -520,7 +520,6 @@ class BesService {
     popup.hide()
   }
 
-  // TODO: In rich HTML texts, match.offset has different value than in plain text.
   // This function should be able to handle both cases or find a way that works for both.
   replaceText(el, match, replacement) {
     if (this.timer) clearTimeout(this.timer)
@@ -622,37 +621,18 @@ class BesCKService extends BesService {
     })
   }
 
-  // TODO: In rich HTML texts, match.offset has different value than in plain text.
   // This function should be able to handle both cases or find a way that works for both.
   replaceText(el, match, replacement) {
-    if (this.timer) clearTimeout(this.timer)
-    this.abortController.abort()
     const { ckEditorInstance } = this
+    const viewRange = ckEditorInstance.editing.view.domConverter.domRangeToView(
+      match.range
+    )
+    const modelRange = ckEditorInstance.editing.mapper.toModelRange(viewRange)
     ckEditorInstance.model.change(writer => {
-      const viewElement =
-        ckEditorInstance.editing.view.domConverter.mapDomToView(el)
-      const modelElement =
-        ckEditorInstance.editing.mapper.toModelElement(viewElement)
-      if (modelElement) {
-        const elementRange = writer.createRangeIn(modelElement)
-        // TODO: This logic should work once the HTML tags are removed from match.match.offset and match.match.length if is possible.
-        if (
-          elementRange.start.offset <= match.match.offset &&
-          elementRange.end.offset >= match.match.offset + match.match.length
-        ) {
-          const start = writer.createPositionAt(
-            modelElement,
-            match.match.offset
-          )
-          const end = writer.createPositionAt(
-            modelElement,
-            match.match.offset + match.match.length
-          )
-          const range = writer.createRange(start, end)
-          writer.remove(range)
-          writer.insertText(replacement, start)
-        }
-      }
+      const attributes =
+        ckEditorInstance.model.document.selection.getAttributes()
+      writer.remove(modelRange)
+      writer.insertText(replacement, attributes, modelRange.start)
     })
     this.clearMistakeMarkup(el)
     // In my opinion, this approach provides the most straightforward solution for repositioning mistakes after a change.
