Add field service_point_id
Fix behavior with admin division geometries