diff --git a/apps/establishment/admin.py b/apps/establishment/admin.py
index e5b48822..02f28314 100644
--- a/apps/establishment/admin.py
+++ b/apps/establishment/admin.py
@@ -57,6 +57,8 @@ class ProductInline(admin.TabularInline):
 class EstablishmentAdmin(BaseModelAdminMixin, admin.ModelAdmin):
     """Establishment admin."""
     list_display = ['id', '__str__', 'image_tag', ]
+    search_fields = ['id', 'name', 'index_name', 'slug']
+    list_filter = ['public_mark', 'toque_number']
 
     # inlines = [
     #     AwardInline, ContactPhoneInline, ContactEmailInline,
diff --git a/apps/location/models.py b/apps/location/models.py
index 33487662..32e5b6d7 100644
--- a/apps/location/models.py
+++ b/apps/location/models.py
@@ -184,6 +184,10 @@ class WineRegion(models.Model):
         verbose_name_plural = _('wine regions')
         verbose_name = _('wine region')
 
+    def __str__(self):
+        """Override dunder method."""
+        return self.name
+
 
 class WineSubRegionQuerySet(models.QuerySet):
     """Wine sub region QuerySet."""
@@ -204,6 +208,10 @@ class WineSubRegion(models.Model):
         verbose_name_plural = _('wine sub regions')
         verbose_name = _('wine sub region')
 
+    def __str__(self):
+        """Override dunder method."""
+        return self.name
+
 
 class WineVillageQuerySet(models.QuerySet):
     """Wine village QuerySet."""
@@ -227,6 +235,10 @@ class WineVillage(models.Model):
         verbose_name = _('wine village')
         verbose_name_plural = _('wine villages')
 
+    def __str__(self):
+        """Override str dunder."""
+        return self.name
+
 
 # todo: Make recalculate price levels
 @receiver(post_save, sender=Country)
diff --git a/apps/product/admin.py b/apps/product/admin.py
index 9620bb5f..dafbdbcb 100644
--- a/apps/product/admin.py
+++ b/apps/product/admin.py
@@ -11,7 +11,7 @@ class ProductAdmin(BaseModelAdminMixin, admin.ModelAdmin):
     list_filter = ('available', 'product_type')
     list_display = ('id', '__str__', 'get_category_display', 'product_type')
     raw_id_fields = ('subtypes', 'classifications', 'standards',
-                     'tags', 'gallery')
+                     'tags', 'gallery', 'establishment',)
 
 
 @admin.register(ProductGallery)
diff --git a/apps/product/models.py b/apps/product/models.py
index fe169903..482eb536 100644
--- a/apps/product/models.py
+++ b/apps/product/models.py
@@ -181,7 +181,7 @@ class Product(TranslatedFieldsMixin, BaseAttributes):
                                        help_text=_('attribute from legacy db'))
     wine_village = models.ForeignKey('location.WineVillage', on_delete=models.PROTECT,
                                      blank=True, null=True,
-                                     verbose_name=_('wine appellation'))
+                                     verbose_name=_('wine village'))
     slug = models.SlugField(unique=True, max_length=255, null=True,
                             verbose_name=_('Slug'))
     favorites = generic.GenericRelation(to='favorites.Favorites')