Cosmetic change
Calendar takes default filter
Change configuration scheme