@@ -1,7 +1,7 @@
 <a class="skip" href="#content">Skip to main content</a>
 <header>
   <h2>
-    <a href="{{ config.base_url }}" class="title">
+    <a href="{{ config.base_url | safe }}" class="title">
       {{ config.title }}
     </a>
   </h2>

@@ -1,10 +1,10 @@
-<a href="{{ config.base_url }}">Home</a>
+<a href="{{ config.base_url | safe }}">Home</a>
 {%- if config.extra.main_menu %}
   {%- for item in config.extra.main_menu %}
     {%- if item.url is matching("https?://") %}
-      <a href="{{ item.url }}">{{ item.name }}</a>
+      <a href="{{ item.url | safe }}">{{ item.name }}</a>
     {%- else %}
-      <a href="{{ get_url(path=item.url )}}">{{ item.name }}</a>
+      <a href="{{ get_url(path=item.url) }}">{{ item.name }}</a>
     {%- endif %}
   {%- endfor %}
 {%- endif -%}

@@ -16,7 +16,7 @@ <time datetime='{{ page.date | date(format='%+') }}' pubdate>
               {{ page.date | date(format=config.extra.date_format) }}
             </time>
           </span>
-          <a href="{{ page.permalink }}">{{ page.title }}</a>
+          <a href="{{ page.path | urlencode | safe }}">{{ page.title }}</a>
         </li>
         {% else %}
         <li>
@@ -28,7 +28,7 @@ <small>
       <div>
         {% set tags = get_taxonomy(kind="tags") %}
         {% for post in tags.items %}
-          <a href="{{ post.permalink }}">#{{ post.name }}</a>&nbsp;
+          <a href="{{ post.path | urlencode | safe }}">#{{ post.name }}</a>
         {% endfor %}
       </div>
     </small>

@@ -22,7 +22,7 @@ <time datetime='{{ page.date | date(format='%+') }}' pubdate>
               {{ page.date | date(format=config.extra.date_format) }}
             </time>
           </span>
-          <a href="{{ page.permalink }}">{{ page.title }}</a>
+          <a href="{{ page.path | urlencode | safe }}">{{ page.title }}</a>
         </li>
       {% else %}
         <li>