Adding filtering to calendars and a few other things