Split calendar off to separate collection and added back autopublish