Improvements to data models and initial support for combined jurisdiction + officials object with geocoding