diff --git a/apps/search_indexes/serializers.py b/apps/search_indexes/serializers.py
index a43ebaf7..3b5561fa 100644
--- a/apps/search_indexes/serializers.py
+++ b/apps/search_indexes/serializers.py
@@ -243,8 +243,8 @@ class WineOriginSerializer(serializers.Serializer):
 class EstablishmentDocumentSerializer(InFavoritesMixin, DocumentSerializer):
     """Establishment document serializer."""
 
-    establishment_type = EstablishmentTypeSerializer()
-    establishment_subtypes = EstablishmentTypeSerializer(many=True)
+    type = EstablishmentTypeSerializer(source='establishment_type')
+    subtypes = EstablishmentTypeSerializer(many=True, source='establishment_subtypes')
     address = AddressDocumentSerializer(allow_null=True)
     tags = TagsDocumentSerializer(many=True, source='visible_tags')
     restaurant_category = TagsDocumentSerializer(many=True, allow_null=True)
@@ -280,8 +280,8 @@ class EstablishmentDocumentSerializer(InFavoritesMixin, DocumentSerializer):
             'wine_origins',
             # 'works_now',
             # 'collections',
-            # 'establishment_type',
-            # 'establishment_subtypes',
+            'type',
+            'subtypes',
         )