Made Changes to Ensure Zone List Alignment

Made some changes such as flattening the lists of zones to ensure that
the branch numbers align with each other across HB.