Tweak data publication as per @JeniT's suggestions