refactor calendar behavior && commented out filter see note