Fix for missing surfacewater/groundwater fields