Adding support for calendar query