diff --git a/theme/templates/partials/paginator.html.nunj b/theme/templates/partials/paginator.html.nunj
index f81ce3a5c477546af918c3cd44488bc027c73bdd..04789c230a6ee5221d4cad021dcec506293f869a 100644
--- a/theme/templates/partials/paginator.html.nunj
+++ b/theme/templates/partials/paginator.html.nunj
@@ -1,10 +1,10 @@
 {% import "partials/svgs.html.nunj" as svgs %}
 
 <ul class="pagination">
-  <li><a {{ (" href=\""+config.baseurl +"/"+ metadata.firstpage.file +"\"") | safe if metadata.firstpage.file != file }}>
+  <li><a {% if metadata.firstpage != undefined %} href="{{config.baseurl}}/{{metadata.firstpage.file}}"{%endif%}>
     {{ svgs.doublechevronleft( "#999" if metadata.firstpage.file == file else "#000", 1,"em" ) }}
   </a></li>
-  <li><a {{ " href="+config.baseurl +"/"+ metadata.prevpage.file if metadata.prevpage != undefined }}>
+  <li><a {% if metadata.prevpage != undefined %} href="{{config.baseurl}}/{{metadata.prevpage.file}}"{%endif%}>
     {{ svgs.chevronleft( "#999" if metadata.prevpage == undefined else "#000", 1,"em" ) }}
   </a></li>
   {% for page in metadata.thispage | paginationList(4) %}
@@ -14,11 +14,11 @@
       <li class="waves-effect"><a href="{{ config.baseurl }}/{{ page.file }}">{{ page.metadata.pagenumber }}</a></li>
     {% endif %}
   {% endfor %}
-  <li><a {{ " href="+config.baseurl +"/"+ metadata.nextpage.file if metadata.nextpage != undefined }}>
+  <li><a {% if metadata.nextpage != undefined %} href="{{config.baseurl}}/{{metadata.nextpage.file}}"{%endif%}>
     {{ svgs.chevronright( "#999" if metadata.nextpage == undefined else "#000", 1,"em" ) }}
   </a></li>
 
-  <li><a {{ (" href=\""+config.baseurl +"/"+ metadata.lastpage.file +"\"") | safe if metadata.lastpage.file != file }}>
+  <li><a {% if metadata.lastpage != undefined %} href="{{config.baseurl}}/{{metadata.lastpage.file}}"{%endif%}>
     {{ svgs.doublechevronright( "#999" if metadata.lastpage.file == file else "#000", 1,"em" ) }}
   </a></li>
 </ul>