diff --git a/_includes/archive-single.html b/_includes/archive-single.html
index 222f4750..6ab261f1 100644
--- a/_includes/archive-single.html
+++ b/_includes/archive-single.html
@@ -20,31 +20,30 @@
{{ title }}
{% if post.excerpt %}
{{ post.excerpt | markdownify | strip_html | truncate: 300 }}
{% endif %} - - {% if post.name %} - {% assign tags = Nil%} + {% if post.name and post.categories contains 'Companies' %} + {% assign tags = Nil%} {% assign sorted_tags = Nil%} {% for company in site.data.companys %} {% if post.name == company.name %} - {% if company.parent %}{% assign tags = company.parent | push: post.name %}{% endif %} - {% if company.related != Nil %} - {% if company.related contains ';'%} - {% assign tgs = company.related |split: '; ' | push: post.name %} - {% assign tags = tags | concat: tgs %} - {% else %} - {% assign tags = tags | push: company.related | push: post.name %} - {% endif%} - {% endif %} - {% if tags != Nil %} - {% assign sorted_tags = tags | concat: post.tags | uniq | compact | sort_natural %} - {% elsif post.tags !=Nil %} - {% assign sorted_tags = post.tags | uniq | compact | sort_natural %} - {% endif%} + {% if company.parent %}{% assign tags = company.parent | push: post.name %}{% endif %} + {% if company.related != Nil %} + {% if company.related contains ';'%} + {% assign tgs = company.related |split: '; ' | push: post.name %} + {% assign tags = tags | concat: tgs %} + {% else %} + {% assign tags = tags | push: company.related | push: post.name %} + {% endif%} + {% endif %} + {% if tags != Nil %} + {% assign sorted_tags = tags | concat: post.tags | uniq | compact | sort_natural %} + {% elsif post.tags !=Nil %} + {% assign sorted_tags = post.tags | uniq | compact | sort_natural %} + {% endif%} {% endif %} {% endfor %} - {% else %} - {% assign sorted_tags = post.tags | uniq | compact | sort %} - {% endif %} + {% else %} + {% assign sorted_tags = post.tags | uniq | compact | sort %} + {% endif %} {% for tag in sorted_tags %} {% endfor %}