diff --git a/kit/preprocess.js b/kit/preprocess.js
index bc55952a..99ecd745 100644
--- a/kit/preprocess.js
+++ b/kit/preprocess.js
@@ -466,30 +466,45 @@ function escapeSvelteSpecialChars() {
 		visit(tree, "html", onHtml);
 	}
 
+	function isWithinDocBody(node) {
+		if (["<!--HF DOCBUILD BODY START-->", "HF_DOC_BODY_START"].includes(node.value)) {
+			hfDocBodyStart = true;
+			hfDocBodyEnd = false;
+			// delete the marker
+			if(node.value === "HF_DOC_BODY_START"){
+				node.value = "";
+			}
+		}
+		if (["<!--HF DOCBUILD BODY END-->", "HF_DOC_BODY_END"].includes(node.value)) {
+			hfDocBodyEnd = true;
+			// delete the marker
+			if(node.value === "HF_DOC_BODY_END"){
+				node.value = "";
+			}
+		}
+		return hfDocBodyStart && !hfDocBodyEnd;
+	}
+
 	function onText(node) {
+		if (!isWithinDocBody(node)) {
+			return;
+		}
 		node.value = node.value.replaceAll("{", "&#123;");
 		node.value = node.value.replaceAll("<", "&#60;");
 	}
 
 	function onHtml(node) {
-		if(node.value === "<!--HF DOCBUILD BODY START-->"){
-			hfDocBodyStart = true;
-			hfDocBodyEnd = false;
-		}
-		if(node.value === "<!--HF DOCBUILD BODY END-->"){
-			hfDocBodyEnd = true;
+		if (!isWithinDocBody(node)) {
+			return;
 		}
 		const RE_TAG_NAME = /<\/?(\w+)/;
 		const match = node.value.match(RE_TAG_NAME);
+		const REGEX_VALID_START_END_TAG = /^<(\w+)[^>]*>.*<\/\1>$/s;
 		if (match) {
 			const tagName = match[1];
 			if (!validTags.includes(tagName)) {
 				node.value = node.value.replaceAll("<", "&#60;");
-			}else if(hfDocBodyStart && !hfDocBodyEnd && htmlTags.includes(tagName)){
-				const REGEX_VALID_START_END_TAG = /^<(\w+)[^>]*>.*<\/\1>$/s;
-				if(!REGEX_VALID_START_END_TAG.test(node.value.trim())){
-					return;
-				}
+			}else if(htmlTags.includes(tagName) && REGEX_VALID_START_END_TAG.test(node.value.trim())){
 				const $ = cheerio.load(node.value);
 				// Go through each text node in the HTML and replace "{" with "&#123;"
 				$('*').contents().each((index, element) => {
diff --git a/kit/src/lib/DropdownEntry.svelte b/kit/src/lib/DropdownEntry.svelte
index f49a33f1..2a02f716 100644
--- a/kit/src/lib/DropdownEntry.svelte
+++ b/kit/src/lib/DropdownEntry.svelte
@@ -16,7 +16,7 @@
 	export let useDeprecatedJS = true;
 </script>
 
-<li>
+<li class="not-prose">
 	<a
 		class="flex items-center hover:bg-gray-50 dark:hover:bg-gray-800 cursor-pointer px-3 py-1.5 whitespace-nowrap 
 			{classNames}
diff --git a/src/doc_builder/convert_md_to_mdx.py b/src/doc_builder/convert_md_to_mdx.py
index 8fa9fbe5..393c3e43 100644
--- a/src/doc_builder/convert_md_to_mdx.py
+++ b/src/doc_builder/convert_md_to_mdx.py
@@ -63,11 +63,16 @@ def convert_md_to_mdx(md_text, page_info):
 
 <!--HF DOCBUILD BODY START-->
 
+HF_DOC_BODY_START
+
 """
         + process_md(md_text, page_info)
         + """
 
 <!--HF DOCBUILD BODY END-->
+
+HF_DOC_BODY_END
+
 """
     )
 
diff --git a/tests/test_convert_md_to_mdx.py b/tests/test_convert_md_to_mdx.py
index 35e68c82..da311f45 100644
--- a/tests/test_convert_md_to_mdx.py
+++ b/tests/test_convert_md_to_mdx.py
@@ -65,9 +65,14 @@ def test_convert_md_to_mdx(self):
 
 <!--HF DOCBUILD BODY START-->
 
+HF_DOC_BODY_START
+
 Lorem ipsum dolor sit amet, consectetur adipiscing elit
 
 <!--HF DOCBUILD BODY END-->
+
+HF_DOC_BODY_END
+
 """
         print(convert_md_to_mdx(md_text, page_info))
         self.assertEqual(convert_md_to_mdx(md_text, page_info), expected_conversion)