Resolve merge conflicts and fix broken tests
Allow alphanumeric, underscore, hyphen, dot chars for district/region/zone name