diff --git a/layouts/blog/list.html b/layouts/blog/list.html
index f8cd8ce..c6d24c2 100644
--- a/layouts/blog/list.html
+++ b/layouts/blog/list.html
@@ -31,15 +31,11 @@
         <div class="bloglist-item">
           <p><a href="{{ .Permalink }}">{{ .Title }}</a></p>
           <p class="bloglist-item-tag">
-            {{ $tag_count := 0 }}
             {{ range .Params.tags }}
-            {{ if lt $tag_count 2 }}
             {{ $name := . }}
             {{ with $.Site.GetPage (printf "/tags/%s" (. | urlize)) }}
             <span><a href="{{ .Permalink }}">#{{ $name }}</a> </span>
             {{ end }}
-            {{ $tag_count = add $tag_count 1 }}
-            {{ end }}
             {{ end }}
           </p>
         </div>
diff --git a/layouts/tags/list.html b/layouts/tags/list.html
index 4d734ca..95853fb 100644
--- a/layouts/tags/list.html
+++ b/layouts/tags/list.html
@@ -2,32 +2,9 @@
   {{ partial "header.html" . }}
   <main>
   <div class='bloglist-teaser block-center' style="margin-top: 2rem;">
-    <p>Here you'll find <strong>{{ len .Pages | lang.FormatNumber 0 }} post{{if gt (len .Pages) 1}}s{{end}}</strong>
-    about <u>{{ .Title }}</u>.</p>
-
-  <!-- Wikidata context -->
-  {{ $tagKey := .Title | urlize }}
-  {{ with index .Site.Data.wikidata_mappings $tagKey }}
-  <div class='wikidata-context block-center' style="margin-top: 1rem; margin-bottom: 2rem;">
-    {{ if eq (len .entities) 1 }}
-      {{ $entity := index .entities 0 }}
-      <p style="font-size: 1.25rem;">
-        Same as <a href="{{ $entity.url }}">{{ $entity.id }}</a>, {{ $entity.description }}.
-      </p>
-    {{ else }}
-      <p style="font-size: 1.25rem;"><strong>These posts may refer to:</strong></p>
-      <ul style="font-size: 1.25rem;">
-      {{ range .entities }}
-        <li>
-          <a href="{{ .url }}">{{ .id }}</a> – {{ .description }}
-        </li>
-      {{ end }}
-      </ul>
-    {{ end }}
+    Here you'll find <strong>{{ len .Pages | lang.FormatNumber 0 }} posts</strong>
+    about <u>{{ .Title }}</u> </strong>.
   </div>
-  {{ end }}
-  </div>
-
   <!-- contents -->
   <div class="bloglist">
     {{ $listPageDateFormat := .Site.Params.listPageDateFormat | default "2006"}}
@@ -42,4 +19,4 @@
     {{ end }}
   </div>
   </main>
-{{ end }}
\ No newline at end of file
+{{ end }}