Calendars working again
Adding filter