Upgrade to 2.2, fix the zone form