diff --git a/apps/search_indexes/documents/establishment.py b/apps/search_indexes/documents/establishment.py
index e4e0c937..7eac2d6c 100644
--- a/apps/search_indexes/documents/establishment.py
+++ b/apps/search_indexes/documents/establishment.py
@@ -37,7 +37,7 @@ class EstablishmentDocument(Document):
     works_noon = fields.ListField(fields.IntegerField(
         attr='works_noon'
     ))
-    # works_now = fields.BooleanField(attr='works_now')
+    works_now = fields.BooleanField(attr='works_now')
     tags = fields.ObjectField(
         properties={
             'id': fields.IntegerField(attr='id'),
diff --git a/apps/search_indexes/views.py b/apps/search_indexes/views.py
index 1cbf9d05..a53e2615 100644
--- a/apps/search_indexes/views.py
+++ b/apps/search_indexes/views.py
@@ -139,7 +139,7 @@ class EstablishmentDocumentViewSet(BaseDocumentViewSet):
             'lookups': [
                 constants.LOOKUP_QUERY_IN,
             ],
-    },
+        },
         'works_noon': {
             'field': 'works_noon',
             'lookups': [
@@ -152,12 +152,12 @@ class EstablishmentDocumentViewSet(BaseDocumentViewSet):
                 constants.LOOKUP_QUERY_IN,
             ],
         },
-        # 'works_now': {
-        #     'field': 'works_now',
-        #     'lookups': [
-        #         constants.LOOKUP_FILTER_TERM,
-        #     ]
-        # },
+        'works_now': {
+            'field': 'works_now',
+            'lookups': [
+                constants.LOOKUP_FILTER_TERM,
+            ]
+        },
     }
 
     geo_spatial_filter_fields = {
diff --git a/apps/transfer/serializers/establishment.py b/apps/transfer/serializers/establishment.py
index 7c8ce97c..6a2fcde5 100644
--- a/apps/transfer/serializers/establishment.py
+++ b/apps/transfer/serializers/establishment.py
@@ -6,8 +6,8 @@ from establishment.models import Establishment, ContactEmail, ContactPhone, Esta
 from location.models import Address
 from timetable.models import Timetable
 from utils.legacy_parser import parse_legacy_schedule_content
+from utils.serializers import TimeZoneChoiceField
 from utils.slug_generator import generate_unique_slug
-from pytz import timezone as ptz
 
 
 class EstablishmentSerializer(serializers.ModelSerializer):
@@ -26,7 +26,7 @@ class EstablishmentSerializer(serializers.ModelSerializer):
     twitter = serializers.CharField(allow_null=True, allow_blank=True)
     booking = serializers.CharField(allow_null=True, allow_blank=True)
     state = serializers.CharField(allow_null=True)
-    tz = serializers.CharField()
+    tz = TimeZoneChoiceField()
     created = serializers.DateTimeField(format='%m-%d-%Y %H:%M:%S')
 
     class Meta:
@@ -59,7 +59,6 @@ class EstablishmentSerializer(serializers.ModelSerializer):
             'establishment_type_id': self.get_type(data),
             'is_publish': data.get('state') == 'published',
         })
-        data['tz'] = ptz(data['tz'])
         data.pop('location')
         data.pop('type')
         data.pop('state')