Calendar Filtering fixed.