diff --git a/src/Filter/EpcFilterAbbreviation.php b/src/Filter/EpcFilterAbbreviation.php
index 09e85c4..65dc0b7 100644
--- a/src/Filter/EpcFilterAbbreviation.php
+++ b/src/Filter/EpcFilterAbbreviation.php
@@ -30,7 +30,7 @@ class EpcFilterAbbreviation extends EpcFilter
             'name'     => __('Abbreviation'),
             'help'     => __('Explain some abbreviation. First term of the list is the abbreviation and second term the explanation.'),
             'has_list' => true,
-            'htmltag'  => 'a',
+            'htmltag'  => 'pre,code,a',
             'class'    => ['abbr.epc-abbr'],
             'replace'  => '<abbr class="epc-abbr" title="%s">%s</abbr>',
             'widget'   => '<abbr title="%s">%s</abbr>',
diff --git a/src/Filter/EpcFilterAcronym.php b/src/Filter/EpcFilterAcronym.php
index 0183269..91ca1eb 100644
--- a/src/Filter/EpcFilterAcronym.php
+++ b/src/Filter/EpcFilterAcronym.php
@@ -30,7 +30,7 @@ class EpcFilterAcronym extends EpcFilter
             'name'     => __('Acronym'),
             'help'     => __('Explain some acronyms. First term of the list is the acornym and second term the explanation.'),
             'has_list' => true,
-            'htmltag'  => 'acronym',
+            'htmltag'  => 'pre,code,acronym',
             'class'    => ['acronym.epc-acronym'],
             'replace'  => '<acronym class="epc-acronym" title="%s">%s</acronym>',
             'widget'   => '<acronym title="%s">%s</acronym>',
diff --git a/src/Filter/EpcFilterCitation.php b/src/Filter/EpcFilterCitation.php
index 26ee271..bc8b275 100644
--- a/src/Filter/EpcFilterCitation.php
+++ b/src/Filter/EpcFilterCitation.php
@@ -30,7 +30,7 @@ class EpcFilterCitation extends EpcFilter
             'name'     => __('Citation'),
             'help'     => __('Highlight citation of people. First term of the list is the citation and second term the author.'),
             'has_list' => true,
-            'htmltag'  => 'cite',
+            'htmltag'  => 'pre,code,cite',
             'class'    => ['cite.epc-cite'],
             'replace'  => '<cite class="epc-cite" title="%s">%s</cite>',
             'widget'   => '<cite title="%s">%s</cite>',
diff --git a/src/Filter/EpcFilterDefinition.php b/src/Filter/EpcFilterDefinition.php
index 53aa7b8..8c273d3 100644
--- a/src/Filter/EpcFilterDefinition.php
+++ b/src/Filter/EpcFilterDefinition.php
@@ -30,7 +30,7 @@ class EpcFilterDefinition extends EpcFilter
             'name'     => __('Definition'),
             'help'     => __('Explain some definition. First term of the list is the sample to define and second term the explanation.'),
             'has_list' => true,
-            'htmltag'  => 'dfn',
+            'htmltag'  => 'pre,code,dfn',
             'class'    => ['dfn.epc-dfn'],
             'replace'  => '<dfn class="epc-dfn" title="%s">%s</dfn>',
             'widget'   => '<dfn class="epc-dfn" title="%s">%s</dfn>',
diff --git a/src/Filter/EpcFilterLink.php b/src/Filter/EpcFilterLink.php
index 9e65607..cabe8f2 100644
--- a/src/Filter/EpcFilterLink.php
+++ b/src/Filter/EpcFilterLink.php
@@ -30,7 +30,7 @@ class EpcFilterLink extends EpcFilter
             'name'     => __('Link'),
             'help'     => __('Link some words. First term of the list is the term to link and second term the link.'),
             'has_list' => true,
-            'htmltag'  => 'a',
+            'htmltag'  => 'pre,code,a',
             'class'    => ['a.epc-link'],
             'replace'  => '<a class="epc-link" title="%s" href="%s">%s</a>',
             'widget'   => '<a title="%s" href="%s">%s</a>',
diff --git a/src/Filter/EpcFilterReplace.php b/src/Filter/EpcFilterReplace.php
index 4ef6fc8..ed88e50 100644
--- a/src/Filter/EpcFilterReplace.php
+++ b/src/Filter/EpcFilterReplace.php
@@ -28,7 +28,7 @@ class EpcFilterReplace extends EpcFilter
             'name'     => __('Replace'),
             'help'     => __('Replace some text. First term of the list is the text to replace and second term the replacement.'),
             'has_list' => true,
-            'htmltag'  => '',
+            'htmltag'  => 'pre,code',
             'class'    => ['span.epc-replace'],
             'replace'  => '<span class="epc-replace">%s</span>',
         ];
diff --git a/src/Filter/EpcFilterTag.php b/src/Filter/EpcFilterTag.php
index 87158ac..f5b091f 100644
--- a/src/Filter/EpcFilterTag.php
+++ b/src/Filter/EpcFilterTag.php
@@ -30,7 +30,7 @@ class EpcFilterTag extends EpcFilter
             'priority' => 900,
             'name'     => __('Tag'),
             'help'     => __('Highlight tags of your blog.'),
-            'htmltag'  => 'a',
+            'htmltag'  => 'pre,code,a',
             'class'    => ['a.epc-tag'],
             'replace'  => '<a class="epc-tag" href="%s" title="' . __('Tag') . '">%s</a>',
             'widget'   => '<a href="%s" title="' . __('Tag') . '">%s</a>',
@@ -41,7 +41,7 @@ class EpcFilterTag extends EpcFilter
     {
         return [
             'style'     => ['text-decoration: none; border-bottom: 3px double #CCCCCC;'],
-            'notag'     => 'a,h1,h2,h3',
+            'notag'     => 'pre,code,a,h1,h2,h3',
             'tplValues' => ['EntryContent'],
             'pubPages'  => ['post.html'],
         ];
diff --git a/src/Filter/EpcFilterTwitter.php b/src/Filter/EpcFilterTwitter.php
index 9e74e68..b571c15 100644
--- a/src/Filter/EpcFilterTwitter.php
+++ b/src/Filter/EpcFilterTwitter.php
@@ -27,7 +27,7 @@ class EpcFilterTwitter extends EpcFilter
             'priority' => 1000,
             'name'     => __('Twitter'),
             'help'     => __('Add link to twitter user page. Every word started with "@" will be considered as twitter user.'),
-            'htmltag'  => 'a',
+            'htmltag'  => 'pre,code,a',
             'class'    => ['a.epc-twitter'],
             'replace'  => '<a class="epc-twitter" title="' . __("View this user's twitter page") . '" href="%s">%s</a>',
         ];
diff --git a/src/Filter/EpcFilterUpdate.php b/src/Filter/EpcFilterUpdate.php
index 9c95273..391ad55 100644
--- a/src/Filter/EpcFilterUpdate.php
+++ b/src/Filter/EpcFilterUpdate.php
@@ -28,7 +28,7 @@ class EpcFilterUpdate extends EpcFilter
             'name'     => __('Update'),
             'help'     => __('Update and show terms. First term of the list is the term to update and second term the new term.'),
             'has_list' => true,
-            'htmltag'  => 'del,ins',
+            'htmltag'  => 'pre,code,del,ins',
             'class'    => ['del.epc-update', 'ins.epc-update'],
             'replace'  => '<del class="epc-update">%s</del> <ins class="epc-update">%s</ins>',
         ];