diff --git a/site/snippets/header.php b/site/snippets/header.php
index e5fa7e1..762da8a 100755
--- a/site/snippets/header.php
+++ b/site/snippets/header.php
@@ -60,7 +60,7 @@
     */
     ?>
     <a class="logo" href="<?= $site->url() ?>">
-      <?= $site->title() ?>
+      <?= $site->title()->html() ?>
     </a>
 
     <nav class="menu">
diff --git a/site/templates/default.php b/site/templates/default.php
index d942cc7..0eeef81 100755
--- a/site/templates/default.php
+++ b/site/templates/default.php
@@ -21,7 +21,7 @@
 <?php snippet('header') ?>
 
 <article>
-  <h1 class="h1"><?= $page->title() ?></h1>
+  <h1 class="h1"><?= $page->title()->html() ?></h1>
   <div class="text">
     <?= $page->text()->kt() ?>
   </div>
diff --git a/site/templates/home.php b/site/templates/home.php
index 8af010f..544e47c 100755
--- a/site/templates/home.php
+++ b/site/templates/home.php
@@ -48,7 +48,7 @@
           <?php endif ?>
           <figcaption>
             <span>
-              <span class="example-name"><?= $album->title() ?></span>
+              <span class="example-name"><?= $album->title()->html() ?></span>
             </span>
           </figcaption>
         </figure>
diff --git a/site/templates/note.php b/site/templates/note.php
index a8985ad..eef9020 100755
--- a/site/templates/note.php
+++ b/site/templates/note.php
@@ -31,9 +31,9 @@
 
 <article class="note">
   <header class="note-header h1">
-    <h1 class="note-title"><?= $page->title() ?></h1>
+    <h1 class="note-title"><?= $page->title()->html() ?></h1>
     <?php if ($page->subheading()->isNotEmpty()): ?>
-    <p class="note-subheading"><small><?= $page->subheading() ?></small></p>
+    <p class="note-subheading"><small><?= $page->subheading()->html() ?></small></p>
     <?php endif ?>
   </header>
   <div class="note text">
@@ -44,7 +44,7 @@
     <ul class="note-tags">
       <?php foreach ($tags as $tag): ?>
       <li>
-        <a href="<?= $page->parent()->url(['params' => ['tag' => $tag]]) ?>"><?= $tag ?></a>
+        <a href="<?= $page->parent()->url(['params' => ['tag' => $tag]]) ?>"><?= html($tag) ?></a>
       </li>
       <?php endforeach ?>
     </ul>