diff --git a/layout/_partial/archive.ejs b/layout/_partial/archive.ejs
index 93c3bf3..83314a1 100755
--- a/layout/_partial/archive.ejs
+++ b/layout/_partial/archive.ejs
@@ -13,17 +13,19 @@
 <% } %>
 
 <section class="post-list">
-    <% page.posts.each(function(post){ %>
-        <% if (post.top == true) { %>
+    <% if (page.prev == 0) { %>
+      <% site.posts.each(function(post){ %>
+        <% if (post.top) { %>
           <div class='post-wrapper'>
-              <%- partial('post', {post: post}) %>
+            <%- partial('post', {post: post}) %>
           </div>
         <% } %>
-    <% }) %>
+      <% }) %>
+    <% } %>
     <% page.posts.each(function(post){ %>
-      <% if (!post.top || post.top != true) { %>
+      <% if (!post.top) { %>
         <div class='post-wrapper'>
-            <%- partial('post', {post: post}) %>
+          <%- partial('post', {post: post}) %>
         </div>
       <% } %>
     <% }) %>
diff --git a/layout/_partial/meta.ejs b/layout/_partial/meta.ejs
index c41a6fa..0b7b317 100644
--- a/layout/_partial/meta.ejs
+++ b/layout/_partial/meta.ejs
@@ -53,9 +53,9 @@
       <% } %>
     <% } %>
 
-    <% if(isPostList && post.top == true && (!post.meta || post.meta.top != false)){ %>
+    <% if(isPostList && post.top && (!post.meta || post.meta.top != false)){ %>
       <div class="metatag top">
-        <i class="fas fa-angle-double-up fa-fw" aria-hidden="true"></i>&nbsp;<%- __('post.top') %>
+        <i class="fas fa-angle-double-up fa-fw" aria-hidden="true"></i>&nbsp;<%- post.top != true ? post.top : __('post.top') %>
       </div>
     <% } %>