Zone order Prettify support fixes