diff --git a/apps/search_indexes/documents/establishment.py b/apps/search_indexes/documents/establishment.py
index 1f147baa..4306eed4 100644
--- a/apps/search_indexes/documents/establishment.py
+++ b/apps/search_indexes/documents/establishment.py
@@ -50,12 +50,7 @@ class EstablishmentDocument(Document):
             'id': fields.IntegerField(attr='id'),
             'weekday': fields.IntegerField(attr='weekday'),
             'weekday_display': fields.KeywordField(attr='get_weekday_display'),
-            'opening_at': fields.DateField(attr='opening_at'),
-            'closed_at': fields.DateField(attr='closed_at'),
-            'lunch_start': fields.DateField(attr='lunch_start'),
-            'lunch_end': fields.DateField(attr='lunch_end'),
-            'dinner_end': fields.DateField(attr='dinner_end'),
-            'dinner_start': fields.DateField(attr='dinner_start'),
+            'closed_at': fields.KeywordField(attr='closed_at_str'),
         }
     ))
     address = fields.ObjectField(
diff --git a/apps/search_indexes/serializers.py b/apps/search_indexes/serializers.py
index d29c2b6b..651205d7 100644
--- a/apps/search_indexes/serializers.py
+++ b/apps/search_indexes/serializers.py
@@ -35,14 +35,8 @@ class ScheduleDocumentSerializer(serializers.Serializer):
 
     id = serializers.IntegerField()
     weekday = serializers.IntegerField()
-    # weekday_display = serializers.CharField()
-    opening_at = serializers.CharField()
+    weekday_display = serializers.CharField()
     closed_at = serializers.CharField()
-    lunch_start = serializers.CharField()
-    lunch_end = serializers.CharField()
-    dinner_end = serializers.CharField()
-    dinner_start = serializers.CharField()
-
 
 
 class NewsDocumentSerializer(DocumentSerializer):
diff --git a/apps/timetable/models.py b/apps/timetable/models.py
index caa6e6ac..35469c32 100644
--- a/apps/timetable/models.py
+++ b/apps/timetable/models.py
@@ -35,6 +35,10 @@ class Timetable(ProjectBaseMixin):
     opening_at = models.TimeField(verbose_name=_('Opening time'), null=True)
     closed_at = models.TimeField(verbose_name=_('Closed time'), null=True)
 
+    @property
+    def closed_at_str(self):
+        return str(self.closed_at) if self.closed_at else None
+
     @property
     def works_at_noon(self):
         return bool(self.closed_at and self.closed_at <= self.NOON)