Fix two major bugs

Fix a bug in editing zones.
Allow the union of zones.