diff --git a/apps/product/models.py b/apps/product/models.py
index bd28d533..2e3d26e7 100644
--- a/apps/product/models.py
+++ b/apps/product/models.py
@@ -265,8 +265,10 @@ class Product(GalleryModelMixin, TranslatedFieldsMixin, BaseAttributes, HasTagsM
 
     @property
     def related_tags(self):
-        return super().visible_tags.exclude(category__index_name__in=['sugar-content', 'wine-color',
-                    'bottles-produced','serial-number', 'grape-variety'])
+        return super().visible_tags.exclude(category__index_name__in=[
+            'sugar-content', 'wine-color', 'bottles-produced',
+            'serial-number', 'grape-variety']
+        )
 
     @property
     def display_name(self):
diff --git a/apps/product/views/common.py b/apps/product/views/common.py
index 911d1f0b..8b857ddb 100644
--- a/apps/product/views/common.py
+++ b/apps/product/views/common.py
@@ -17,7 +17,6 @@ class ProductBaseView(generics.GenericAPIView):
         return Product.objects.published() \
             .with_base_related() \
             .annotate_in_favorites(self.request.user) \
-            .by_country_code(self.request.country_code) \
             .order_by('-created')
 
 
@@ -27,7 +26,8 @@ class ProductListView(ProductBaseView, generics.ListAPIView):
     filter_class = filters.ProductFilterSet
 
     def get_queryset(self):
-        qs = super().get_queryset().with_extended_related()
+        qs = super().get_queryset().with_extended_related() \
+                                   .by_country_code(self.request.country_code)
         return qs