diff --git a/layout/_partial/post.ejs b/layout/_partial/post.ejs
index 1f67d84..58503ed 100644
--- a/layout/_partial/post.ejs
+++ b/layout/_partial/post.ejs
@@ -26,25 +26,29 @@
             <div class="tableContent fade-in"
                  data-message="<%= post.toc %>"></div>
         <% } %>
-        <%- partial('post/copyright')%>
-    </div>
-    <div id="post-footer" class="post-footer main-content-wrap <%= post.toc? 'content-with-table' : ''%>">
-        <% if ((post.tags) && (post.tags.length > 0)) { %>
-            <div class="post-footer-tags">
-                <span class="text-color-light text-small"><%= __('post.tagged_in') %></span><br/>
-                <%- partial('post/tag', {tags: post.tags})%>
-            </div>
-        <% } %>
-        <% if (post.actions === undefined || post.actions) { %>
-            <%- partial('post/actions', {postContent: postContent}) %>
-        <% } %>
-        <% if (post.comments) { %>
-            <% if (theme.disqus_shortname) { %>
-                <%- partial('post/disqus') %>
-            <% } else if (theme.gitment.enable) { %>
-                <%- partial('post/gitment') %>
-            <% } %>
+        <% if (is_post()) { %>
+            <%- partial('post/copyright')%>
         <% } %>
     </div>
+    <% if (is_post()) { %>
+        <div id="post-footer" class="post-footer main-content-wrap <%= post.toc? 'content-with-table' : ''%>">
+            <% if ((post.tags) && (post.tags.length > 0)) { %>
+                <div class="post-footer-tags">
+                    <span class="text-color-light text-small"><%= __('post.tagged_in') %></span><br/>
+                    <%- partial('post/tag', {tags: post.tags})%>
+                </div>
+            <% } %>
+            <% if (post.actions === undefined || post.actions) { %>
+                <%- partial('post/actions', {postContent: postContent}) %>
+            <% } %>
+            <% if (post.comments) { %>
+                <% if (theme.disqus_shortname) { %>
+                    <%- partial('post/disqus') %>
+                <% } else if (theme.gitment.enable) { %>
+                    <%- partial('post/gitment') %>
+                <% } %>
+            <% } %>
+        </div>
+    <% } %>
 </article>
 
diff --git a/layout/_partial/search.ejs b/layout/_partial/search.ejs
index 65958a6..0a241b4 100644
--- a/layout/_partial/search.ejs
+++ b/layout/_partial/search.ejs
@@ -22,13 +22,13 @@
                 <div class="media">
                     <% if (post.thumbnailImageUrl) { %>
                     <div class="media-left">
-                        <a class="link-unstyled" href="<%= post.link || post.permalink %>">
+                        <a class="link-unstyled" href="<%= post.permalink || post.permalink %>">
                             <img class="media-image" src="<%= post.thumbnailImageUrl %>" width="90" height="90"/>
                         </a>
                     </div>
                     <% } %>
                     <div class="media-body">
-                        <a class="link-unstyled" href="<%= post.link || post.permalink %>">
+                        <a class="link-unstyled" href="<%= post.permalink || post.permalink %>">
                             <h3 class="media-heading"><%= post.title %></h3>
                         </a>
                         <span class="media-meta">
diff --git a/source/_js/search-tools.js b/source/_js/search-tools.js
index 5c23e7d..4422bba 100755
--- a/source/_js/search-tools.js
+++ b/source/_js/search-tools.js
@@ -198,7 +198,7 @@
       var html = '';
       posts.forEach(function(post) {
         html += '<div class="media">';
-        html += '<a class="search-title" href="' + post.path + '">';
+        html += '<a class="search-title" href="' + post.permalink + '">';
         html += '<i class="fa fa-quote-left"></i>';
         html += '<span id="search-post-title">' + post.title + '</span>';
         html += '</a>';