Simplify zone-matching logic, to avoid evaluating every single zone