diff --git a/view/frontend/templates/post/info/author.phtml b/view/frontend/templates/post/info/author.phtml
index 3bc45621..0ad5819d 100644
--- a/view/frontend/templates/post/info/author.phtml
+++ b/view/frontend/templates/post/info/author.phtml
@@ -36,17 +36,21 @@ $modifierName = $modifier !== null ? $modifier->getName() : '';
 <?php if ($authorName && $helper->showAuthorInfo()) : ?>
     |
     <span><i class="fa fa-user">&nbsp;</i>
-                            <?= $escaper->escapeHtml(__(
-                                'By: %1',
-                                '<a class="mp-info" href="' . $author->getUrl() . '">' . $authorName . '</a>'
-                            )) ?></span>
+        <?= /* @noEscape */ __(
+            'By: <a class="mp-info" href="%1">%2</a>',
+            $escaper->escapeUrl($author->getUrl()),
+            $authorName
+        ) ?>
+    </span>
     <?php if ($authorName != $modifierName && $modifierName) : ?>
         |
         <span><i class="fa fa-edit">&nbsp;</i>
-                                <?= $escaper->escapeHtml(__(
-                                    'Modify By: %1 at %2',
-                                    '<a class="mp-info" href="' . $modifier->getUrl() . '">' . $modifierName . '</a>',
-                                    $block->getDateFormat($_post->getUpdatedAt())
-                                )) ?></span>
+            <?= /* @noEscape */ __(
+                'Modify By: <a class="mp-info" href="%1">%2</a> at %3',
+                $escaper->escapeUrl($modifier->getUrl()),
+                $modifierName,
+                $block->getDateFormat($_post->getUpdatedAt())
+            ) ?>
+        </span>
     <?php endif; ?>
 <?php endif; ?>
diff --git a/view/frontend/templates/post/info/tag.phtml b/view/frontend/templates/post/info/tag.phtml
index f781a10c..80e90824 100644
--- a/view/frontend/templates/post/info/tag.phtml
+++ b/view/frontend/templates/post/info/tag.phtml
@@ -29,5 +29,5 @@ use Magento\Framework\Escaper;
 $_post = $block->getPost();
 ?>
 <?php if ($tagList = $block->getTagList($_post)) : ?>
-    | <span><i class="fa fa-tags"></i><?= $escaper->escapeHtml(__('Tags: %1', $tagList)); ?></span>
+    | <span><i class="fa fa-tags"></i><?= $escaper->escapeHtml(__('Tags: ')) ?><?= /* @noEscape */ $tagList ?></span>
 <?php endif; ?>