Fix associations with [super/sub]calendars