add fix for calendar id usage for sync purpose.