diff --git a/_global/Special:ListRedirects.html b/_global/Special:ListRedirects.html
index 1a886e3..9003bdf 100644
--- a/_global/Special:ListRedirects.html
+++ b/_global/Special:ListRedirects.html
@@ -3,17 +3,10 @@ layout: default
 title: Redirects
 menu: ['global']
 ---
-{%- assign redirect_pages = site.special | where_exp: 'page', 'page.redirect' -%}
-
 <ul>
-{%- for source_page in redirect_pages -%}
+{%- for source_page in site.data.wiki_redirects -%}
   <li>
-    {%- assign redirect = source_page.redirect | liquify | prepend: '/' -%}
-    {%- for other_page in site.data.wiki_pages -%}
-      {%- if other_page.id == redirect -%}
-        {%- assign redirect_page = other_page -%}
-      {%- endif -%}
-    {%- endfor -%}
+    {%- assign redirect_page = source_page.redirect_target -%}
     <a href="{{ source_page.url }}.html">{{ source_page.id }}</a> → <a href="{{ redirect_page.url }}.html">{{ redirect_page.title }}</a>
   </li>
 {%- endfor -%}
diff --git a/_includes/footer.html b/_includes/footer.html
index 16aef29..0d9d9d6 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -5,8 +5,8 @@
         </a>
     </div>
     <div id="footer-center">
-        {{ site.data.i18n[site.lang].label.modified }}: {{ page.modified }}<br/>
-        {{ site.data.i18n[site.lang].label.created }}: {{ page.created }}
+        {%- if page.modified -%} {{ site.data.i18n[site.lang].label.modified }}: {{ page.modified }} {%- endif -%}<br/>
+        {%- if page.created -%} {{ site.data.i18n[site.lang].label.created }}: {{ page.created }} {%- endif -%}
     </div>
     <div id="footer-right">
         <a href="https://jekyllrb.com/" title="Jekyll" id="poweredby">
diff --git a/_includes/functions/redirect-page.html b/_includes/functions/redirect-page.html
deleted file mode 100644
index 5621b3f..0000000
--- a/_includes/functions/redirect-page.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{%- if include.page  -%}
-  {%- assign source_page = include.source_page -%}
-{%- else -%}
-  {%- assign source_page = page -%}
-{%- endif -%}
-
-{%- assign redirect = source_page.redirect | liquify -%}
-{%- for other_page in site.data.wiki_pages -%}
-  {%- if other_page.id == redirect -%}
-    {%- assign redirect_page = other_page -%}
-  {%- endif -%}
-{%- endfor -%}
diff --git a/_layouts/redirect.html b/_layouts/redirect.html
index a7bb11a..5a94255 100644
--- a/_layouts/redirect.html
+++ b/_layouts/redirect.html
@@ -1,9 +1,9 @@
 <html>
-  {%- include /functions/redirect-page.html -%}
   <head>
-    {%- assign redirect_url = redirect_page.url | default: site.data.i18n[site.lang].home | append: ".html" -%}
-    {%- include head.html redirect_url = redirect_url -%}
+    {%- assign redirect_page = page.redirect_target -%}
+    {%- include head.html redirect_url = redirect_page.url -%}
   </head>
+
   <body>
     <div id="main">
       <h1 id="title">{{ redirect_page.title }}</h1>
@@ -16,6 +16,7 @@
         </div>
       </div>
     </div>  
+
     <div id="menu">
       {%- include logo.html -%}
     </div>  
diff --git a/_plugins/hook-wiki-page-enhancer.rb b/_plugins/hook-wiki-page-enhancer.rb
index f7dd3fc..f2ccedb 100644
--- a/_plugins/hook-wiki-page-enhancer.rb
+++ b/_plugins/hook-wiki-page-enhancer.rb
@@ -11,6 +11,12 @@ Jekyll::Hooks.register :site, :post_read do |site|
         .flatten
     site.data['wiki_pages'] = wiki_pages
 
+    wiki_pages_hash = wiki_pages.map { |page| [page.id, page] }.to_h
+    wiki_redirects = site.documents
+        .select { |doc| doc.data['layout'] == 'redirect' }
+    wiki_redirects.each { |page| page.data['redirect_target'] = wiki_pages_hash["/#{page.data['redirect'] || site.data['i18n'][site.config['lang']]['home']}"] }
+    site.data['wiki_redirects'] = wiki_redirects
+
     wiki_tags = wiki_pages
         .map { |page| page.data['tags'] }
         .flatten
