No need for defaultZoneName. Fix live/draft switching.