diff --git a/app/models/tag.rb b/app/models/tag.rb
index c5aa41f254..264a2ff4e5 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -116,10 +116,10 @@ def self.find_nodes_by_type(tagnames, type = 'note', limit = 10)
   end
 
   def self.counter(tagname)
-    Node.where(type: %w(note page))
-        .where('term_data.name = ?', tagname)
-        .includes(:node_tag, :tag)
-        .references(:term_data)
+    Node.where(status: 1, type: %w(note page))
+        .includes(:revision, :tag)
+        .references(:term_data, :node_revisions)
+        .where('term_data.name = ? OR term_data.parent = ?', tagname, tagname)
         .count
   end
 
diff --git a/app/views/tag/_topicCard.html.erb b/app/views/tag/_topicCard.html.erb
index 4f93866a34..f4c06bf8f9 100644
--- a/app/views/tag/_topicCard.html.erb
+++ b/app/views/tag/_topicCard.html.erb
@@ -12,8 +12,10 @@
       </div>
       <div class="card-body" style="padding:0.8em;">
         <div class="node-list">
+          <% count = 0 %> 
           <% Tag.find_nodes_by_type(tag.name, type = 'note', limit = 3).where.not(nid: shown_nids).each do |node|  %>
             <% shown_nids << node.id %>
+            <% count = count + 1 %>
             <div class="node-body">
               <% if node.main_image %>
                 <img class="rounded-circle pull-left" id="profile-photo" style="width:20px; height:20px; margin-right:8px; display: inline-block;" src="<%= node.main_image.path(:default) %>" />
@@ -32,7 +34,7 @@
       </div>
 
       <div class="card-footer" style="background-color: inherit; border:none;">
-        <a style="padding-top:15px;text-decoration:underline;color:#808080;display:inline-block;" href="/tag/<%= tag.name %>"><%= Tag.counter(tag.name)-shown_nids.count - Tag.find_nodes_by_type(tag.name, type = 'note', limit = 3).where.not(nid: shown_nids).count %> <%= translation('tag.index.more_posts') %> &raquo;</a>
+        <a style="padding-top:15px;text-decoration:underline;color:#808080;display:inline-block;" href="/tag/<%= tag.name %>"><%= [Tag.counter(tag.name) - shown_nids.count - Tag.find_nodes_by_type(tag.name, type = 'note', limit = 3).where.not(nid: shown_nids).count, 0].max %> <%= translation('tag.index.more_posts') %> &raquo;</a>
         <div id="follow-unfollow-column-<%=tag.tid%>" style="float:right;margin:10px 0 10px 10px;">
           <% if current_user %>
             <% if !current_user.following(tag.name) %>