diff --git a/smash/web/models/worker.py b/smash/web/models/worker.py
index 86e2304dd544cadf224bec751e49b62f874301e6..db3a66c2279d2483050026f013eaa4eebda2b0da 100644
--- a/smash/web/models/worker.py
+++ b/smash/web/models/worker.py
@@ -5,7 +5,7 @@ import logging
 from django.contrib.auth.models import User, AnonymousUser
 from django.db import models
 
-from web.models.constants import GLOBAL_STUDY_ID, COUNTRY_OTHER_ID
+from web.models.constants import GLOBAL_STUDY_ID, COUNTRY_OTHER_ID, AVAILABILITY_HOLIDAY, AVAILABILITY_EXTRA
 from web.models.worker_study_role import STUDY_ROLE_CHOICES, HEALTH_PARTNER_ROLE_CHOICES, \
     VOUCHER_PARTNER_ROLE_CHOICES, WORKER_STAFF, WORKER_HEALTH_PARTNER, WORKER_VOUCHER_PARTNER, ROLE_CHOICES
 
@@ -61,9 +61,9 @@ class Worker(models.Model):
                                        verbose_name='Locations',
                                        blank=True
                                        )
-    appointments = models.ManyToManyField('web.Appointment', blank=True,
-                                          verbose_name='Appointments'
-                                          )
+    #appointments = models.ManyToManyField('web.Appointment', blank=True,
+    #                                      verbose_name='Appointments'
+    #                                      )
     user = models.OneToOneField(User, blank=True, null=True,
                                 verbose_name='Username'
                                 )
@@ -141,7 +141,8 @@ class Worker(models.Model):
 
     def is_on_leave(self):
         if len(self.holiday_set.filter(datetime_end__gt=datetime.datetime.now(),
-                                       datetime_start__lt=datetime.datetime.now())):
+                                       datetime_start__lt=datetime.datetime.now(),
+                                        kind=AVAILABILITY_HOLIDAY)):
             return True
         return False