diff --git a/apps/tag/filters.py b/apps/tag/filters.py
index 47ec26e0..65440d98 100644
--- a/apps/tag/filters.py
+++ b/apps/tag/filters.py
@@ -46,7 +46,11 @@ class TagCategoryFilterSet(TagsBaseFilterSet):
 
     # todo: filter by establishment type
     def by_establishment_type(self, queryset, name, value):
-        return queryset.by_establishment_type(value)
+        if value == EstablishmentType.ARTISAN:
+            qs = models.TagCategory.objects.filter(index_name='shop_category')
+        else:
+            qs = queryset.by_establishment_type(value)
+        return qs
 
 
 class TagsFilterSet(TagsBaseFilterSet):
@@ -65,7 +69,7 @@ class TagsFilterSet(TagsBaseFilterSet):
 
     def by_establishment_type(self, queryset, name, value):
         if value == EstablishmentType.ARTISAN:
-            return models.Tag.objects.by_category_index_name('shop_category')
+            return models.Tag.objects.by_category_index_name('shop_category')[0:8]
         return queryset.by_establishment_type(value)
 
     # TMP TODO remove it later