Fix the matching of zones to be more reliable.