diff --git a/_layouts/categories.html b/_layouts/categories.html
index aa2c6e80..f5448a29 100644
--- a/_layouts/categories.html
+++ b/_layouts/categories.html
@@ -25,14 +25,15 @@ layout: archive
{% endfor %}
+{% assign entries_layout = page.entries_layout | default: 'list' %}
{% for i in (1..categories_max) reversed %}
{% for category in site.categories %}
{% if category[1].size == i %}
{{ category[0] }}
-
+
{% for post in category.last %}
- {% include archive-single.html type=page.entries_layout %}
+ {% include archive-single.html type=entries_layout %}
{% endfor %}
{% for post in year.items %}
- {% include archive-single.html type=page.entries_layout %}
+ {% include archive-single.html type=entries_layout %}
{% endfor %}
+ {% include posts-tag.html taxonomy=page.taxonomy type=entries_layout %}
diff --git a/_layouts/tags.html b/_layouts/tags.html
index 128e176e..daa11828 100644
--- a/_layouts/tags.html
+++ b/_layouts/tags.html
@@ -25,14 +25,15 @@ layout: archive
{% endfor %}
+{% assign entries_layout = page.entries_layout | default: 'list' %}
{% for i in (1..tags_max) reversed %}
{% for tag in site.tags %}
{% if tag[1].size == i %}
{{ tag[0] }}
-
+
{% for post in tag.last %}
- {% include archive-single.html type=page.entries_layout %}
+ {% include archive-single.html type=entries_layout %}
{% endfor %}