diff --git a/debian/changelog b/debian/changelog
index 00499633430f..e7fa26361b20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
   [Michele Simionato]
+  * Extended consequences to perils
+  * Replaced taxonomy mapping by loss type with taxonomy mapping by peril
   * Internal: changed the ordering in the composite risk model from
     (loss_type, riskid) -> (riskid, loss_type)
   * Added an exporter for trt_gsim
diff --git a/openquake/calculators/event_based_damage.py b/openquake/calculators/event_based_damage.py
index 24a654a2385e..db6c68cc2f3b 100644
--- a/openquake/calculators/event_based_damage.py
+++ b/openquake/calculators/event_based_damage.py
@@ -91,10 +91,11 @@ def _gen_dd3(asset_df, gmf_df, crmodel, dparam, mon):
 
     # this part is ultra-slow, especially for discrete damage distributions
     E = len(dparam.eids)
-    L = len(oq.loss_types)
+    P = len(crmodel.perils)
+    [lt] = oq.loss_types  # assume single loss type
     for taxo, adf in asset_df.groupby('taxonomy'):
         with mon:
-            out = crmodel.get_output(adf, gmf_df)
+            outs = crmodel.get_output(adf, gmf_df)  # dicts loss_type -> array
             aids = adf.index.to_numpy()
             A = len(aids)
             assets = adf.to_records()
@@ -102,18 +103,18 @@ def _gen_dd3(asset_df, gmf_df, crmodel, dparam, mon):
                 number = assets['value-number']
             else:
                 number = assets['value-number'] = U32(assets['value-number'])
-            dd4 = numpy.zeros((L, A, E, dparam.Dc), F32)
+            dd4 = numpy.zeros((P, A, E, dparam.Dc), F32)
             D = dparam.D
-            for lti, lt in enumerate(oq.loss_types):
+            for p, out in enumerate(outs):
                 fractions = out[lt]
                 if oq.float_dmg_dist:
                     for a in range(A):
-                        dd4[lti, a, :, :D] = fractions[a] * number[a]
+                        dd4[p, a, :, :D] = fractions[a] * number[a]
                 else:
                     # this is a performance distaster; for instance
                     # the Messina test in oq-risk-tests becomes 12x
                     # slower even if it has only 25_736 assets
-                    dd4[lti, :, :, :D] = dparam.rng.discrete_dmg_dist(
+                    dd4[p, :, :, :D] = dparam.rng.discrete_dmg_dist(
                         dparam.eids, fractions, number)
 
                 # secondary perils and consequences
@@ -122,12 +123,12 @@ def _gen_dd3(asset_df, gmf_df, crmodel, dparam, mon):
                         for d in range(1, D):
                             # doing the mean on the secondary simulations
                             if oq.float_dmg_dist:
-                                dd4[lti, a, :, d] *= probs
+                                dd4[p, a, :, d] *= probs
                             else:
-                                dd4[lti, a, :, d] *= dprobs
+                                dd4[p, a, :, d] *= dprobs
 
             df = crmodel.tmap_df[crmodel.tmap_df.taxi == assets[0]['taxonomy']]
-            if L > 1:
+            if P > 1:
                 # compose damage distributions
                 dd3 = numpy.empty(dd4.shape[1:])
                 for a in range(A):
diff --git a/openquake/calculators/event_based_risk.py b/openquake/calculators/event_based_risk.py
index 8881a47f6fde..7366a9e9ae82 100644
--- a/openquake/calculators/event_based_risk.py
+++ b/openquake/calculators/event_based_risk.py
@@ -242,7 +242,7 @@ def gen_outputs(df, crmodel, rng, monitor):
             if len(gmf_df) == 0:  # common enough
                 continue
             with mon_risk:
-                out = crmodel.get_output(
+                [out] = crmodel.get_output(
                     adf, gmf_df, crmodel.oqparam._sec_losses, rng)
             yield out
 
diff --git a/openquake/calculators/tests/event_based_risk_test.py b/openquake/calculators/tests/event_based_risk_test.py
index 1e947ff6f3c5..60b02fc3c31d 100644
--- a/openquake/calculators/tests/event_based_risk_test.py
+++ b/openquake/calculators/tests/event_based_risk_test.py
@@ -553,7 +553,7 @@ def test_case_7a(self):
         self.assertEqual(nrups, 2)  # two ruptures >= 80% of the losses
 
     def test_case_8(self):
-        # nontrivial taxonomy mapping
+        # loss_type-dependent taxonomy mapping
         out = self.run_calc(case_8.__file__,  'job.ini', exports='csv',
                             concurrent_tasks='0')
         for fname in out['aggrisk', 'csv']:
diff --git a/openquake/calculators/tests/scenario_damage_test.py b/openquake/calculators/tests/scenario_damage_test.py
index 29da745a0497..721b58f14da0 100644
--- a/openquake/calculators/tests/scenario_damage_test.py
+++ b/openquake/calculators/tests/scenario_damage_test.py
@@ -165,7 +165,7 @@ def test_case_7(self):
             'risk_by_event', ['event_id', 'loss_id', 'agg_id'],
             dict(agg_id=K))
         self.assertEqual(len(df), 100)
-        self.assertEqual(len(df[df.dmg_1 > 0]), 12)  # only 12/100 are nonzero
+        self.assertEqual(len(df[df.dmg_1 > 0]), 28)  # only 28/100 are nonzero
 
     def test_case_8(self):
         # case with a shakemap
diff --git a/openquake/commonlib/oqvalidation.py b/openquake/commonlib/oqvalidation.py
index 25ec02d52fc6..826fd90da079 100644
--- a/openquake/commonlib/oqvalidation.py
+++ b/openquake/commonlib/oqvalidation.py
@@ -967,6 +967,8 @@ class OqParam(valid.ParamSet):
         'residents_vulnerability',
         'area_vulnerability',
         'number_vulnerability',
+        'earthquake_fragility',
+        'earthquake_vulnerability',
         'liquefaction_fragility',
         'liquefaction_vulnerability',
         'landslide_fragility',
@@ -1480,7 +1482,8 @@ def set_loss_types(self):
                 costtypes = set(rt.split('/')[2] for rt in rfs)
             except OSError:  # FileNotFound for wrong hazard_calculation_id
                 pass
-        self.all_cost_types = sorted(costtypes)  # including occupants
+        # all_cost_types includes occupants and exclude perils
+        self.all_cost_types = sorted(costtypes - set(scientific.PERILTYPE))
         # fix minimum_asset_loss
         self.minimum_asset_loss = {
             ln: calc.filters.getdefault(self.minimum_asset_loss, ln)
@@ -1641,9 +1644,11 @@ def levels_per_imt(self):
     def set_risk_imts(self, risklist):
         """
         :param risklist:
-            a list of risk functions with attributes .id, .loss_type, .kind
+            a list of risk functions with attributes .id, .peril, .loss_type, .kind
+        :returns:
+            a list of ordered unique perils
 
-        Set the attribute risk_imtls.
+        Set the attribute .risk_imtls as a side effect
         """
         risk_imtls = AccumDict(accum=[])  # imt -> imls
         for i, rf in enumerate(risklist):
@@ -1664,6 +1669,7 @@ def set_risk_imts(self, risklist):
                              (imt, min(imls), max(imls)))
         suggested[-1] += '}'
         self.risk_imtls = {imt: [min(ls)] for imt, ls in risk_imtls.items()}
+
         if self.uniform_hazard_spectra:
             self.check_uniform_hazard_spectra()
         if not self.hazard_imtls:
@@ -1683,6 +1689,9 @@ def set_risk_imts(self, risklist):
             if imt in sec_imts:
                 self.raise_invalid('you forgot to set secondary_perils =')
 
+        risk_perils = sorted(set(rf.peril for rf in risklist))
+        return risk_perils
+
     def get_primary_imtls(self):
         """
         :returns: IMTs and levels which are not secondary
diff --git a/openquake/commonlib/readinput.py b/openquake/commonlib/readinput.py
index d9c354734aa0..45ad94aa3691 100644
--- a/openquake/commonlib/readinput.py
+++ b/openquake/commonlib/readinput.py
@@ -45,7 +45,7 @@
 from openquake.baselib import config, hdf5, parallel, InvalidFile
 from openquake.baselib.performance import Monitor
 from openquake.baselib.general import (
-    random_filter, countby, group_array, get_duplicates, gettemp, AccumDict)
+    random_filter, countby, get_duplicates, gettemp, AccumDict)
 from openquake.baselib.python3compat import zip, decode
 from openquake.baselib.node import Node
 from openquake.hazardlib.const import StdDev
@@ -968,11 +968,13 @@ def get_imts(oqparam):
     return list(map(imt.from_string, sorted(oqparam.imtls)))
 
 
-def _cons_coeffs(records, loss_types, limit_states):
-    dtlist = [(lt, F32) for lt in loss_types]
+def _cons_coeffs(df, perils, loss_dt, limit_states):
+    dtlist = [(peril, loss_dt) for peril in perils]
     coeffs = numpy.zeros(len(limit_states), dtlist)
-    for rec in records:
-        coeffs[rec['loss_type']] = [rec[ds] for ds in limit_states]
+    for lt in loss_dt.names:
+        for peril in perils:
+            the_df = df[(df.peril == peril) & (df.loss_type == lt)]
+            coeffs[peril][lt] = the_df[limit_states].to_numpy()[0]
     return coeffs
 
 
@@ -993,43 +995,35 @@ def get_crmodel(oqparam):
                 return crm
 
     risklist = get_risk_functions(oqparam)
+    perils = numpy.array(sorted(set(rf.peril for rf in risklist)))
     if not oqparam.limit_states and risklist.limit_states:
         oqparam.limit_states = risklist.limit_states
     elif 'damage' in oqparam.calculation_mode and risklist.limit_states:
         assert oqparam.limit_states == risklist.limit_states
-    loss_types = oqparam.loss_dt().names
     consdict = {}
     if 'consequence' in oqparam.inputs:
         if not risklist.limit_states:
             raise InvalidFile('Missing fragility functions in %s' %
                               oqparam.inputs['job_ini'])
         # build consdict of the form consequence_by_tagname -> tag -> array
+        loss_dt = oqparam.loss_dt()
         for by, fnames in oqparam.inputs['consequence'].items():
             if isinstance(fnames, str):  # single file
                 fnames = [fnames]
-            dtypedict = {
-                by: str, 'consequence': str, 'loss_type': str, None: float}
-
-            # i.e. files collapsed.csv, fatalities.csv, ... with headers
-            # taxonomy,consequence,loss_type,slight,moderate,extensive
-            arrays = []
-            for fname in fnames:
-                arr = hdf5.read_csv(fname, dtypedict).array
-                for no, row in enumerate(arr, 2):
-                    if row['loss_type'] not in loss_types:
-                        msg = '%s: line=%d: there is not fragility function for %s'
-                        logging.warning(msg, fname, no, row['loss_type'])
-                arrays.append(arr[numpy.isin(arr['loss_type'], loss_types)])
-
-            array = numpy.concatenate(arrays)
-            dic = group_array(array, 'consequence')
-            for consequence, group in dic.items():
+            # i.e. files collapsed.csv, fatalities.csv, ... with headers like
+            # taxonomy,consequence,slight,moderate,extensive
+            df = pandas.concat([pandas.read_csv(fname) for fname in fnames])
+            if 'loss_type' not in df.columns:
+                df['loss_type'] = 'structural'
+            if 'peril' not in df.columns:
+                df['peril'] = 'earthquake'
+            for consequence, group in df.groupby('consequence'):
                 if consequence not in scientific.KNOWN_CONSEQUENCES:
                     raise InvalidFile('Unknown consequence %s in %s' %
                                       (consequence, fnames))
                 bytag = {
-                    tag: _cons_coeffs(grp, loss_types, risklist.limit_states)
-                    for tag, grp in group_array(group, by).items()}
+                    tag: _cons_coeffs(grp, perils, loss_dt, risklist.limit_states)
+                    for tag, grp in group.groupby(by)}
                 consdict['%s_by_%s' % (consequence, by)] = bytag
     # for instance consdict['collapsed_by_taxonomy']['W_LFM-DUM_H3']
     # is [(0.05,), (0.2 ,), (0.6 ,), (1.  ,)] for damage state and structural
@@ -1220,7 +1214,7 @@ def aristotle_tmap(oqparam, taxidx):
             for taxo, risk_id, weight in zip(df.taxonomy, df.conversion, df.weight):
                 if taxo in taxidx:
                     acc['country'].append(key)
-                    acc['loss_type'].append('*')
+                    acc['peril'].append('earthquake')
                     acc['taxi'].append(taxidx[taxo])
                     acc['risk_id'].append(risk_id)
                     acc['weight'].append(weight)
@@ -1241,7 +1235,7 @@ def taxonomy_mapping(oqparam, taxidx):
         df = pandas.DataFrame(dict(weight=numpy.ones(nt),
                                    taxi=taxidx.values(),
                                    risk_id=list(taxidx),
-                                   loss_type=['*']*nt,
+                                   peril=['*']*nt,
                                    country=['?']*nt))
         return df
     fname = oqparam.inputs['taxonomy_mapping']
@@ -1255,17 +1249,16 @@ def _taxonomy_mapping(filename, taxidx):
         raise e.__class__('%s while reading %s' % (e, filename))
     if 'weight' not in tmap_df:
         tmap_df['weight'] = 1.
-    if 'loss_type' not in tmap_df:
-        tmap_df['loss_type'] = '*'
+    if 'peril' not in tmap_df:
+        tmap_df['peril'] = '*'
     if 'country' not in tmap_df:
         tmap_df['country'] = '?'
     if 'conversion' in tmap_df.columns:
         # conversion was the old name in the header for engine <= 3.12
         tmap_df = tmap_df.rename(columns={'conversion': 'risk_id'})
-    assert set(tmap_df) == {'country', 'loss_type', 'taxonomy', 'risk_id', 'weight'
-                            }, set(tmap_df)
+    assert set(tmap_df) == {'country', 'peril', 'taxonomy', 'risk_id', 'weight'}, set(tmap_df)
     taxos = set()
-    for (taxo, lt), df in tmap_df.groupby(['taxonomy', 'loss_type']):
+    for (taxo, per), df in tmap_df.groupby(['taxonomy', 'peril']):
         taxos.add(taxo)
         if abs(df.weight.sum() - 1.) > pmf.PRECISION:
             raise InvalidFile('%s: the weights do not sum up to 1 for %s' %
diff --git a/openquake/commonlib/tests/logictree_test.py b/openquake/commonlib/tests/logictree_test.py
index 5c6491def9fd..9afffdef5130 100644
--- a/openquake/commonlib/tests/logictree_test.py
+++ b/openquake/commonlib/tests/logictree_test.py
@@ -2159,7 +2159,7 @@ def test_mixed_lines(self):
         exp = pandas.DataFrame(
             dict(risk_id='taxo1 taxo2 taxo2 taxo3 taxo1'.split(),
                  weight=[1., 1., .5, 1., .5],
-                 loss_type=['*'] * 5,
+                 peril=['*'] * 5,
                  country=['?'] * 5,
                  taxi=[1, 2, 4, 3, 4]))
         pandas.testing.assert_frame_equal(got, exp)
diff --git a/openquake/qa_tests_data/event_based_damage/case_11/structural_consequence_model.csv b/openquake/qa_tests_data/event_based_damage/case_11/structural_consequence_model.csv
index c6354bfcd31e..8deaddd3dbc6 100644
--- a/openquake/qa_tests_data/event_based_damage/case_11/structural_consequence_model.csv
+++ b/openquake/qa_tests_data/event_based_damage/case_11/structural_consequence_model.csv
@@ -1,4 +1,4 @@
-taxonomy,consequence,loss_type,ds1,ds2,ds3,ds4
-tax1,losses,structural,4.000000E-02,1.600000E-01,3.200000E-01,6.400000E-01
-tax2,losses,structural,4.000000E-02,1.600000E-01,3.200000E-01,6.400000E-01
-tax3,losses,structural,4.000000E-02,1.600000E-01,3.200000E-01,6.400000E-01
+taxonomy,consequence,peril,ds1,ds2,ds3,ds4
+tax1,losses,earthquake,4.000000E-02,1.600000E-01,3.200000E-01,6.400000E-01
+tax2,losses,earthquake,4.000000E-02,1.600000E-01,3.200000E-01,6.400000E-01
+tax3,losses,earthquake,4.000000E-02,1.600000E-01,3.200000E-01,6.400000E-01
diff --git a/openquake/qa_tests_data/event_based_damage/case_13/structural_consequence_model.csv b/openquake/qa_tests_data/event_based_damage/case_13/structural_consequence_model.csv
index ce6e090bfbff..ab53806a3fe9 100644
--- a/openquake/qa_tests_data/event_based_damage/case_13/structural_consequence_model.csv
+++ b/openquake/qa_tests_data/event_based_damage/case_13/structural_consequence_model.csv
@@ -1,4 +1,4 @@
-taxonomy,consequence,loss_type,LS1,LS2
-RC,losses,structural,4.000000E-02,1.600000E-01
-RM,losses,structural,4.000000E-02,1.600000E-01
-W,losses,structural,4.000000E-02,1.600000E-01
+taxonomy,consequence,peril,LS1,LS2
+RC,losses,earthquake,4.000000E-02,1.600000E-01
+RM,losses,earthquake,4.000000E-02,1.600000E-01
+W,losses,earthquake,4.000000E-02,1.600000E-01
diff --git a/openquake/qa_tests_data/event_based_damage/case_14/consequences_by_taxonomy.csv b/openquake/qa_tests_data/event_based_damage/case_14/consequences_by_taxonomy.csv
index 6abb27aa25bc..63520a4510dc 100644
--- a/openquake/qa_tests_data/event_based_damage/case_14/consequences_by_taxonomy.csv
+++ b/openquake/qa_tests_data/event_based_damage/case_14/consequences_by_taxonomy.csv
@@ -1,6 +1,6 @@
-taxonomy,consequence,loss_type,slight,moderate,extreme,complete
-Concrete,losses,structural,0.04,0.31,0.6,1
-Adobe,losses,structural,0.04,0.31,0.6,1
-Stone-Masonry,losses,structural,0.04,0.31,0.6,1
-Unreinforced-Brick-Masonry,losses,structural,0.04,0.31,0.6,1
-Wood,losses,structural,0.04,0.31,0.6,1
+taxonomy,consequence,peril,slight,moderate,extreme,complete
+Concrete,losses,earthquake,0.04,0.31,0.6,1
+Adobe,losses,earthquake,0.04,0.31,0.6,1
+Stone-Masonry,losses,earthquake,0.04,0.31,0.6,1
+Unreinforced-Brick-Masonry,losses,earthquake,0.04,0.31,0.6,1
+Wood,losses,earthquake,0.04,0.31,0.6,1
diff --git a/openquake/qa_tests_data/event_based_damage/case_15/consequences_by_taxonomy.csv b/openquake/qa_tests_data/event_based_damage/case_15/consequences_by_taxonomy.csv
index 86f5ad0373cb..bf98828d0ef7 100644
--- a/openquake/qa_tests_data/event_based_damage/case_15/consequences_by_taxonomy.csv
+++ b/openquake/qa_tests_data/event_based_damage/case_15/consequences_by_taxonomy.csv
@@ -1,11 +1,11 @@
-taxonomy,consequence,loss_type,moderate,complete
-Concrete,losses,structural,0.31,1
-Adobe,losses,structural,0.31,1
-Stone-Masonry,losses,structural,0.31,1
-Unreinforced-Brick-Masonry,losses,structural,0.31,1
-Wood,losses,structural,0.31,1
-Concrete,fatalities,structural,0,1
-Adobe,fatalities,structural,0,1
-Stone-Masonry,fatalities,structural,0,1
-Unreinforced-Brick-Masonry,fatalities,structural,0,1
-Wood,fatalities,structural,0,1
+taxonomy,consequence,peril,moderate,complete
+Concrete,losses,earthquake,0.31,1
+Adobe,losses,earthquake,0.31,1
+Stone-Masonry,losses,earthquake,0.31,1
+Unreinforced-Brick-Masonry,losses,earthquake,0.31,1
+Wood,losses,earthquake,0.31,1
+Concrete,fatalities,earthquake,0,1
+Adobe,fatalities,earthquake,0,1
+Stone-Masonry,fatalities,earthquake,0,1
+Unreinforced-Brick-Masonry,fatalities,earthquake,0,1
+Wood,fatalities,earthquake,0,1
diff --git a/openquake/qa_tests_data/event_based_damage/case_16/consequences.csv b/openquake/qa_tests_data/event_based_damage/case_16/consequences.csv
index b473e7aa588a..4a6d36ecc9cc 100644
--- a/openquake/qa_tests_data/event_based_damage/case_16/consequences.csv
+++ b/openquake/qa_tests_data/event_based_damage/case_16/consequences.csv
@@ -1,10 +1,10 @@
-taxonomy,consequence,loss_type,ds1,ds2,ds3,ds4
-tax1,losses,nonstructural,5.000000E-02,2.500000E-01,5.000000E-01,7.500000E-01
-tax2,losses,nonstructural,5.000000E-02,2.500000E-01,5.000000E-01,7.500000E-01
-tax3,losses,nonstructural,5.000000E-02,2.500000E-01,5.000000E-01,7.500000E-01
-tax1,losses,structural,4.000000E-02,1.600000E-01,3.200000E-01,6.400000E-01
-tax2,losses,structural,4.000000E-02,1.600000E-01,3.200000E-01,6.400000E-01
-tax3,losses,structural,4.000000E-02,1.600000E-01,3.200000E-01,6.400000E-01
-tax1,losses,contents,1.000000E-01,3.000000E-01,6.000000E-01,9.000000E-01
-tax2,losses,contents,1.000000E-01,3.000000E-01,6.000000E-01,9.000000E-01
-tax3,losses,contents,1.000000E-01,3.000000E-01,6.000000E-01,9.000000E-01
+taxonomy,consequence,peril,ds1,ds2,ds3,ds4
+tax1,losses,earthquake,5.000000E-02,2.500000E-01,5.000000E-01,7.500000E-01
+tax2,losses,earthquake,5.000000E-02,2.500000E-01,5.000000E-01,7.500000E-01
+tax3,losses,earthquake,5.000000E-02,2.500000E-01,5.000000E-01,7.500000E-01
+tax1,losses,landslide,4.000000E-02,1.600000E-01,3.200000E-01,6.400000E-01
+tax2,losses,landslide,4.000000E-02,1.600000E-01,3.200000E-01,6.400000E-01
+tax3,losses,landslide,4.000000E-02,1.600000E-01,3.200000E-01,6.400000E-01
+tax1,losses,liquefaction,1.000000E-01,3.000000E-01,6.000000E-01,9.000000E-01
+tax2,losses,liquefaction,1.000000E-01,3.000000E-01,6.000000E-01,9.000000E-01
+tax3,losses,liquefaction,1.000000E-01,3.000000E-01,6.000000E-01,9.000000E-01
diff --git a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-.csv b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-.csv
index e0122e6f4c53..245e4da1662c 100644
--- a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-.csv
+++ b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-.csv
@@ -1,50 +1,18 @@
-#,,,,"generated_by='OpenQuake engine 3.21.0-git855f23bdf1', start_date='2024-06-04T05:50:50', checksum=1294572362, risk_investigation_time=1000.0, num_events=781, effective_time=2000.0, limit_states=''"
+#,,,,"generated_by='OpenQuake engine 3.22.0-git36e91b9743', start_date='2024-11-05T09:57:17', checksum=17759650, risk_investigation_time=1000.0, num_events=781, effective_time=2000.0, limit_states=''"
 return_period,loss_type,rlz_id,loss_value,loss_ratio
-5,contents,0,0.00000E+00,0.00000E+00
-10,contents,0,0.00000E+00,0.00000E+00
-20,contents,0,0.00000E+00,0.00000E+00
-50,contents,0,0.00000E+00,0.00000E+00
-100,contents,0,1.57212E+03,1.98050E-02
-200,contents,0,2.81205E+03,3.54252E-02
-500,contents,0,7.28810E+03,9.18128E-02
-1000,contents,0,8.44469E+03,1.06383E-01
 5,structural,0,0.00000E+00,0.00000E+00
 10,structural,0,0.00000E+00,0.00000E+00
 20,structural,0,0.00000E+00,0.00000E+00
-50,structural,0,1.14734E+03,2.52940E-02
-100,structural,0,3.07021E+03,6.76853E-02
-200,structural,0,4.55298E+03,1.00374E-01
-500,structural,0,8.95269E+03,1.97370E-01
-1000,structural,0,9.22738E+03,2.03425E-01
-5,structural+contents,0,0.00000E+00,0.00000E+00
-10,structural+contents,0,0.00000E+00,0.00000E+00
-20,structural+contents,0,0.00000E+00,0.00000E+00
-50,structural+contents,0,1.31593E+03,1.05494E-02
-100,structural+contents,0,3.47284E+03,2.78406E-02
-200,structural+contents,0,7.36503E+03,5.90431E-02
-500,structural+contents,0,1.54849E+04,1.24137E-01
-1000,structural+contents,0,1.65155E+04,1.32399E-01
-5,contents,1,0.00000E+00,0.00000E+00
-10,contents,1,0.00000E+00,0.00000E+00
-20,contents,1,0.00000E+00,0.00000E+00
-50,contents,1,0.00000E+00,0.00000E+00
-100,contents,1,0.00000E+00,0.00000E+00
-200,contents,1,1.36155E+03,1.71523E-02
-500,contents,1,3.95231E+03,4.97898E-02
-1000,contents,1,1.04999E+04,1.32274E-01
+50,structural,0,1.27408E+03,2.80883E-02
+100,structural,0,2.71753E+03,5.99103E-02
+200,structural,0,4.53868E+03,1.00059E-01
+500,structural,0,8.24563E+03,1.81782E-01
+1000,structural,0,9.24680E+03,2.03854E-01
 5,structural,1,0.00000E+00,0.00000E+00
 10,structural,1,0.00000E+00,0.00000E+00
 20,structural,1,0.00000E+00,0.00000E+00
 50,structural,1,0.00000E+00,0.00000E+00
-100,structural,1,1.44993E+03,3.19650E-02
-200,structural,1,1.84873E+03,4.07567E-02
-500,structural,1,2.41440E+03,5.32276E-02
-1000,structural,1,4.87805E+03,1.07541E-01
-5,structural+contents,1,0.00000E+00,0.00000E+00
-10,structural+contents,1,0.00000E+00,0.00000E+00
-20,structural+contents,1,0.00000E+00,0.00000E+00
-50,structural+contents,1,0.00000E+00,0.00000E+00
-100,structural+contents,1,1.66899E+03,1.33798E-02
-200,structural+contents,1,2.44118E+03,1.95702E-02
-500,structural+contents,1,5.80104E+03,4.65050E-02
-1000,structural+contents,1,1.53779E+04,1.23280E-01
+100,structural,1,1.20248E+03,2.65096E-02
+200,structural,1,1.85782E+03,4.09572E-02
+500,structural,1,3.11176E+03,6.86015E-02
+1000,structural,1,6.19738E+03,1.36627E-01
diff --git a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-NAME-taxonomy.csv b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-NAME-taxonomy.csv
index c85e649eb520..d2ffffbd20b5 100644
--- a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-NAME-taxonomy.csv
+++ b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-NAME-taxonomy.csv
@@ -1,170 +1,58 @@
-#,,,,,,"generated_by='OpenQuake engine 3.21.0-git855f23bdf1', start_date='2024-06-04T05:50:50', checksum=1294572362, risk_investigation_time=1000.0, num_events=781, effective_time=2000.0, limit_states=''"
+#,,,,,,"generated_by='OpenQuake engine 3.22.0-git36e91b9743', start_date='2024-11-05T09:57:17', checksum=17759650, risk_investigation_time=1000.0, num_events=781, effective_time=2000.0, limit_states=''"
 NAME_1,taxonomy,return_period,loss_type,rlz_id,loss_value,loss_ratio
-Far-Western,Adobe/Com,5,contents,0,0.00000E+00,0.00000E+00
-Far-Western,Adobe/Com,10,contents,0,0.00000E+00,0.00000E+00
-Far-Western,Adobe/Com,20,contents,0,0.00000E+00,0.00000E+00
-Far-Western,Adobe/Com,50,contents,0,0.00000E+00,0.00000E+00
-Far-Western,Adobe/Com,100,contents,0,0.00000E+00,0.00000E+00
-Far-Western,Adobe/Com,200,contents,0,1.45962E+03,7.35511E-02
-Far-Western,Adobe/Com,500,contents,0,2.79436E+03,1.40810E-01
-Far-Western,Adobe/Com,1000,contents,0,7.28810E+03,3.67251E-01
 Far-Western,Adobe/Com,5,structural,0,0.00000E+00,0.00000E+00
 Far-Western,Adobe/Com,10,structural,0,0.00000E+00,0.00000E+00
 Far-Western,Adobe/Com,20,structural,0,0.00000E+00,0.00000E+00
 Far-Western,Adobe/Com,50,structural,0,0.00000E+00,0.00000E+00
-Far-Western,Adobe/Com,100,structural,0,1.56968E+03,1.38420E-01
-Far-Western,Adobe/Com,200,structural,0,3.21271E+03,2.83308E-01
-Far-Western,Adobe/Com,500,structural,0,6.40691E+03,5.64983E-01
-Far-Western,Adobe/Com,1000,structural,0,9.22738E+03,8.13702E-01
-Far-Western,Adobe/Com,5,structural+contents,0,0.00000E+00,0.00000E+00
-Far-Western,Adobe/Com,10,structural+contents,0,0.00000E+00,0.00000E+00
-Far-Western,Adobe/Com,20,structural+contents,0,0.00000E+00,0.00000E+00
-Far-Western,Adobe/Com,50,structural+contents,0,0.00000E+00,0.00000E+00
-Far-Western,Adobe/Com,100,structural+contents,0,1.56968E+03,5.03345E-02
-Far-Western,Adobe/Com,200,structural+contents,0,5.01394E+03,1.60781E-01
-Far-Western,Adobe/Com,500,structural+contents,0,9.20127E+03,2.95054E-01
-Far-Western,Adobe/Com,1000,structural+contents,0,1.65155E+04,5.29597E-01
+Far-Western,Adobe/Com,100,structural,0,1.59966E+03,1.41064E-01
+Far-Western,Adobe/Com,200,structural,0,3.33571E+03,2.94154E-01
+Far-Western,Adobe/Com,500,structural,0,5.32751E+03,4.69798E-01
+Far-Western,Adobe/Com,1000,structural,0,9.24680E+03,8.15415E-01
 Far-Western,Adobe/Com,5,structural,1,0.00000E+00,0.00000E+00
 Far-Western,Adobe/Com,10,structural,1,0.00000E+00,0.00000E+00
 Far-Western,Adobe/Com,20,structural,1,0.00000E+00,0.00000E+00
 Far-Western,Adobe/Com,50,structural,1,0.00000E+00,0.00000E+00
 Far-Western,Adobe/Com,100,structural,1,0.00000E+00,0.00000E+00
 Far-Western,Adobe/Com,200,structural,1,0.00000E+00,0.00000E+00
-Far-Western,Adobe/Com,500,structural,1,1.66899E+03,1.47178E-01
-Far-Western,Adobe/Com,1000,structural,1,2.28095E+03,2.01142E-01
-Far-Western,Adobe/Com,5,structural+contents,1,0.00000E+00,0.00000E+00
-Far-Western,Adobe/Com,10,structural+contents,1,0.00000E+00,0.00000E+00
-Far-Western,Adobe/Com,20,structural+contents,1,0.00000E+00,0.00000E+00
-Far-Western,Adobe/Com,50,structural+contents,1,0.00000E+00,0.00000E+00
-Far-Western,Adobe/Com,100,structural+contents,1,0.00000E+00,0.00000E+00
-Far-Western,Adobe/Com,200,structural+contents,1,0.00000E+00,0.00000E+00
-Far-Western,Adobe/Com,500,structural+contents,1,1.66899E+03,5.35191E-02
-Far-Western,Adobe/Com,1000,structural+contents,1,2.28095E+03,7.31425E-02
-Mid-Western,Adobe/Res,5,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,10,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,20,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,50,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,100,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,200,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,500,contents,0,3.33055E+03,1.67828E-01
-Mid-Western,Adobe/Res,1000,contents,0,3.90589E+03,1.96820E-01
+Far-Western,Adobe/Com,500,structural,1,0.00000E+00,0.00000E+00
+Far-Western,Adobe/Com,1000,structural,1,1.54159E+03,1.35943E-01
 Mid-Western,Adobe/Res,5,structural,0,0.00000E+00,0.00000E+00
 Mid-Western,Adobe/Res,10,structural,0,0.00000E+00,0.00000E+00
 Mid-Western,Adobe/Res,20,structural,0,0.00000E+00,0.00000E+00
 Mid-Western,Adobe/Res,50,structural,0,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,100,structural,0,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,200,structural,0,3.07021E+03,2.70741E-01
-Mid-Western,Adobe/Res,500,structural,0,5.60740E+03,4.94479E-01
-Mid-Western,Adobe/Res,1000,structural,0,8.95269E+03,7.89479E-01
-Mid-Western,Adobe/Res,5,structural+contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,10,structural+contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,20,structural+contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,50,structural+contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,100,structural+contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,200,structural+contents,0,3.07021E+03,9.84513E-02
-Mid-Western,Adobe/Res,500,structural+contents,0,8.93795E+03,2.86611E-01
-Mid-Western,Adobe/Res,1000,structural+contents,0,1.28586E+04,4.12332E-01
-Mid-Western,Adobe/Res,5,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,10,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,20,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,50,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,100,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,200,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,500,contents,1,1.36155E+03,6.86090E-02
-Mid-Western,Adobe/Res,1000,contents,1,1.36459E+03,6.87625E-02
+Mid-Western,Adobe/Res,100,structural,0,1.00757E+03,8.88514E-02
+Mid-Western,Adobe/Res,200,structural,0,2.11046E+03,1.86108E-01
+Mid-Western,Adobe/Res,500,structural,0,6.60051E+03,5.82055E-01
+Mid-Western,Adobe/Res,1000,structural,0,7.53513E+03,6.64473E-01
 Mid-Western,Adobe/Res,5,structural,1,0.00000E+00,0.00000E+00
 Mid-Western,Adobe/Res,10,structural,1,0.00000E+00,0.00000E+00
 Mid-Western,Adobe/Res,20,structural,1,0.00000E+00,0.00000E+00
 Mid-Western,Adobe/Res,50,structural,1,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,100,structural,1,1.08954E+03,9.60798E-02
-Mid-Western,Adobe/Res,200,structural,1,1.64041E+03,1.44657E-01
-Mid-Western,Adobe/Res,500,structural,1,2.14038E+03,1.88746E-01
-Mid-Western,Adobe/Res,1000,structural,1,2.41440E+03,2.12910E-01
-Mid-Western,Adobe/Res,5,structural+contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,10,structural+contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,20,structural+contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,50,structural+contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Adobe/Res,100,structural+contents,1,1.08954E+03,3.49381E-02
-Mid-Western,Adobe/Res,200,structural+contents,1,1.64041E+03,5.26025E-02
-Mid-Western,Adobe/Res,500,structural+contents,1,3.24462E+03,1.04044E-01
-Mid-Western,Adobe/Res,1000,structural+contents,1,3.50192E+03,1.12295E-01
-Mid-Western,Wood/Com,5,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,10,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,20,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,50,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,100,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,200,contents,0,1.16547E+03,5.87286E-02
-Mid-Western,Wood/Com,500,contents,0,1.58895E+03,8.00678E-02
-Mid-Western,Wood/Com,1000,contents,0,1.64177E+03,8.27296E-02
-Mid-Western,Wood/Com,5,structural+contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,10,structural+contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,20,structural+contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,50,structural+contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,100,structural+contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,200,structural+contents,0,1.16547E+03,3.73728E-02
-Mid-Western,Wood/Com,500,structural+contents,0,1.58895E+03,5.09522E-02
-Mid-Western,Wood/Com,1000,structural+contents,0,1.64177E+03,5.26461E-02
-Mid-Western,Wood/Com,5,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,10,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,20,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,50,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,100,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,200,contents,1,1.05760E+03,5.32929E-02
-Mid-Western,Wood/Com,500,contents,1,3.95231E+03,1.99159E-01
-Mid-Western,Wood/Com,1000,contents,1,9.13530E+03,4.60332E-01
+Mid-Western,Adobe/Res,100,structural,1,1.18926E+03,1.04873E-01
+Mid-Western,Adobe/Res,200,structural,1,1.85782E+03,1.63829E-01
+Mid-Western,Adobe/Res,500,structural,1,3.11176E+03,2.74406E-01
+Mid-Western,Adobe/Res,1000,structural,1,3.11756E+03,2.74917E-01
+Mid-Western,Wood/Com,5,structural,0,0.00000E+00,0.00000E+00
+Mid-Western,Wood/Com,10,structural,0,0.00000E+00,0.00000E+00
+Mid-Western,Wood/Com,20,structural,0,0.00000E+00,0.00000E+00
+Mid-Western,Wood/Com,50,structural,0,0.00000E+00,0.00000E+00
+Mid-Western,Wood/Com,100,structural,0,0.00000E+00,0.00000E+00
+Mid-Western,Wood/Com,200,structural,0,0.00000E+00,0.00000E+00
+Mid-Western,Wood/Com,500,structural,0,0.00000E+00,0.00000E+00
+Mid-Western,Wood/Com,1000,structural,0,6.37835E+02,5.62465E-02
 Mid-Western,Wood/Com,5,structural,1,0.00000E+00,0.00000E+00
 Mid-Western,Wood/Com,10,structural,1,0.00000E+00,0.00000E+00
 Mid-Western,Wood/Com,20,structural,1,0.00000E+00,0.00000E+00
 Mid-Western,Wood/Com,50,structural,1,0.00000E+00,0.00000E+00
 Mid-Western,Wood/Com,100,structural,1,0.00000E+00,0.00000E+00
 Mid-Western,Wood/Com,200,structural,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,500,structural,1,7.91527E+02,6.97995E-02
-Mid-Western,Wood/Com,1000,structural,1,2.99803E+03,2.64376E-01
-Mid-Western,Wood/Com,5,structural+contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,10,structural+contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,20,structural+contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,50,structural+contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,100,structural+contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Com,200,structural+contents,1,1.05760E+03,3.39137E-02
-Mid-Western,Wood/Com,500,structural+contents,1,4.74384E+03,1.52119E-01
-Mid-Western,Wood/Com,1000,structural+contents,1,1.21333E+04,3.89076E-01
-Mid-Western,Wood/Res,5,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,10,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,20,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,50,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,100,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,200,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,500,contents,0,1.77592E+03,8.94896E-02
-Mid-Western,Wood/Res,1000,contents,0,3.91109E+03,1.97082E-01
+Mid-Western,Wood/Com,500,structural,1,7.83649E+02,6.91049E-02
+Mid-Western,Wood/Com,1000,structural,1,3.07982E+03,2.71589E-01
 Mid-Western,Wood/Res,5,structural,0,0.00000E+00,0.00000E+00
 Mid-Western,Wood/Res,10,structural,0,0.00000E+00,0.00000E+00
 Mid-Western,Wood/Res,20,structural,0,0.00000E+00,0.00000E+00
 Mid-Western,Wood/Res,50,structural,0,0.00000E+00,0.00000E+00
 Mid-Western,Wood/Res,100,structural,0,0.00000E+00,0.00000E+00
 Mid-Western,Wood/Res,200,structural,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,500,structural,0,6.56709E+02,5.79108E-02
-Mid-Western,Wood/Res,1000,structural,0,1.43281E+03,1.26350E-01
-Mid-Western,Wood/Res,5,structural+contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,10,structural+contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,20,structural+contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,50,structural+contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,100,structural+contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,200,structural+contents,0,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,500,structural+contents,0,2.43263E+03,7.80064E-02
-Mid-Western,Wood/Res,1000,structural+contents,0,5.34390E+03,1.71361E-01
-Mid-Western,Wood/Res,5,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,10,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,20,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,50,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,100,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,200,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,500,contents,1,1.12650E+03,5.67650E-02
-Mid-Western,Wood/Res,1000,contents,1,1.27660E+03,6.43284E-02
-Mid-Western,Wood/Res,5,structural+contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,10,structural+contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,20,structural+contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,50,structural+contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,100,structural+contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,200,structural+contents,1,0.00000E+00,0.00000E+00
-Mid-Western,Wood/Res,500,structural+contents,1,1.12650E+03,3.61232E-02
-Mid-Western,Wood/Res,1000,structural+contents,1,1.27660E+03,4.09362E-02
+Mid-Western,Wood/Res,500,structural,0,1.22506E+03,1.08030E-01
+Mid-Western,Wood/Res,1000,structural,0,1.64512E+03,1.45072E-01
diff --git a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-NAME.csv b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-NAME.csv
index 8f3227ddc0ec..a5da460b146d 100644
--- a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-NAME.csv
+++ b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-NAME.csv
@@ -1,90 +1,34 @@
-#,,,,,"generated_by='OpenQuake engine 3.21.0-git855f23bdf1', start_date='2024-06-04T05:50:50', checksum=1294572362, risk_investigation_time=1000.0, num_events=781, effective_time=2000.0, limit_states=''"
+#,,,,,"generated_by='OpenQuake engine 3.22.0-git36e91b9743', start_date='2024-11-05T09:57:17', checksum=17759650, risk_investigation_time=1000.0, num_events=781, effective_time=2000.0, limit_states=''"
 NAME_1,return_period,loss_type,rlz_id,loss_value,loss_ratio
-Far-Western,5,contents,0,0.00000E+00,0.00000E+00
-Far-Western,10,contents,0,0.00000E+00,0.00000E+00
-Far-Western,20,contents,0,0.00000E+00,0.00000E+00
-Far-Western,50,contents,0,0.00000E+00,0.00000E+00
-Far-Western,100,contents,0,0.00000E+00,0.00000E+00
-Far-Western,200,contents,0,1.45962E+03,7.35511E-02
-Far-Western,500,contents,0,2.79436E+03,1.40810E-01
-Far-Western,1000,contents,0,7.28810E+03,3.67251E-01
 Far-Western,5,structural,0,0.00000E+00,0.00000E+00
 Far-Western,10,structural,0,0.00000E+00,0.00000E+00
 Far-Western,20,structural,0,0.00000E+00,0.00000E+00
 Far-Western,50,structural,0,0.00000E+00,0.00000E+00
-Far-Western,100,structural,0,1.56968E+03,1.38420E-01
-Far-Western,200,structural,0,3.21271E+03,2.83308E-01
-Far-Western,500,structural,0,6.40691E+03,5.64983E-01
-Far-Western,1000,structural,0,9.22738E+03,8.13702E-01
-Far-Western,5,structural+contents,0,0.00000E+00,0.00000E+00
-Far-Western,10,structural+contents,0,0.00000E+00,0.00000E+00
-Far-Western,20,structural+contents,0,0.00000E+00,0.00000E+00
-Far-Western,50,structural+contents,0,0.00000E+00,0.00000E+00
-Far-Western,100,structural+contents,0,1.56968E+03,5.03345E-02
-Far-Western,200,structural+contents,0,5.01394E+03,1.60781E-01
-Far-Western,500,structural+contents,0,9.20127E+03,2.95054E-01
-Far-Western,1000,structural+contents,0,1.65155E+04,5.29597E-01
+Far-Western,100,structural,0,1.59966E+03,1.41064E-01
+Far-Western,200,structural,0,3.33571E+03,2.94154E-01
+Far-Western,500,structural,0,5.32751E+03,4.69798E-01
+Far-Western,1000,structural,0,9.24680E+03,8.15415E-01
 Far-Western,5,structural,1,0.00000E+00,0.00000E+00
 Far-Western,10,structural,1,0.00000E+00,0.00000E+00
 Far-Western,20,structural,1,0.00000E+00,0.00000E+00
 Far-Western,50,structural,1,0.00000E+00,0.00000E+00
 Far-Western,100,structural,1,0.00000E+00,0.00000E+00
 Far-Western,200,structural,1,0.00000E+00,0.00000E+00
-Far-Western,500,structural,1,1.66899E+03,1.47178E-01
-Far-Western,1000,structural,1,2.28095E+03,2.01142E-01
-Far-Western,5,structural+contents,1,0.00000E+00,0.00000E+00
-Far-Western,10,structural+contents,1,0.00000E+00,0.00000E+00
-Far-Western,20,structural+contents,1,0.00000E+00,0.00000E+00
-Far-Western,50,structural+contents,1,0.00000E+00,0.00000E+00
-Far-Western,100,structural+contents,1,0.00000E+00,0.00000E+00
-Far-Western,200,structural+contents,1,0.00000E+00,0.00000E+00
-Far-Western,500,structural+contents,1,1.66899E+03,5.35191E-02
-Far-Western,1000,structural+contents,1,2.28095E+03,7.31425E-02
-Mid-Western,5,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,10,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,20,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,50,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,100,contents,0,0.00000E+00,0.00000E+00
-Mid-Western,200,contents,0,2.28375E+03,3.83598E-02
-Mid-Western,500,contents,0,4.95944E+03,8.33030E-02
-Mid-Western,1000,contents,0,8.44469E+03,1.41844E-01
+Far-Western,500,structural,1,0.00000E+00,0.00000E+00
+Far-Western,1000,structural,1,1.54159E+03,1.35943E-01
 Mid-Western,5,structural,0,0.00000E+00,0.00000E+00
 Mid-Western,10,structural,0,0.00000E+00,0.00000E+00
 Mid-Western,20,structural,0,0.00000E+00,0.00000E+00
 Mid-Western,50,structural,0,0.00000E+00,0.00000E+00
-Mid-Western,100,structural,0,0.00000E+00,0.00000E+00
-Mid-Western,200,structural,0,3.07021E+03,9.02471E-02
-Mid-Western,500,structural,0,7.04020E+03,2.06943E-01
-Mid-Western,1000,structural,0,8.95269E+03,2.63160E-01
-Mid-Western,5,structural+contents,0,0.00000E+00,0.00000E+00
-Mid-Western,10,structural+contents,0,0.00000E+00,0.00000E+00
-Mid-Western,20,structural+contents,0,0.00000E+00,0.00000E+00
-Mid-Western,50,structural+contents,0,0.00000E+00,0.00000E+00
-Mid-Western,100,structural+contents,0,1.31593E+03,1.40658E-02
-Mid-Western,200,structural+contents,0,3.07021E+03,3.28171E-02
-Mid-Western,500,structural+contents,0,1.39121E+04,1.48705E-01
-Mid-Western,1000,structural+contents,0,1.54849E+04,1.65516E-01
-Mid-Western,5,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,10,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,20,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,50,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,100,contents,1,0.00000E+00,0.00000E+00
-Mid-Western,200,contents,1,1.36155E+03,2.28697E-02
-Mid-Western,500,contents,1,3.95231E+03,6.63863E-02
-Mid-Western,1000,contents,1,1.04999E+04,1.76365E-01
+Mid-Western,100,structural,0,1.00757E+03,2.96171E-02
+Mid-Western,200,structural,0,2.67201E+03,7.85423E-02
+Mid-Western,500,structural,0,7.53513E+03,2.21491E-01
+Mid-Western,1000,structural,0,8.24563E+03,2.42376E-01
 Mid-Western,5,structural,1,0.00000E+00,0.00000E+00
 Mid-Western,10,structural,1,0.00000E+00,0.00000E+00
 Mid-Western,20,structural,1,0.00000E+00,0.00000E+00
 Mid-Western,50,structural,1,0.00000E+00,0.00000E+00
-Mid-Western,100,structural,1,1.11345E+03,3.27294E-02
-Mid-Western,200,structural,1,1.74962E+03,5.14292E-02
-Mid-Western,500,structural,1,2.41440E+03,7.09701E-02
-Mid-Western,1000,structural,1,4.87805E+03,1.43388E-01
-Mid-Western,5,structural+contents,1,0.00000E+00,0.00000E+00
-Mid-Western,10,structural+contents,1,0.00000E+00,0.00000E+00
-Mid-Western,20,structural+contents,1,0.00000E+00,0.00000E+00
-Mid-Western,50,structural+contents,1,0.00000E+00,0.00000E+00
-Mid-Western,100,structural+contents,1,1.46949E+03,1.57072E-02
-Mid-Western,200,structural+contents,1,2.44118E+03,2.60936E-02
-Mid-Western,500,structural+contents,1,5.80104E+03,6.20067E-02
-Mid-Western,1000,structural+contents,1,1.53779E+04,1.64373E-01
+Mid-Western,100,structural,1,1.18926E+03,3.49577E-02
+Mid-Western,200,structural,1,1.85782E+03,5.46095E-02
+Mid-Western,500,structural,1,3.11176E+03,9.14687E-02
+Mid-Western,1000,structural,1,6.19738E+03,1.82169E-01
diff --git a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-stats-.csv b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-stats-.csv
index b25bd416696c..2480b728ded0 100644
--- a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-stats-.csv
+++ b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-stats-.csv
@@ -1,74 +1,26 @@
-#,,,"generated_by='OpenQuake engine 3.21.0-git855f23bdf1', start_date='2024-06-04T05:50:50', checksum=1294572362"
+#,,,"generated_by='OpenQuake engine 3.22.0-git36e91b9743', start_date='2024-11-05T09:57:17', checksum=17759650"
 return_period,loss_type,loss,stat
-5,contents,0.0,mean
-5,contents,0.0,quantile-0.15
-5,contents,0.0,quantile-0.85
 5,structural,0.0,mean
 5,structural,0.0,quantile-0.15
 5,structural,0.0,quantile-0.85
-5,structural+contents,0.0,mean
-5,structural+contents,0.0,quantile-0.15
-5,structural+contents,0.0,quantile-0.85
-10,contents,0.0,mean
-10,contents,0.0,quantile-0.15
-10,contents,0.0,quantile-0.85
 10,structural,0.0,mean
 10,structural,0.0,quantile-0.15
 10,structural,0.0,quantile-0.85
-10,structural+contents,0.0,mean
-10,structural+contents,0.0,quantile-0.15
-10,structural+contents,0.0,quantile-0.85
-20,contents,0.0,mean
-20,contents,0.0,quantile-0.15
-20,contents,0.0,quantile-0.85
 20,structural,0.0,mean
 20,structural,0.0,quantile-0.15
 20,structural,0.0,quantile-0.85
-20,structural+contents,0.0,mean
-20,structural+contents,0.0,quantile-0.15
-20,structural+contents,0.0,quantile-0.85
-50,contents,0.0,mean
-50,contents,0.0,quantile-0.15
-50,contents,0.0,quantile-0.85
-50,structural,1032.6039916992188,mean
-50,structural,63.74098714192707,quantile-0.15
-50,structural,956.1148071289062,quantile-0.85
-50,structural+contents,1184.3336425781251,mean
-50,structural+contents,73.10701497395831,quantile-0.15
-50,structural+contents,1096.605224609375,quantile-0.85
-100,contents,1414.9093139648437,mean
-100,contents,87.34008110894095,quantile-0.15
-100,contents,1310.1012166341145,quantile-0.85
-100,structural,2908.177685546875,mean
-100,structural,1539.9463704427083,quantile-0.15
-100,structural,2800.159423828125,quantile-0.85
-100,structural+contents,3292.451928710938,mean
-100,structural+contents,1769.2071261935764,quantile-0.15
-100,structural+contents,3172.195760091146,quantile-0.85
-200,contents,2667.002270507812,mean
-200,contents,1442.1296251085068,quantile-0.15
-200,contents,2570.3017985026045,quantile-0.85
-200,structural,4282.552783203125,mean
-200,structural,1998.9618326822915,quantile-0.15
-200,structural,4102.269287109375,quantile-0.85
-200,structural+contents,6872.6458984375,mean
-200,structural+contents,2714.729275173611,quantile-0.15
-200,structural+contents,6544.389322916666,quantile-0.85
-500,contents,6954.519458007812,mean
-500,contents,4137.6327718098955,quantile-0.15
-500,contents,6732.1336669921875,quantile-0.85
-500,structural,8298.860766601563,mean
-500,structural,2777.6407470703125,quantile-0.15
-500,structural,7862.9749755859375,quantile-0.85
-500,structural+contents,14516.506152343749,mean
-500,structural+contents,6339.029025607639,quantile-0.15
-500,structural+contents,13870.915852864582,quantile-0.85
-1000,contents,8650.20693359375,mean
-1000,contents,8444.6865234375,quantile-0.15
-1000,contents,8444.6865234375,quantile-0.85
-1000,structural,8792.442431640626,mean
-1000,structural,5119.678521050348,quantile-0.15
-1000,structural,8502.487386067707,quantile-0.85
-1000,structural+contents,16401.71943359375,mean
-1000,structural+contents,15441.136664496527,quantile-0.15
-1000,structural+contents,16325.883951822916,quantile-0.85
+50,structural,1146.675,mean
+50,structural,70.78240943358205,quantile-0.15
+50,structural,1061.7361710364542,quantile-0.85
+100,structural,2566.0251,mean
+100,structural,1286.6472639899466,quantile-0.15
+100,structural,2465.0217391081196,quantile-0.85
+200,structural,4270.5957,mean
+200,structural,2006.75376334145,quantile-0.15
+200,structural,4091.8716978099824,quantile-0.85
+500,structural,7732.242,mean
+500,structural,3396.9786367508614,quantile-0.15
+500,structural,7389.984846045027,quantile-0.85
+1000,structural,8941.859,mean
+1000,structural,6366.794053258458,quantile-0.15
+1000,structural,8738.565166436158,quantile-0.85
diff --git a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-stats-NAME-taxonomy.csv b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-stats-NAME-taxonomy.csv
index b62260037334..9f15fc526209 100644
--- a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-stats-NAME-taxonomy.csv
+++ b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-stats-NAME-taxonomy.csv
@@ -1,290 +1,98 @@
-#,,,,,"generated_by='OpenQuake engine 3.21.0-git855f23bdf1', start_date='2024-06-04T05:50:50', checksum=1294572362"
+#,,,,,"generated_by='OpenQuake engine 3.22.0-git36e91b9743', start_date='2024-11-05T09:57:17', checksum=17759650"
 return_period,loss_type,loss,stat,NAME_1,taxonomy
-5,contents,0.0,mean,Far-Western,Adobe/Com
-5,contents,0.0,quantile-0.15,Far-Western,Adobe/Com
-5,contents,0.0,quantile-0.85,Far-Western,Adobe/Com
 5,structural,0.0,mean,Far-Western,Adobe/Com
 5,structural,0.0,quantile-0.15,Far-Western,Adobe/Com
 5,structural,0.0,quantile-0.85,Far-Western,Adobe/Com
-5,structural+contents,0.0,mean,Far-Western,Adobe/Com
-5,structural+contents,0.0,quantile-0.15,Far-Western,Adobe/Com
-5,structural+contents,0.0,quantile-0.85,Far-Western,Adobe/Com
-10,contents,0.0,mean,Far-Western,Adobe/Com
-10,contents,0.0,quantile-0.15,Far-Western,Adobe/Com
-10,contents,0.0,quantile-0.85,Far-Western,Adobe/Com
 10,structural,0.0,mean,Far-Western,Adobe/Com
 10,structural,0.0,quantile-0.15,Far-Western,Adobe/Com
 10,structural,0.0,quantile-0.85,Far-Western,Adobe/Com
-10,structural+contents,0.0,mean,Far-Western,Adobe/Com
-10,structural+contents,0.0,quantile-0.15,Far-Western,Adobe/Com
-10,structural+contents,0.0,quantile-0.85,Far-Western,Adobe/Com
-20,contents,0.0,mean,Far-Western,Adobe/Com
-20,contents,0.0,quantile-0.15,Far-Western,Adobe/Com
-20,contents,0.0,quantile-0.85,Far-Western,Adobe/Com
 20,structural,0.0,mean,Far-Western,Adobe/Com
 20,structural,0.0,quantile-0.15,Far-Western,Adobe/Com
 20,structural,0.0,quantile-0.85,Far-Western,Adobe/Com
-20,structural+contents,0.0,mean,Far-Western,Adobe/Com
-20,structural+contents,0.0,quantile-0.15,Far-Western,Adobe/Com
-20,structural+contents,0.0,quantile-0.85,Far-Western,Adobe/Com
-50,contents,0.0,mean,Far-Western,Adobe/Com
-50,contents,0.0,quantile-0.15,Far-Western,Adobe/Com
-50,contents,0.0,quantile-0.85,Far-Western,Adobe/Com
 50,structural,0.0,mean,Far-Western,Adobe/Com
 50,structural,0.0,quantile-0.15,Far-Western,Adobe/Com
 50,structural,0.0,quantile-0.85,Far-Western,Adobe/Com
-50,structural+contents,0.0,mean,Far-Western,Adobe/Com
-50,structural+contents,0.0,quantile-0.15,Far-Western,Adobe/Com
-50,structural+contents,0.0,quantile-0.85,Far-Western,Adobe/Com
-100,contents,0.0,mean,Far-Western,Adobe/Com
-100,contents,0.0,quantile-0.15,Far-Western,Adobe/Com
-100,contents,0.0,quantile-0.85,Far-Western,Adobe/Com
-100,structural,1412.7141357421876,mean,Far-Western,Adobe/Com
-100,structural,87.20457628038193,quantile-0.15,Far-Western,Adobe/Com
-100,structural,1308.0686442057292,quantile-0.85,Far-Western,Adobe/Com
-100,structural+contents,1412.7141357421876,mean,Far-Western,Adobe/Com
-100,structural+contents,87.20457628038193,quantile-0.15,Far-Western,Adobe/Com
-100,structural+contents,1308.0686442057292,quantile-0.85,Far-Western,Adobe/Com
-200,contents,1313.6586547851564,mean,Far-Western,Adobe/Com
-200,contents,81.0900404188368,quantile-0.15,Far-Western,Adobe/Com
-200,contents,1216.350606282552,quantile-0.85,Far-Western,Adobe/Com
-200,structural,2891.4407226562503,mean,Far-Western,Adobe/Com
-200,structural,178.4839952256944,quantile-0.15,Far-Western,Adobe/Com
-200,structural,2677.2599283854165,quantile-0.85,Far-Western,Adobe/Com
-200,structural+contents,4512.54638671875,mean,Far-Western,Adobe/Com
-200,structural+contents,278.55224609374994,quantile-0.15,Far-Western,Adobe/Com
-200,structural+contents,4178.28369140625,quantile-0.85,Far-Western,Adobe/Com
-500,contents,2514.9284912109374,mean,Far-Western,Adobe/Com
-500,contents,155.24249945746524,quantile-0.15,Far-Western,Adobe/Com
-500,contents,2328.6374918619795,quantile-0.85,Far-Western,Adobe/Com
-500,structural,5933.114550781251,mean,Far-Western,Adobe/Com
-500,structural,1932.2109917534722,quantile-0.15,Far-Western,Adobe/Com
-500,structural,5617.253743489583,quantile-0.85,Far-Western,Adobe/Com
-500,structural+contents,8448.042822265625,mean,Far-Western,Adobe/Com
-500,structural+contents,2087.4534776475693,quantile-0.15,Far-Western,Adobe/Com
-500,structural+contents,7945.891031901041,quantile-0.85,Far-Western,Adobe/Com
-1000,contents,6559.288330078125,mean,Far-Western,Adobe/Com
-1000,contents,404.8943413628471,quantile-0.15,Far-Western,Adobe/Com
-1000,contents,6073.415120442708,quantile-0.85,Far-Western,Adobe/Com
-1000,structural,8532.732421875,mean,Far-Western,Adobe/Com
-1000,structural,2666.861762152778,quantile-0.15,Far-Western,Adobe/Com
-1000,structural,8069.637369791667,quantile-0.85,Far-Western,Adobe/Com
-1000,structural+contents,15092.020312499999,mean,Far-Western,Adobe/Com
-1000,structural+contents,3071.7560763888887,quantile-0.15,Far-Western,Adobe/Com
-1000,structural+contents,14143.052083333332,quantile-0.85,Far-Western,Adobe/Com
-5,contents,0.0,mean,Mid-Western,Adobe/Res
-5,contents,0.0,quantile-0.15,Mid-Western,Adobe/Res
-5,contents,0.0,quantile-0.85,Mid-Western,Adobe/Res
+100,structural,1439.696,mean,Far-Western,Adobe/Com
+100,structural,88.87013045658622,quantile-0.15,Far-Western,Adobe/Com
+100,structural,1333.0519939283024,quantile-0.85,Far-Western,Adobe/Com
+200,structural,3002.1396,mean,Far-Western,Adobe/Com
+200,structural,185.31727369190162,quantile-0.15,Far-Western,Adobe/Com
+200,structural,2779.7591826989187,quantile-0.85,Far-Western,Adobe/Com
+500,structural,4794.755,mean,Far-Western,Adobe/Com
+500,structural,295.9725196362451,quantile-0.15,Far-Western,Adobe/Com
+500,structural,4439.587918033039,quantile-0.85,Far-Western,Adobe/Com
+1000,structural,8476.28,mean,Far-Western,Adobe/Com
+1000,structural,1969.660053107251,quantile-0.15,Far-Western,Adobe/Com
+1000,structural,7962.600438102934,quantile-0.85,Far-Western,Adobe/Com
 5,structural,0.0,mean,Mid-Western,Adobe/Res
 5,structural,0.0,quantile-0.15,Mid-Western,Adobe/Res
 5,structural,0.0,quantile-0.85,Mid-Western,Adobe/Res
-5,structural+contents,0.0,mean,Mid-Western,Adobe/Res
-5,structural+contents,0.0,quantile-0.15,Mid-Western,Adobe/Res
-5,structural+contents,0.0,quantile-0.85,Mid-Western,Adobe/Res
-10,contents,0.0,mean,Mid-Western,Adobe/Res
-10,contents,0.0,quantile-0.15,Mid-Western,Adobe/Res
-10,contents,0.0,quantile-0.85,Mid-Western,Adobe/Res
 10,structural,0.0,mean,Mid-Western,Adobe/Res
 10,structural,0.0,quantile-0.15,Mid-Western,Adobe/Res
 10,structural,0.0,quantile-0.85,Mid-Western,Adobe/Res
-10,structural+contents,0.0,mean,Mid-Western,Adobe/Res
-10,structural+contents,0.0,quantile-0.15,Mid-Western,Adobe/Res
-10,structural+contents,0.0,quantile-0.85,Mid-Western,Adobe/Res
-20,contents,0.0,mean,Mid-Western,Adobe/Res
-20,contents,0.0,quantile-0.15,Mid-Western,Adobe/Res
-20,contents,0.0,quantile-0.85,Mid-Western,Adobe/Res
 20,structural,0.0,mean,Mid-Western,Adobe/Res
 20,structural,0.0,quantile-0.15,Mid-Western,Adobe/Res
 20,structural,0.0,quantile-0.85,Mid-Western,Adobe/Res
-20,structural+contents,0.0,mean,Mid-Western,Adobe/Res
-20,structural+contents,0.0,quantile-0.15,Mid-Western,Adobe/Res
-20,structural+contents,0.0,quantile-0.85,Mid-Western,Adobe/Res
-50,contents,0.0,mean,Mid-Western,Adobe/Res
-50,contents,0.0,quantile-0.15,Mid-Western,Adobe/Res
-50,contents,0.0,quantile-0.85,Mid-Western,Adobe/Res
 50,structural,0.0,mean,Mid-Western,Adobe/Res
 50,structural,0.0,quantile-0.15,Mid-Western,Adobe/Res
 50,structural,0.0,quantile-0.85,Mid-Western,Adobe/Res
-50,structural+contents,0.0,mean,Mid-Western,Adobe/Res
-50,structural+contents,0.0,quantile-0.15,Mid-Western,Adobe/Res
-50,structural+contents,0.0,quantile-0.85,Mid-Western,Adobe/Res
-100,contents,0.0,mean,Mid-Western,Adobe/Res
-100,contents,0.0,quantile-0.15,Mid-Western,Adobe/Res
-100,contents,0.0,quantile-0.85,Mid-Western,Adobe/Res
-100,structural,108.95445556640625,mean,Mid-Western,Adobe/Res
-100,structural,0.0,quantile-0.15,Mid-Western,Adobe/Res
-100,structural,0.0,quantile-0.85,Mid-Western,Adobe/Res
-100,structural+contents,108.95445556640625,mean,Mid-Western,Adobe/Res
-100,structural+contents,0.0,quantile-0.15,Mid-Western,Adobe/Res
-100,structural+contents,0.0,quantile-0.85,Mid-Western,Adobe/Res
-200,contents,0.0,mean,Mid-Western,Adobe/Res
-200,contents,0.0,quantile-0.15,Mid-Western,Adobe/Res
-200,contents,0.0,quantile-0.85,Mid-Western,Adobe/Res
-200,structural,2927.225451660156,mean,Mid-Western,Adobe/Res
-200,structural,1719.8419392903645,quantile-0.15,Mid-Western,Adobe/Res
-200,structural,2831.9057006835938,quantile-0.85,Mid-Western,Adobe/Res
-200,structural+contents,2927.225451660156,mean,Mid-Western,Adobe/Res
-200,structural+contents,1719.8419392903645,quantile-0.15,Mid-Western,Adobe/Res
-200,structural+contents,2831.9057006835938,quantile-0.85,Mid-Western,Adobe/Res
-500,contents,3133.6535888671874,mean,Mid-Western,Adobe/Res
-500,contents,1470.9352620442708,quantile-0.15,Mid-Western,Adobe/Res
-500,contents,3002.3863525390625,quantile-0.85,Mid-Western,Adobe/Res
-500,structural,5260.693310546875,mean,Mid-Western,Adobe/Res
-500,structural,2332.989990234375,quantile-0.15,Mid-Western,Adobe/Res
-500,structural,5029.558837890625,quantile-0.85,Mid-Western,Adobe/Res
-500,structural+contents,8368.61591796875,mean,Mid-Western,Adobe/Res
-500,structural+contents,3560.9124891493057,quantile-0.15,Mid-Western,Adobe/Res
-500,structural+contents,7989.060384114584,quantile-0.85,Mid-Western,Adobe/Res
-1000,contents,3651.756201171875,mean,Mid-Western,Adobe/Res
-1000,contents,1505.7754720052083,quantile-0.15,Mid-Western,Adobe/Res
-1000,contents,3482.336669921875,quantile-0.85,Mid-Western,Adobe/Res
-1000,structural,8298.860766601563,mean,Mid-Western,Adobe/Res
-1000,structural,2777.6407470703125,quantile-0.15,Mid-Western,Adobe/Res
-1000,structural,7862.9749755859375,quantile-0.85,Mid-Western,Adobe/Res
-1000,structural+contents,11922.91005859375,mean,Mid-Western,Adobe/Res
-1000,structural+contents,4021.73779296875,quantile-0.15,Mid-Western,Adobe/Res
-1000,structural+contents,11299.13330078125,quantile-0.85,Mid-Western,Adobe/Res
-5,contents,0.0,mean,Mid-Western,Wood/Com
-5,contents,0.0,quantile-0.15,Mid-Western,Wood/Com
-5,contents,0.0,quantile-0.85,Mid-Western,Wood/Com
+100,structural,1025.7435,mean,Mid-Western,Adobe/Res
+100,structural,1007.5748901367188,quantile-0.15,Mid-Western,Adobe/Res
+100,structural,1007.5748901367188,quantile-0.85,Mid-Western,Adobe/Res
+200,structural,2085.2,mean,Mid-Western,Adobe/Res
+200,structural,1871.8527763749626,quantile-0.15,Mid-Western,Adobe/Res
+200,structural,2068.356837027591,quantile-0.85,Mid-Western,Adobe/Res
+500,structural,6251.634,mean,Mid-Western,Adobe/Res
+500,structural,3305.5830478607973,quantile-0.15,Mid-Western,Adobe/Res
+500,structural,6019.050974560858,quantile-0.85,Mid-Western,Adobe/Res
+1000,structural,7093.372,mean,Mid-Western,Adobe/Res
+1000,structural,3362.984469130899,quantile-0.15,Mid-Western,Adobe/Res
+1000,structural,6798.868213579553,quantile-0.85,Mid-Western,Adobe/Res
 5,structural,0.0,mean,Mid-Western,Wood/Com
 5,structural,0.0,quantile-0.15,Mid-Western,Wood/Com
 5,structural,0.0,quantile-0.85,Mid-Western,Wood/Com
-5,structural+contents,0.0,mean,Mid-Western,Wood/Com
-5,structural+contents,0.0,quantile-0.15,Mid-Western,Wood/Com
-5,structural+contents,0.0,quantile-0.85,Mid-Western,Wood/Com
-10,contents,0.0,mean,Mid-Western,Wood/Com
-10,contents,0.0,quantile-0.15,Mid-Western,Wood/Com
-10,contents,0.0,quantile-0.85,Mid-Western,Wood/Com
 10,structural,0.0,mean,Mid-Western,Wood/Com
 10,structural,0.0,quantile-0.15,Mid-Western,Wood/Com
 10,structural,0.0,quantile-0.85,Mid-Western,Wood/Com
-10,structural+contents,0.0,mean,Mid-Western,Wood/Com
-10,structural+contents,0.0,quantile-0.15,Mid-Western,Wood/Com
-10,structural+contents,0.0,quantile-0.85,Mid-Western,Wood/Com
-20,contents,0.0,mean,Mid-Western,Wood/Com
-20,contents,0.0,quantile-0.15,Mid-Western,Wood/Com
-20,contents,0.0,quantile-0.85,Mid-Western,Wood/Com
 20,structural,0.0,mean,Mid-Western,Wood/Com
 20,structural,0.0,quantile-0.15,Mid-Western,Wood/Com
 20,structural,0.0,quantile-0.85,Mid-Western,Wood/Com
-20,structural+contents,0.0,mean,Mid-Western,Wood/Com
-20,structural+contents,0.0,quantile-0.15,Mid-Western,Wood/Com
-20,structural+contents,0.0,quantile-0.85,Mid-Western,Wood/Com
-50,contents,0.0,mean,Mid-Western,Wood/Com
-50,contents,0.0,quantile-0.15,Mid-Western,Wood/Com
-50,contents,0.0,quantile-0.85,Mid-Western,Wood/Com
 50,structural,0.0,mean,Mid-Western,Wood/Com
 50,structural,0.0,quantile-0.15,Mid-Western,Wood/Com
 50,structural,0.0,quantile-0.85,Mid-Western,Wood/Com
-50,structural+contents,0.0,mean,Mid-Western,Wood/Com
-50,structural+contents,0.0,quantile-0.15,Mid-Western,Wood/Com
-50,structural+contents,0.0,quantile-0.85,Mid-Western,Wood/Com
-100,contents,0.0,mean,Mid-Western,Wood/Com
-100,contents,0.0,quantile-0.15,Mid-Western,Wood/Com
-100,contents,0.0,quantile-0.85,Mid-Western,Wood/Com
 100,structural,0.0,mean,Mid-Western,Wood/Com
 100,structural,0.0,quantile-0.15,Mid-Western,Wood/Com
 100,structural,0.0,quantile-0.85,Mid-Western,Wood/Com
-100,structural+contents,0.0,mean,Mid-Western,Wood/Com
-100,structural+contents,0.0,quantile-0.15,Mid-Western,Wood/Com
-100,structural+contents,0.0,quantile-0.85,Mid-Western,Wood/Com
-200,contents,1154.6827514648437,mean,Mid-Western,Wood/Com
-200,contents,1063.5906778971355,quantile-0.15,Mid-Western,Wood/Com
-200,contents,1147.4912719726562,quantile-0.85,Mid-Western,Wood/Com
 200,structural,0.0,mean,Mid-Western,Wood/Com
 200,structural,0.0,quantile-0.15,Mid-Western,Wood/Com
 200,structural,0.0,quantile-0.85,Mid-Western,Wood/Com
-200,structural+contents,1154.6827514648437,mean,Mid-Western,Wood/Com
-200,structural+contents,1063.5906778971355,quantile-0.15,Mid-Western,Wood/Com
-200,structural+contents,1147.4912719726562,quantile-0.85,Mid-Western,Wood/Com
-500,contents,1825.2821289062501,mean,Mid-Western,Wood/Com
-500,contents,1588.945556640625,quantile-0.15,Mid-Western,Wood/Com
-500,contents,1588.945556640625,quantile-0.85,Mid-Western,Wood/Com
-500,structural,79.152685546875,mean,Mid-Western,Wood/Com
+500,structural,78.36492,mean,Mid-Western,Wood/Com
 500,structural,0.0,quantile-0.15,Mid-Western,Wood/Com
 500,structural,0.0,quantile-0.85,Mid-Western,Wood/Com
-500,structural+contents,1904.4348388671876,mean,Mid-Western,Wood/Com
-500,structural+contents,1588.945556640625,quantile-0.15,Mid-Western,Wood/Com
-500,structural+contents,1588.945556640625,quantile-0.85,Mid-Western,Wood/Com
-1000,contents,2391.1221435546877,mean,Mid-Western,Wood/Com
-1000,contents,1641.769287109375,quantile-0.15,Mid-Western,Wood/Com
-1000,contents,1641.769287109375,quantile-0.85,Mid-Western,Wood/Com
-1000,structural,299.80258789062503,mean,Mid-Western,Wood/Com
-1000,structural,0.0,quantile-0.15,Mid-Western,Wood/Com
-1000,structural,0.0,quantile-0.85,Mid-Western,Wood/Com
-1000,structural+contents,2690.9247802734376,mean,Mid-Western,Wood/Com
-1000,structural+contents,1641.769287109375,quantile-0.15,Mid-Western,Wood/Com
-1000,structural+contents,1641.769287109375,quantile-0.85,Mid-Western,Wood/Com
-5,contents,0.0,mean,Mid-Western,Wood/Res
-5,contents,0.0,quantile-0.15,Mid-Western,Wood/Res
-5,contents,0.0,quantile-0.85,Mid-Western,Wood/Res
+1000,structural,882.03357,mean,Mid-Western,Wood/Com
+1000,structural,637.8353881835938,quantile-0.15,Mid-Western,Wood/Com
+1000,structural,637.8353881835938,quantile-0.85,Mid-Western,Wood/Com
 5,structural,0.0,mean,Mid-Western,Wood/Res
 5,structural,0.0,quantile-0.15,Mid-Western,Wood/Res
 5,structural,0.0,quantile-0.85,Mid-Western,Wood/Res
-5,structural+contents,0.0,mean,Mid-Western,Wood/Res
-5,structural+contents,0.0,quantile-0.15,Mid-Western,Wood/Res
-5,structural+contents,0.0,quantile-0.85,Mid-Western,Wood/Res
-10,contents,0.0,mean,Mid-Western,Wood/Res
-10,contents,0.0,quantile-0.15,Mid-Western,Wood/Res
-10,contents,0.0,quantile-0.85,Mid-Western,Wood/Res
 10,structural,0.0,mean,Mid-Western,Wood/Res
 10,structural,0.0,quantile-0.15,Mid-Western,Wood/Res
 10,structural,0.0,quantile-0.85,Mid-Western,Wood/Res
-10,structural+contents,0.0,mean,Mid-Western,Wood/Res
-10,structural+contents,0.0,quantile-0.15,Mid-Western,Wood/Res
-10,structural+contents,0.0,quantile-0.85,Mid-Western,Wood/Res
-20,contents,0.0,mean,Mid-Western,Wood/Res
-20,contents,0.0,quantile-0.15,Mid-Western,Wood/Res
-20,contents,0.0,quantile-0.85,Mid-Western,Wood/Res
 20,structural,0.0,mean,Mid-Western,Wood/Res
 20,structural,0.0,quantile-0.15,Mid-Western,Wood/Res
 20,structural,0.0,quantile-0.85,Mid-Western,Wood/Res
-20,structural+contents,0.0,mean,Mid-Western,Wood/Res
-20,structural+contents,0.0,quantile-0.15,Mid-Western,Wood/Res
-20,structural+contents,0.0,quantile-0.85,Mid-Western,Wood/Res
-50,contents,0.0,mean,Mid-Western,Wood/Res
-50,contents,0.0,quantile-0.15,Mid-Western,Wood/Res
-50,contents,0.0,quantile-0.85,Mid-Western,Wood/Res
 50,structural,0.0,mean,Mid-Western,Wood/Res
 50,structural,0.0,quantile-0.15,Mid-Western,Wood/Res
 50,structural,0.0,quantile-0.85,Mid-Western,Wood/Res
-50,structural+contents,0.0,mean,Mid-Western,Wood/Res
-50,structural+contents,0.0,quantile-0.15,Mid-Western,Wood/Res
-50,structural+contents,0.0,quantile-0.85,Mid-Western,Wood/Res
-100,contents,0.0,mean,Mid-Western,Wood/Res
-100,contents,0.0,quantile-0.15,Mid-Western,Wood/Res
-100,contents,0.0,quantile-0.85,Mid-Western,Wood/Res
 100,structural,0.0,mean,Mid-Western,Wood/Res
 100,structural,0.0,quantile-0.15,Mid-Western,Wood/Res
 100,structural,0.0,quantile-0.85,Mid-Western,Wood/Res
-100,structural+contents,0.0,mean,Mid-Western,Wood/Res
-100,structural+contents,0.0,quantile-0.15,Mid-Western,Wood/Res
-100,structural+contents,0.0,quantile-0.85,Mid-Western,Wood/Res
-200,contents,0.0,mean,Mid-Western,Wood/Res
-200,contents,0.0,quantile-0.15,Mid-Western,Wood/Res
-200,contents,0.0,quantile-0.85,Mid-Western,Wood/Res
 200,structural,0.0,mean,Mid-Western,Wood/Res
 200,structural,0.0,quantile-0.15,Mid-Western,Wood/Res
 200,structural,0.0,quantile-0.85,Mid-Western,Wood/Res
-200,structural+contents,0.0,mean,Mid-Western,Wood/Res
-200,structural+contents,0.0,quantile-0.15,Mid-Western,Wood/Res
-200,structural+contents,0.0,quantile-0.85,Mid-Western,Wood/Res
-500,contents,1710.978515625,mean,Mid-Western,Wood/Res
-500,contents,1162.580295138889,quantile-0.15,Mid-Western,Wood/Res
-500,contents,1667.6839192708333,quantile-0.85,Mid-Western,Wood/Res
-500,structural,591.0380859375,mean,Mid-Western,Wood/Res
-500,structural,36.48383246527777,quantile-0.15,Mid-Western,Wood/Res
-500,structural,547.2574869791666,quantile-0.85,Mid-Western,Wood/Res
-500,structural+contents,2302.0166015625,mean,Mid-Western,Wood/Res
-500,structural+contents,1199.0641276041667,quantile-0.15,Mid-Western,Wood/Res
-500,structural+contents,2214.94140625,quantile-0.85,Mid-Western,Wood/Res
-1000,contents,3647.6370117187503,mean,Mid-Western,Wood/Res
-1000,contents,1422.9571940104165,quantile-0.15,Mid-Western,Wood/Res
-1000,contents,3472.00439453125,quantile-0.85,Mid-Western,Wood/Res
-1000,structural,1289.5283935546875,mean,Mid-Western,Wood/Res
-1000,structural,79.6005181206597,quantile-0.15,Mid-Western,Wood/Res
-1000,structural,1194.0077718098958,quantile-0.85,Mid-Western,Wood/Res
-1000,structural+contents,4937.165185546875,mean,Mid-Western,Wood/Res
-1000,structural+contents,1502.5576985677083,quantile-0.15,Mid-Western,Wood/Res
-1000,structural+contents,4666.011962890625,quantile-0.85,Mid-Western,Wood/Res
+500,structural,1102.555,mean,Mid-Western,Wood/Res
+500,structural,68.05895295388514,quantile-0.15,Mid-Western,Wood/Res
+500,structural,1020.884322704686,quantile-0.85,Mid-Western,Wood/Res
+1000,structural,1480.6086,mean,Mid-Western,Wood/Res
+1000,structural,91.39559567174778,quantile-0.15,Mid-Western,Wood/Res
+1000,structural,1370.933973209432,quantile-0.85,Mid-Western,Wood/Res
diff --git a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-stats-NAME.csv b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-stats-NAME.csv
index cc798057d894..ca2990bb2449 100644
--- a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-stats-NAME.csv
+++ b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-stats-NAME.csv
@@ -1,146 +1,50 @@
-#,,,,"generated_by='OpenQuake engine 3.21.0-git855f23bdf1', start_date='2024-06-04T05:50:50', checksum=1294572362"
+#,,,,"generated_by='OpenQuake engine 3.22.0-git36e91b9743', start_date='2024-11-05T09:57:17', checksum=17759650"
 return_period,loss_type,loss,stat,NAME_1
-5,contents,0.0,mean,Far-Western
-5,contents,0.0,quantile-0.15,Far-Western
-5,contents,0.0,quantile-0.85,Far-Western
 5,structural,0.0,mean,Far-Western
 5,structural,0.0,quantile-0.15,Far-Western
 5,structural,0.0,quantile-0.85,Far-Western
-5,structural+contents,0.0,mean,Far-Western
-5,structural+contents,0.0,quantile-0.15,Far-Western
-5,structural+contents,0.0,quantile-0.85,Far-Western
-10,contents,0.0,mean,Far-Western
-10,contents,0.0,quantile-0.15,Far-Western
-10,contents,0.0,quantile-0.85,Far-Western
 10,structural,0.0,mean,Far-Western
 10,structural,0.0,quantile-0.15,Far-Western
 10,structural,0.0,quantile-0.85,Far-Western
-10,structural+contents,0.0,mean,Far-Western
-10,structural+contents,0.0,quantile-0.15,Far-Western
-10,structural+contents,0.0,quantile-0.85,Far-Western
-20,contents,0.0,mean,Far-Western
-20,contents,0.0,quantile-0.15,Far-Western
-20,contents,0.0,quantile-0.85,Far-Western
 20,structural,0.0,mean,Far-Western
 20,structural,0.0,quantile-0.15,Far-Western
 20,structural,0.0,quantile-0.85,Far-Western
-20,structural+contents,0.0,mean,Far-Western
-20,structural+contents,0.0,quantile-0.15,Far-Western
-20,structural+contents,0.0,quantile-0.85,Far-Western
-50,contents,0.0,mean,Far-Western
-50,contents,0.0,quantile-0.15,Far-Western
-50,contents,0.0,quantile-0.85,Far-Western
 50,structural,0.0,mean,Far-Western
 50,structural,0.0,quantile-0.15,Far-Western
 50,structural,0.0,quantile-0.85,Far-Western
-50,structural+contents,0.0,mean,Far-Western
-50,structural+contents,0.0,quantile-0.15,Far-Western
-50,structural+contents,0.0,quantile-0.85,Far-Western
-100,contents,0.0,mean,Far-Western
-100,contents,0.0,quantile-0.15,Far-Western
-100,contents,0.0,quantile-0.85,Far-Western
-100,structural,1412.7141357421876,mean,Far-Western
-100,structural,87.20457628038193,quantile-0.15,Far-Western
-100,structural,1308.0686442057292,quantile-0.85,Far-Western
-100,structural+contents,1412.7141357421876,mean,Far-Western
-100,structural+contents,87.20457628038193,quantile-0.15,Far-Western
-100,structural+contents,1308.0686442057292,quantile-0.85,Far-Western
-200,contents,1313.6586547851564,mean,Far-Western
-200,contents,81.0900404188368,quantile-0.15,Far-Western
-200,contents,1216.350606282552,quantile-0.85,Far-Western
-200,structural,2891.4407226562503,mean,Far-Western
-200,structural,178.4839952256944,quantile-0.15,Far-Western
-200,structural,2677.2599283854165,quantile-0.85,Far-Western
-200,structural+contents,4512.54638671875,mean,Far-Western
-200,structural+contents,278.55224609374994,quantile-0.15,Far-Western
-200,structural+contents,4178.28369140625,quantile-0.85,Far-Western
-500,contents,2514.9284912109374,mean,Far-Western
-500,contents,155.24249945746524,quantile-0.15,Far-Western
-500,contents,2328.6374918619795,quantile-0.85,Far-Western
-500,structural,5933.114550781251,mean,Far-Western
-500,structural,1932.2109917534722,quantile-0.15,Far-Western
-500,structural,5617.253743489583,quantile-0.85,Far-Western
-500,structural+contents,8448.042822265625,mean,Far-Western
-500,structural+contents,2087.4534776475693,quantile-0.15,Far-Western
-500,structural+contents,7945.891031901041,quantile-0.85,Far-Western
-1000,contents,6559.288330078125,mean,Far-Western
-1000,contents,404.8943413628471,quantile-0.15,Far-Western
-1000,contents,6073.415120442708,quantile-0.85,Far-Western
-1000,structural,8532.732421875,mean,Far-Western
-1000,structural,2666.861762152778,quantile-0.15,Far-Western
-1000,structural,8069.637369791667,quantile-0.85,Far-Western
-1000,structural+contents,15092.020312499999,mean,Far-Western
-1000,structural+contents,3071.7560763888887,quantile-0.15,Far-Western
-1000,structural+contents,14143.052083333332,quantile-0.85,Far-Western
-5,contents,0.0,mean,Mid-Western
-5,contents,0.0,quantile-0.15,Mid-Western
-5,contents,0.0,quantile-0.85,Mid-Western
+100,structural,1439.696,mean,Far-Western
+100,structural,88.87013045658622,quantile-0.15,Far-Western
+100,structural,1333.0519939283024,quantile-0.85,Far-Western
+200,structural,3002.1396,mean,Far-Western
+200,structural,185.31727369190162,quantile-0.15,Far-Western
+200,structural,2779.7591826989187,quantile-0.85,Far-Western
+500,structural,4794.755,mean,Far-Western
+500,structural,295.9725196362451,quantile-0.15,Far-Western
+500,structural,4439.587918033039,quantile-0.85,Far-Western
+1000,structural,8476.28,mean,Far-Western
+1000,structural,1969.660053107251,quantile-0.15,Far-Western
+1000,structural,7962.600438102934,quantile-0.85,Far-Western
 5,structural,0.0,mean,Mid-Western
 5,structural,0.0,quantile-0.15,Mid-Western
 5,structural,0.0,quantile-0.85,Mid-Western
-5,structural+contents,0.0,mean,Mid-Western
-5,structural+contents,0.0,quantile-0.15,Mid-Western
-5,structural+contents,0.0,quantile-0.85,Mid-Western
-10,contents,0.0,mean,Mid-Western
-10,contents,0.0,quantile-0.15,Mid-Western
-10,contents,0.0,quantile-0.85,Mid-Western
 10,structural,0.0,mean,Mid-Western
 10,structural,0.0,quantile-0.15,Mid-Western
 10,structural,0.0,quantile-0.85,Mid-Western
-10,structural+contents,0.0,mean,Mid-Western
-10,structural+contents,0.0,quantile-0.15,Mid-Western
-10,structural+contents,0.0,quantile-0.85,Mid-Western
-20,contents,0.0,mean,Mid-Western
-20,contents,0.0,quantile-0.15,Mid-Western
-20,contents,0.0,quantile-0.85,Mid-Western
 20,structural,0.0,mean,Mid-Western
 20,structural,0.0,quantile-0.15,Mid-Western
 20,structural,0.0,quantile-0.85,Mid-Western
-20,structural+contents,0.0,mean,Mid-Western
-20,structural+contents,0.0,quantile-0.15,Mid-Western
-20,structural+contents,0.0,quantile-0.85,Mid-Western
-50,contents,0.0,mean,Mid-Western
-50,contents,0.0,quantile-0.15,Mid-Western
-50,contents,0.0,quantile-0.85,Mid-Western
 50,structural,0.0,mean,Mid-Western
 50,structural,0.0,quantile-0.15,Mid-Western
 50,structural,0.0,quantile-0.85,Mid-Western
-50,structural+contents,0.0,mean,Mid-Western
-50,structural+contents,0.0,quantile-0.15,Mid-Western
-50,structural+contents,0.0,quantile-0.85,Mid-Western
-100,contents,0.0,mean,Mid-Western
-100,contents,0.0,quantile-0.15,Mid-Western
-100,contents,0.0,quantile-0.85,Mid-Western
-100,structural,111.345458984375,mean,Mid-Western
-100,structural,0.0,quantile-0.15,Mid-Western
-100,structural,0.0,quantile-0.85,Mid-Western
-100,structural+contents,1331.2823852539063,mean,Mid-Western
-100,structural+contents,1315.92626953125,quantile-0.15,Mid-Western
-100,structural+contents,1315.92626953125,quantile-0.85,Mid-Western
-200,contents,2191.5322265625,mean,Mid-Western
-200,contents,1412.7796223958333,quantile-0.15,Mid-Western
-200,contents,2130.0517578125,quantile-0.85,Mid-Western
-200,structural,2938.146875,mean,Mid-Western
-200,structural,1822.9887152777778,quantile-0.15,Mid-Western
-200,structural,2850.1080729166665,quantile-0.85,Mid-Western
-200,structural+contents,3007.302783203125,mean,Mid-Western
-200,structural+contents,2476.1278483072915,quantile-0.15,Mid-Western
-200,structural+contents,2965.367919921875,quantile-0.85,Mid-Western
-500,contents,4858.7283935546875,mean,Mid-Western
-500,contents,4008.262953016493,quantile-0.15,Mid-Western
-500,contents,4791.5863850911455,quantile-0.85,Mid-Western
-500,structural,6577.623950195313,mean,Mid-Western
-500,structural,2671.391560872396,quantile-0.15,Mid-Western
-500,structural,6269.2371826171875,quantile-0.85,Mid-Western
-500,structural+contents,13101.021484375,mean,Mid-Western
-500,structural+contents,6251.653428819444,quantile-0.15,Mid-Western
-500,structural+contents,12560.281901041666,quantile-0.85,Mid-Western
-1000,contents,8650.20693359375,mean,Mid-Western
-1000,contents,8444.6865234375,quantile-0.15,Mid-Western
-1000,contents,8444.6865234375,quantile-0.85,Mid-Western
-1000,structural,8545.225439453126,mean,Mid-Western
-1000,structural,5104.418212890625,quantile-0.15,Mid-Western
-1000,structural,8273.582763671875,quantile-0.85,Mid-Western
-1000,structural+contents,15474.196484375,mean,Mid-Western
-1000,structural+contents,15383.882161458334,quantile-0.15,Mid-Western
-1000,structural+contents,15467.06640625,quantile-0.85,Mid-Western
+100,structural,1025.7435,mean,Mid-Western
+100,structural,1007.5748901367188,quantile-0.15,Mid-Western
+100,structural,1007.5748901367188,quantile-0.85,Mid-Western
+200,structural,2590.5903,mean,Mid-Western
+200,structural,1903.0497028124566,quantile-0.15,Mid-Western
+200,structural,2536.310746606375,quantile-0.85,Mid-Western
+500,structural,7092.792,mean,Mid-Western
+500,structural,3357.506414659346,quantile-0.15,Mid-Western
+500,structural,6797.901498203205,quantile-0.85,Mid-Western
+1000,structural,8040.804,mean,Mid-Western
+1000,structural,6311.1733394669445,quantile-0.15,Mid-Western
+1000,structural,7904.254436356681,quantile-0.85,Mid-Western
diff --git a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-stats-taxonomy.csv b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-stats-taxonomy.csv
index 15147db04215..44acccae7d3d 100644
--- a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-stats-taxonomy.csv
+++ b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-stats-taxonomy.csv
@@ -1,290 +1,98 @@
-#,,,,"generated_by='OpenQuake engine 3.21.0-git855f23bdf1', start_date='2024-06-04T05:50:50', checksum=1294572362"
+#,,,,"generated_by='OpenQuake engine 3.22.0-git36e91b9743', start_date='2024-11-05T09:57:17', checksum=17759650"
 return_period,loss_type,loss,stat,taxonomy
-5,contents,0.0,mean,Adobe/Com
-5,contents,0.0,quantile-0.15,Adobe/Com
-5,contents,0.0,quantile-0.85,Adobe/Com
 5,structural,0.0,mean,Adobe/Com
 5,structural,0.0,quantile-0.15,Adobe/Com
 5,structural,0.0,quantile-0.85,Adobe/Com
-5,structural+contents,0.0,mean,Adobe/Com
-5,structural+contents,0.0,quantile-0.15,Adobe/Com
-5,structural+contents,0.0,quantile-0.85,Adobe/Com
-10,contents,0.0,mean,Adobe/Com
-10,contents,0.0,quantile-0.15,Adobe/Com
-10,contents,0.0,quantile-0.85,Adobe/Com
 10,structural,0.0,mean,Adobe/Com
 10,structural,0.0,quantile-0.15,Adobe/Com
 10,structural,0.0,quantile-0.85,Adobe/Com
-10,structural+contents,0.0,mean,Adobe/Com
-10,structural+contents,0.0,quantile-0.15,Adobe/Com
-10,structural+contents,0.0,quantile-0.85,Adobe/Com
-20,contents,0.0,mean,Adobe/Com
-20,contents,0.0,quantile-0.15,Adobe/Com
-20,contents,0.0,quantile-0.85,Adobe/Com
 20,structural,0.0,mean,Adobe/Com
 20,structural,0.0,quantile-0.15,Adobe/Com
 20,structural,0.0,quantile-0.85,Adobe/Com
-20,structural+contents,0.0,mean,Adobe/Com
-20,structural+contents,0.0,quantile-0.15,Adobe/Com
-20,structural+contents,0.0,quantile-0.85,Adobe/Com
-50,contents,0.0,mean,Adobe/Com
-50,contents,0.0,quantile-0.15,Adobe/Com
-50,contents,0.0,quantile-0.85,Adobe/Com
 50,structural,0.0,mean,Adobe/Com
 50,structural,0.0,quantile-0.15,Adobe/Com
 50,structural,0.0,quantile-0.85,Adobe/Com
-50,structural+contents,0.0,mean,Adobe/Com
-50,structural+contents,0.0,quantile-0.15,Adobe/Com
-50,structural+contents,0.0,quantile-0.85,Adobe/Com
-100,contents,0.0,mean,Adobe/Com
-100,contents,0.0,quantile-0.15,Adobe/Com
-100,contents,0.0,quantile-0.85,Adobe/Com
-100,structural,1412.7141357421876,mean,Adobe/Com
-100,structural,87.20457628038193,quantile-0.15,Adobe/Com
-100,structural,1308.0686442057292,quantile-0.85,Adobe/Com
-100,structural+contents,1412.7141357421876,mean,Adobe/Com
-100,structural+contents,87.20457628038193,quantile-0.15,Adobe/Com
-100,structural+contents,1308.0686442057292,quantile-0.85,Adobe/Com
-200,contents,1313.6586547851564,mean,Adobe/Com
-200,contents,81.0900404188368,quantile-0.15,Adobe/Com
-200,contents,1216.350606282552,quantile-0.85,Adobe/Com
-200,structural,2891.4407226562503,mean,Adobe/Com
-200,structural,178.4839952256944,quantile-0.15,Adobe/Com
-200,structural,2677.2599283854165,quantile-0.85,Adobe/Com
-200,structural+contents,4512.54638671875,mean,Adobe/Com
-200,structural+contents,278.55224609374994,quantile-0.15,Adobe/Com
-200,structural+contents,4178.28369140625,quantile-0.85,Adobe/Com
-500,contents,2514.9284912109374,mean,Adobe/Com
-500,contents,155.24249945746524,quantile-0.15,Adobe/Com
-500,contents,2328.6374918619795,quantile-0.85,Adobe/Com
-500,structural,5933.114550781251,mean,Adobe/Com
-500,structural,1932.2109917534722,quantile-0.15,Adobe/Com
-500,structural,5617.253743489583,quantile-0.85,Adobe/Com
-500,structural+contents,8448.042822265625,mean,Adobe/Com
-500,structural+contents,2087.4534776475693,quantile-0.15,Adobe/Com
-500,structural+contents,7945.891031901041,quantile-0.85,Adobe/Com
-1000,contents,6559.288330078125,mean,Adobe/Com
-1000,contents,404.8943413628471,quantile-0.15,Adobe/Com
-1000,contents,6073.415120442708,quantile-0.85,Adobe/Com
-1000,structural,8532.732421875,mean,Adobe/Com
-1000,structural,2666.861762152778,quantile-0.15,Adobe/Com
-1000,structural,8069.637369791667,quantile-0.85,Adobe/Com
-1000,structural+contents,15092.020312499999,mean,Adobe/Com
-1000,structural+contents,3071.7560763888887,quantile-0.15,Adobe/Com
-1000,structural+contents,14143.052083333332,quantile-0.85,Adobe/Com
-5,contents,0.0,mean,Adobe/Res
-5,contents,0.0,quantile-0.15,Adobe/Res
-5,contents,0.0,quantile-0.85,Adobe/Res
+100,structural,1439.696,mean,Adobe/Com
+100,structural,88.87013045658622,quantile-0.15,Adobe/Com
+100,structural,1333.0519939283024,quantile-0.85,Adobe/Com
+200,structural,3002.1396,mean,Adobe/Com
+200,structural,185.31727369190162,quantile-0.15,Adobe/Com
+200,structural,2779.7591826989187,quantile-0.85,Adobe/Com
+500,structural,4794.755,mean,Adobe/Com
+500,structural,295.9725196362451,quantile-0.15,Adobe/Com
+500,structural,4439.587918033039,quantile-0.85,Adobe/Com
+1000,structural,8476.28,mean,Adobe/Com
+1000,structural,1969.660053107251,quantile-0.15,Adobe/Com
+1000,structural,7962.600438102934,quantile-0.85,Adobe/Com
 5,structural,0.0,mean,Adobe/Res
 5,structural,0.0,quantile-0.15,Adobe/Res
 5,structural,0.0,quantile-0.85,Adobe/Res
-5,structural+contents,0.0,mean,Adobe/Res
-5,structural+contents,0.0,quantile-0.15,Adobe/Res
-5,structural+contents,0.0,quantile-0.85,Adobe/Res
-10,contents,0.0,mean,Adobe/Res
-10,contents,0.0,quantile-0.15,Adobe/Res
-10,contents,0.0,quantile-0.85,Adobe/Res
 10,structural,0.0,mean,Adobe/Res
 10,structural,0.0,quantile-0.15,Adobe/Res
 10,structural,0.0,quantile-0.85,Adobe/Res
-10,structural+contents,0.0,mean,Adobe/Res
-10,structural+contents,0.0,quantile-0.15,Adobe/Res
-10,structural+contents,0.0,quantile-0.85,Adobe/Res
-20,contents,0.0,mean,Adobe/Res
-20,contents,0.0,quantile-0.15,Adobe/Res
-20,contents,0.0,quantile-0.85,Adobe/Res
 20,structural,0.0,mean,Adobe/Res
 20,structural,0.0,quantile-0.15,Adobe/Res
 20,structural,0.0,quantile-0.85,Adobe/Res
-20,structural+contents,0.0,mean,Adobe/Res
-20,structural+contents,0.0,quantile-0.15,Adobe/Res
-20,structural+contents,0.0,quantile-0.85,Adobe/Res
-50,contents,0.0,mean,Adobe/Res
-50,contents,0.0,quantile-0.15,Adobe/Res
-50,contents,0.0,quantile-0.85,Adobe/Res
 50,structural,0.0,mean,Adobe/Res
 50,structural,0.0,quantile-0.15,Adobe/Res
 50,structural,0.0,quantile-0.85,Adobe/Res
-50,structural+contents,0.0,mean,Adobe/Res
-50,structural+contents,0.0,quantile-0.15,Adobe/Res
-50,structural+contents,0.0,quantile-0.85,Adobe/Res
-100,contents,0.0,mean,Adobe/Res
-100,contents,0.0,quantile-0.15,Adobe/Res
-100,contents,0.0,quantile-0.85,Adobe/Res
-100,structural,108.95445556640625,mean,Adobe/Res
-100,structural,0.0,quantile-0.15,Adobe/Res
-100,structural,0.0,quantile-0.85,Adobe/Res
-100,structural+contents,108.95445556640625,mean,Adobe/Res
-100,structural+contents,0.0,quantile-0.15,Adobe/Res
-100,structural+contents,0.0,quantile-0.85,Adobe/Res
-200,contents,0.0,mean,Adobe/Res
-200,contents,0.0,quantile-0.15,Adobe/Res
-200,contents,0.0,quantile-0.85,Adobe/Res
-200,structural,2927.225451660156,mean,Adobe/Res
-200,structural,1719.8419392903645,quantile-0.15,Adobe/Res
-200,structural,2831.9057006835938,quantile-0.85,Adobe/Res
-200,structural+contents,2927.225451660156,mean,Adobe/Res
-200,structural+contents,1719.8419392903645,quantile-0.15,Adobe/Res
-200,structural+contents,2831.9057006835938,quantile-0.85,Adobe/Res
-500,contents,3133.6535888671874,mean,Adobe/Res
-500,contents,1470.9352620442708,quantile-0.15,Adobe/Res
-500,contents,3002.3863525390625,quantile-0.85,Adobe/Res
-500,structural,5260.693310546875,mean,Adobe/Res
-500,structural,2332.989990234375,quantile-0.15,Adobe/Res
-500,structural,5029.558837890625,quantile-0.85,Adobe/Res
-500,structural+contents,8368.61591796875,mean,Adobe/Res
-500,structural+contents,3560.9124891493057,quantile-0.15,Adobe/Res
-500,structural+contents,7989.060384114584,quantile-0.85,Adobe/Res
-1000,contents,3651.756201171875,mean,Adobe/Res
-1000,contents,1505.7754720052083,quantile-0.15,Adobe/Res
-1000,contents,3482.336669921875,quantile-0.85,Adobe/Res
-1000,structural,8298.860766601563,mean,Adobe/Res
-1000,structural,2777.6407470703125,quantile-0.15,Adobe/Res
-1000,structural,7862.9749755859375,quantile-0.85,Adobe/Res
-1000,structural+contents,11922.91005859375,mean,Adobe/Res
-1000,structural+contents,4021.73779296875,quantile-0.15,Adobe/Res
-1000,structural+contents,11299.13330078125,quantile-0.85,Adobe/Res
-5,contents,0.0,mean,Wood/Com
-5,contents,0.0,quantile-0.15,Wood/Com
-5,contents,0.0,quantile-0.85,Wood/Com
+100,structural,1025.7435,mean,Adobe/Res
+100,structural,1007.5748901367188,quantile-0.15,Adobe/Res
+100,structural,1007.5748901367188,quantile-0.85,Adobe/Res
+200,structural,2085.2,mean,Adobe/Res
+200,structural,1871.8527763749626,quantile-0.15,Adobe/Res
+200,structural,2068.356837027591,quantile-0.85,Adobe/Res
+500,structural,6251.634,mean,Adobe/Res
+500,structural,3305.5830478607973,quantile-0.15,Adobe/Res
+500,structural,6019.050974560858,quantile-0.85,Adobe/Res
+1000,structural,7093.372,mean,Adobe/Res
+1000,structural,3362.984469130899,quantile-0.15,Adobe/Res
+1000,structural,6798.868213579553,quantile-0.85,Adobe/Res
 5,structural,0.0,mean,Wood/Com
 5,structural,0.0,quantile-0.15,Wood/Com
 5,structural,0.0,quantile-0.85,Wood/Com
-5,structural+contents,0.0,mean,Wood/Com
-5,structural+contents,0.0,quantile-0.15,Wood/Com
-5,structural+contents,0.0,quantile-0.85,Wood/Com
-10,contents,0.0,mean,Wood/Com
-10,contents,0.0,quantile-0.15,Wood/Com
-10,contents,0.0,quantile-0.85,Wood/Com
 10,structural,0.0,mean,Wood/Com
 10,structural,0.0,quantile-0.15,Wood/Com
 10,structural,0.0,quantile-0.85,Wood/Com
-10,structural+contents,0.0,mean,Wood/Com
-10,structural+contents,0.0,quantile-0.15,Wood/Com
-10,structural+contents,0.0,quantile-0.85,Wood/Com
-20,contents,0.0,mean,Wood/Com
-20,contents,0.0,quantile-0.15,Wood/Com
-20,contents,0.0,quantile-0.85,Wood/Com
 20,structural,0.0,mean,Wood/Com
 20,structural,0.0,quantile-0.15,Wood/Com
 20,structural,0.0,quantile-0.85,Wood/Com
-20,structural+contents,0.0,mean,Wood/Com
-20,structural+contents,0.0,quantile-0.15,Wood/Com
-20,structural+contents,0.0,quantile-0.85,Wood/Com
-50,contents,0.0,mean,Wood/Com
-50,contents,0.0,quantile-0.15,Wood/Com
-50,contents,0.0,quantile-0.85,Wood/Com
 50,structural,0.0,mean,Wood/Com
 50,structural,0.0,quantile-0.15,Wood/Com
 50,structural,0.0,quantile-0.85,Wood/Com
-50,structural+contents,0.0,mean,Wood/Com
-50,structural+contents,0.0,quantile-0.15,Wood/Com
-50,structural+contents,0.0,quantile-0.85,Wood/Com
-100,contents,0.0,mean,Wood/Com
-100,contents,0.0,quantile-0.15,Wood/Com
-100,contents,0.0,quantile-0.85,Wood/Com
 100,structural,0.0,mean,Wood/Com
 100,structural,0.0,quantile-0.15,Wood/Com
 100,structural,0.0,quantile-0.85,Wood/Com
-100,structural+contents,0.0,mean,Wood/Com
-100,structural+contents,0.0,quantile-0.15,Wood/Com
-100,structural+contents,0.0,quantile-0.85,Wood/Com
-200,contents,1154.6827514648437,mean,Wood/Com
-200,contents,1063.5906778971355,quantile-0.15,Wood/Com
-200,contents,1147.4912719726562,quantile-0.85,Wood/Com
 200,structural,0.0,mean,Wood/Com
 200,structural,0.0,quantile-0.15,Wood/Com
 200,structural,0.0,quantile-0.85,Wood/Com
-200,structural+contents,1154.6827514648437,mean,Wood/Com
-200,structural+contents,1063.5906778971355,quantile-0.15,Wood/Com
-200,structural+contents,1147.4912719726562,quantile-0.85,Wood/Com
-500,contents,1825.2821289062501,mean,Wood/Com
-500,contents,1588.945556640625,quantile-0.15,Wood/Com
-500,contents,1588.945556640625,quantile-0.85,Wood/Com
-500,structural,79.152685546875,mean,Wood/Com
+500,structural,78.36492,mean,Wood/Com
 500,structural,0.0,quantile-0.15,Wood/Com
 500,structural,0.0,quantile-0.85,Wood/Com
-500,structural+contents,1904.4348388671876,mean,Wood/Com
-500,structural+contents,1588.945556640625,quantile-0.15,Wood/Com
-500,structural+contents,1588.945556640625,quantile-0.85,Wood/Com
-1000,contents,2391.1221435546877,mean,Wood/Com
-1000,contents,1641.769287109375,quantile-0.15,Wood/Com
-1000,contents,1641.769287109375,quantile-0.85,Wood/Com
-1000,structural,299.80258789062503,mean,Wood/Com
-1000,structural,0.0,quantile-0.15,Wood/Com
-1000,structural,0.0,quantile-0.85,Wood/Com
-1000,structural+contents,2690.9247802734376,mean,Wood/Com
-1000,structural+contents,1641.769287109375,quantile-0.15,Wood/Com
-1000,structural+contents,1641.769287109375,quantile-0.85,Wood/Com
-5,contents,0.0,mean,Wood/Res
-5,contents,0.0,quantile-0.15,Wood/Res
-5,contents,0.0,quantile-0.85,Wood/Res
+1000,structural,882.03357,mean,Wood/Com
+1000,structural,637.8353881835938,quantile-0.15,Wood/Com
+1000,structural,637.8353881835938,quantile-0.85,Wood/Com
 5,structural,0.0,mean,Wood/Res
 5,structural,0.0,quantile-0.15,Wood/Res
 5,structural,0.0,quantile-0.85,Wood/Res
-5,structural+contents,0.0,mean,Wood/Res
-5,structural+contents,0.0,quantile-0.15,Wood/Res
-5,structural+contents,0.0,quantile-0.85,Wood/Res
-10,contents,0.0,mean,Wood/Res
-10,contents,0.0,quantile-0.15,Wood/Res
-10,contents,0.0,quantile-0.85,Wood/Res
 10,structural,0.0,mean,Wood/Res
 10,structural,0.0,quantile-0.15,Wood/Res
 10,structural,0.0,quantile-0.85,Wood/Res
-10,structural+contents,0.0,mean,Wood/Res
-10,structural+contents,0.0,quantile-0.15,Wood/Res
-10,structural+contents,0.0,quantile-0.85,Wood/Res
-20,contents,0.0,mean,Wood/Res
-20,contents,0.0,quantile-0.15,Wood/Res
-20,contents,0.0,quantile-0.85,Wood/Res
 20,structural,0.0,mean,Wood/Res
 20,structural,0.0,quantile-0.15,Wood/Res
 20,structural,0.0,quantile-0.85,Wood/Res
-20,structural+contents,0.0,mean,Wood/Res
-20,structural+contents,0.0,quantile-0.15,Wood/Res
-20,structural+contents,0.0,quantile-0.85,Wood/Res
-50,contents,0.0,mean,Wood/Res
-50,contents,0.0,quantile-0.15,Wood/Res
-50,contents,0.0,quantile-0.85,Wood/Res
 50,structural,0.0,mean,Wood/Res
 50,structural,0.0,quantile-0.15,Wood/Res
 50,structural,0.0,quantile-0.85,Wood/Res
-50,structural+contents,0.0,mean,Wood/Res
-50,structural+contents,0.0,quantile-0.15,Wood/Res
-50,structural+contents,0.0,quantile-0.85,Wood/Res
-100,contents,0.0,mean,Wood/Res
-100,contents,0.0,quantile-0.15,Wood/Res
-100,contents,0.0,quantile-0.85,Wood/Res
 100,structural,0.0,mean,Wood/Res
 100,structural,0.0,quantile-0.15,Wood/Res
 100,structural,0.0,quantile-0.85,Wood/Res
-100,structural+contents,0.0,mean,Wood/Res
-100,structural+contents,0.0,quantile-0.15,Wood/Res
-100,structural+contents,0.0,quantile-0.85,Wood/Res
-200,contents,0.0,mean,Wood/Res
-200,contents,0.0,quantile-0.15,Wood/Res
-200,contents,0.0,quantile-0.85,Wood/Res
 200,structural,0.0,mean,Wood/Res
 200,structural,0.0,quantile-0.15,Wood/Res
 200,structural,0.0,quantile-0.85,Wood/Res
-200,structural+contents,0.0,mean,Wood/Res
-200,structural+contents,0.0,quantile-0.15,Wood/Res
-200,structural+contents,0.0,quantile-0.85,Wood/Res
-500,contents,1710.978515625,mean,Wood/Res
-500,contents,1162.580295138889,quantile-0.15,Wood/Res
-500,contents,1667.6839192708333,quantile-0.85,Wood/Res
-500,structural,591.0380859375,mean,Wood/Res
-500,structural,36.48383246527777,quantile-0.15,Wood/Res
-500,structural,547.2574869791666,quantile-0.85,Wood/Res
-500,structural+contents,2302.0166015625,mean,Wood/Res
-500,structural+contents,1199.0641276041667,quantile-0.15,Wood/Res
-500,structural+contents,2214.94140625,quantile-0.85,Wood/Res
-1000,contents,3647.6370117187503,mean,Wood/Res
-1000,contents,1422.9571940104165,quantile-0.15,Wood/Res
-1000,contents,3472.00439453125,quantile-0.85,Wood/Res
-1000,structural,1289.5283935546875,mean,Wood/Res
-1000,structural,79.6005181206597,quantile-0.15,Wood/Res
-1000,structural,1194.0077718098958,quantile-0.85,Wood/Res
-1000,structural+contents,4937.165185546875,mean,Wood/Res
-1000,structural+contents,1502.5576985677083,quantile-0.15,Wood/Res
-1000,structural+contents,4666.011962890625,quantile-0.85,Wood/Res
+500,structural,1102.555,mean,Wood/Res
+500,structural,68.05895295388514,quantile-0.15,Wood/Res
+500,structural,1020.884322704686,quantile-0.85,Wood/Res
+1000,structural,1480.6086,mean,Wood/Res
+1000,structural,91.39559567174778,quantile-0.15,Wood/Res
+1000,structural,1370.933973209432,quantile-0.85,Wood/Res
diff --git a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-taxonomy.csv b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-taxonomy.csv
index 48c3f0acf1d2..8c39c7875015 100644
--- a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-taxonomy.csv
+++ b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggcurves-taxonomy.csv
@@ -1,170 +1,58 @@
-#,,,,,"generated_by='OpenQuake engine 3.21.0-git855f23bdf1', start_date='2024-06-04T05:50:50', checksum=1294572362, risk_investigation_time=1000.0, num_events=781, effective_time=2000.0, limit_states=''"
+#,,,,,"generated_by='OpenQuake engine 3.22.0-git36e91b9743', start_date='2024-11-05T09:57:17', checksum=17759650, risk_investigation_time=1000.0, num_events=781, effective_time=2000.0, limit_states=''"
 taxonomy,return_period,loss_type,rlz_id,loss_value,loss_ratio
-Adobe/Com,5,contents,0,0.00000E+00,0.00000E+00
-Adobe/Com,10,contents,0,0.00000E+00,0.00000E+00
-Adobe/Com,20,contents,0,0.00000E+00,0.00000E+00
-Adobe/Com,50,contents,0,0.00000E+00,0.00000E+00
-Adobe/Com,100,contents,0,0.00000E+00,0.00000E+00
-Adobe/Com,200,contents,0,1.45962E+03,7.35511E-02
-Adobe/Com,500,contents,0,2.79436E+03,1.40810E-01
-Adobe/Com,1000,contents,0,7.28810E+03,3.67251E-01
 Adobe/Com,5,structural,0,0.00000E+00,0.00000E+00
 Adobe/Com,10,structural,0,0.00000E+00,0.00000E+00
 Adobe/Com,20,structural,0,0.00000E+00,0.00000E+00
 Adobe/Com,50,structural,0,0.00000E+00,0.00000E+00
-Adobe/Com,100,structural,0,1.56968E+03,1.38420E-01
-Adobe/Com,200,structural,0,3.21271E+03,2.83308E-01
-Adobe/Com,500,structural,0,6.40691E+03,5.64983E-01
-Adobe/Com,1000,structural,0,9.22738E+03,8.13702E-01
-Adobe/Com,5,structural+contents,0,0.00000E+00,0.00000E+00
-Adobe/Com,10,structural+contents,0,0.00000E+00,0.00000E+00
-Adobe/Com,20,structural+contents,0,0.00000E+00,0.00000E+00
-Adobe/Com,50,structural+contents,0,0.00000E+00,0.00000E+00
-Adobe/Com,100,structural+contents,0,1.56968E+03,5.03345E-02
-Adobe/Com,200,structural+contents,0,5.01394E+03,1.60781E-01
-Adobe/Com,500,structural+contents,0,9.20127E+03,2.95054E-01
-Adobe/Com,1000,structural+contents,0,1.65155E+04,5.29597E-01
+Adobe/Com,100,structural,0,1.59966E+03,1.41064E-01
+Adobe/Com,200,structural,0,3.33571E+03,2.94154E-01
+Adobe/Com,500,structural,0,5.32751E+03,4.69798E-01
+Adobe/Com,1000,structural,0,9.24680E+03,8.15415E-01
 Adobe/Com,5,structural,1,0.00000E+00,0.00000E+00
 Adobe/Com,10,structural,1,0.00000E+00,0.00000E+00
 Adobe/Com,20,structural,1,0.00000E+00,0.00000E+00
 Adobe/Com,50,structural,1,0.00000E+00,0.00000E+00
 Adobe/Com,100,structural,1,0.00000E+00,0.00000E+00
 Adobe/Com,200,structural,1,0.00000E+00,0.00000E+00
-Adobe/Com,500,structural,1,1.66899E+03,1.47178E-01
-Adobe/Com,1000,structural,1,2.28095E+03,2.01142E-01
-Adobe/Com,5,structural+contents,1,0.00000E+00,0.00000E+00
-Adobe/Com,10,structural+contents,1,0.00000E+00,0.00000E+00
-Adobe/Com,20,structural+contents,1,0.00000E+00,0.00000E+00
-Adobe/Com,50,structural+contents,1,0.00000E+00,0.00000E+00
-Adobe/Com,100,structural+contents,1,0.00000E+00,0.00000E+00
-Adobe/Com,200,structural+contents,1,0.00000E+00,0.00000E+00
-Adobe/Com,500,structural+contents,1,1.66899E+03,5.35191E-02
-Adobe/Com,1000,structural+contents,1,2.28095E+03,7.31425E-02
-Adobe/Res,5,contents,0,0.00000E+00,0.00000E+00
-Adobe/Res,10,contents,0,0.00000E+00,0.00000E+00
-Adobe/Res,20,contents,0,0.00000E+00,0.00000E+00
-Adobe/Res,50,contents,0,0.00000E+00,0.00000E+00
-Adobe/Res,100,contents,0,0.00000E+00,0.00000E+00
-Adobe/Res,200,contents,0,0.00000E+00,0.00000E+00
-Adobe/Res,500,contents,0,3.33055E+03,1.67828E-01
-Adobe/Res,1000,contents,0,3.90589E+03,1.96820E-01
+Adobe/Com,500,structural,1,0.00000E+00,0.00000E+00
+Adobe/Com,1000,structural,1,1.54159E+03,1.35943E-01
 Adobe/Res,5,structural,0,0.00000E+00,0.00000E+00
 Adobe/Res,10,structural,0,0.00000E+00,0.00000E+00
 Adobe/Res,20,structural,0,0.00000E+00,0.00000E+00
 Adobe/Res,50,structural,0,0.00000E+00,0.00000E+00
-Adobe/Res,100,structural,0,0.00000E+00,0.00000E+00
-Adobe/Res,200,structural,0,3.07021E+03,2.70741E-01
-Adobe/Res,500,structural,0,5.60740E+03,4.94479E-01
-Adobe/Res,1000,structural,0,8.95269E+03,7.89479E-01
-Adobe/Res,5,structural+contents,0,0.00000E+00,0.00000E+00
-Adobe/Res,10,structural+contents,0,0.00000E+00,0.00000E+00
-Adobe/Res,20,structural+contents,0,0.00000E+00,0.00000E+00
-Adobe/Res,50,structural+contents,0,0.00000E+00,0.00000E+00
-Adobe/Res,100,structural+contents,0,0.00000E+00,0.00000E+00
-Adobe/Res,200,structural+contents,0,3.07021E+03,9.84513E-02
-Adobe/Res,500,structural+contents,0,8.93795E+03,2.86611E-01
-Adobe/Res,1000,structural+contents,0,1.28586E+04,4.12332E-01
-Adobe/Res,5,contents,1,0.00000E+00,0.00000E+00
-Adobe/Res,10,contents,1,0.00000E+00,0.00000E+00
-Adobe/Res,20,contents,1,0.00000E+00,0.00000E+00
-Adobe/Res,50,contents,1,0.00000E+00,0.00000E+00
-Adobe/Res,100,contents,1,0.00000E+00,0.00000E+00
-Adobe/Res,200,contents,1,0.00000E+00,0.00000E+00
-Adobe/Res,500,contents,1,1.36155E+03,6.86090E-02
-Adobe/Res,1000,contents,1,1.36459E+03,6.87625E-02
+Adobe/Res,100,structural,0,1.00757E+03,8.88514E-02
+Adobe/Res,200,structural,0,2.11046E+03,1.86108E-01
+Adobe/Res,500,structural,0,6.60051E+03,5.82055E-01
+Adobe/Res,1000,structural,0,7.53513E+03,6.64473E-01
 Adobe/Res,5,structural,1,0.00000E+00,0.00000E+00
 Adobe/Res,10,structural,1,0.00000E+00,0.00000E+00
 Adobe/Res,20,structural,1,0.00000E+00,0.00000E+00
 Adobe/Res,50,structural,1,0.00000E+00,0.00000E+00
-Adobe/Res,100,structural,1,1.08954E+03,9.60798E-02
-Adobe/Res,200,structural,1,1.64041E+03,1.44657E-01
-Adobe/Res,500,structural,1,2.14038E+03,1.88746E-01
-Adobe/Res,1000,structural,1,2.41440E+03,2.12910E-01
-Adobe/Res,5,structural+contents,1,0.00000E+00,0.00000E+00
-Adobe/Res,10,structural+contents,1,0.00000E+00,0.00000E+00
-Adobe/Res,20,structural+contents,1,0.00000E+00,0.00000E+00
-Adobe/Res,50,structural+contents,1,0.00000E+00,0.00000E+00
-Adobe/Res,100,structural+contents,1,1.08954E+03,3.49381E-02
-Adobe/Res,200,structural+contents,1,1.64041E+03,5.26025E-02
-Adobe/Res,500,structural+contents,1,3.24462E+03,1.04044E-01
-Adobe/Res,1000,structural+contents,1,3.50192E+03,1.12295E-01
-Wood/Com,5,contents,0,0.00000E+00,0.00000E+00
-Wood/Com,10,contents,0,0.00000E+00,0.00000E+00
-Wood/Com,20,contents,0,0.00000E+00,0.00000E+00
-Wood/Com,50,contents,0,0.00000E+00,0.00000E+00
-Wood/Com,100,contents,0,0.00000E+00,0.00000E+00
-Wood/Com,200,contents,0,1.16547E+03,5.87286E-02
-Wood/Com,500,contents,0,1.58895E+03,8.00678E-02
-Wood/Com,1000,contents,0,1.64177E+03,8.27296E-02
-Wood/Com,5,structural+contents,0,0.00000E+00,0.00000E+00
-Wood/Com,10,structural+contents,0,0.00000E+00,0.00000E+00
-Wood/Com,20,structural+contents,0,0.00000E+00,0.00000E+00
-Wood/Com,50,structural+contents,0,0.00000E+00,0.00000E+00
-Wood/Com,100,structural+contents,0,0.00000E+00,0.00000E+00
-Wood/Com,200,structural+contents,0,1.16547E+03,3.73728E-02
-Wood/Com,500,structural+contents,0,1.58895E+03,5.09522E-02
-Wood/Com,1000,structural+contents,0,1.64177E+03,5.26461E-02
-Wood/Com,5,contents,1,0.00000E+00,0.00000E+00
-Wood/Com,10,contents,1,0.00000E+00,0.00000E+00
-Wood/Com,20,contents,1,0.00000E+00,0.00000E+00
-Wood/Com,50,contents,1,0.00000E+00,0.00000E+00
-Wood/Com,100,contents,1,0.00000E+00,0.00000E+00
-Wood/Com,200,contents,1,1.05760E+03,5.32929E-02
-Wood/Com,500,contents,1,3.95231E+03,1.99159E-01
-Wood/Com,1000,contents,1,9.13530E+03,4.60332E-01
+Adobe/Res,100,structural,1,1.18926E+03,1.04873E-01
+Adobe/Res,200,structural,1,1.85782E+03,1.63829E-01
+Adobe/Res,500,structural,1,3.11176E+03,2.74406E-01
+Adobe/Res,1000,structural,1,3.11756E+03,2.74917E-01
+Wood/Com,5,structural,0,0.00000E+00,0.00000E+00
+Wood/Com,10,structural,0,0.00000E+00,0.00000E+00
+Wood/Com,20,structural,0,0.00000E+00,0.00000E+00
+Wood/Com,50,structural,0,0.00000E+00,0.00000E+00
+Wood/Com,100,structural,0,0.00000E+00,0.00000E+00
+Wood/Com,200,structural,0,0.00000E+00,0.00000E+00
+Wood/Com,500,structural,0,0.00000E+00,0.00000E+00
+Wood/Com,1000,structural,0,6.37835E+02,5.62465E-02
 Wood/Com,5,structural,1,0.00000E+00,0.00000E+00
 Wood/Com,10,structural,1,0.00000E+00,0.00000E+00
 Wood/Com,20,structural,1,0.00000E+00,0.00000E+00
 Wood/Com,50,structural,1,0.00000E+00,0.00000E+00
 Wood/Com,100,structural,1,0.00000E+00,0.00000E+00
 Wood/Com,200,structural,1,0.00000E+00,0.00000E+00
-Wood/Com,500,structural,1,7.91527E+02,6.97995E-02
-Wood/Com,1000,structural,1,2.99803E+03,2.64376E-01
-Wood/Com,5,structural+contents,1,0.00000E+00,0.00000E+00
-Wood/Com,10,structural+contents,1,0.00000E+00,0.00000E+00
-Wood/Com,20,structural+contents,1,0.00000E+00,0.00000E+00
-Wood/Com,50,structural+contents,1,0.00000E+00,0.00000E+00
-Wood/Com,100,structural+contents,1,0.00000E+00,0.00000E+00
-Wood/Com,200,structural+contents,1,1.05760E+03,3.39137E-02
-Wood/Com,500,structural+contents,1,4.74384E+03,1.52119E-01
-Wood/Com,1000,structural+contents,1,1.21333E+04,3.89076E-01
-Wood/Res,5,contents,0,0.00000E+00,0.00000E+00
-Wood/Res,10,contents,0,0.00000E+00,0.00000E+00
-Wood/Res,20,contents,0,0.00000E+00,0.00000E+00
-Wood/Res,50,contents,0,0.00000E+00,0.00000E+00
-Wood/Res,100,contents,0,0.00000E+00,0.00000E+00
-Wood/Res,200,contents,0,0.00000E+00,0.00000E+00
-Wood/Res,500,contents,0,1.77592E+03,8.94896E-02
-Wood/Res,1000,contents,0,3.91109E+03,1.97082E-01
+Wood/Com,500,structural,1,7.83649E+02,6.91049E-02
+Wood/Com,1000,structural,1,3.07982E+03,2.71589E-01
 Wood/Res,5,structural,0,0.00000E+00,0.00000E+00
 Wood/Res,10,structural,0,0.00000E+00,0.00000E+00
 Wood/Res,20,structural,0,0.00000E+00,0.00000E+00
 Wood/Res,50,structural,0,0.00000E+00,0.00000E+00
 Wood/Res,100,structural,0,0.00000E+00,0.00000E+00
 Wood/Res,200,structural,0,0.00000E+00,0.00000E+00
-Wood/Res,500,structural,0,6.56709E+02,5.79108E-02
-Wood/Res,1000,structural,0,1.43281E+03,1.26350E-01
-Wood/Res,5,structural+contents,0,0.00000E+00,0.00000E+00
-Wood/Res,10,structural+contents,0,0.00000E+00,0.00000E+00
-Wood/Res,20,structural+contents,0,0.00000E+00,0.00000E+00
-Wood/Res,50,structural+contents,0,0.00000E+00,0.00000E+00
-Wood/Res,100,structural+contents,0,0.00000E+00,0.00000E+00
-Wood/Res,200,structural+contents,0,0.00000E+00,0.00000E+00
-Wood/Res,500,structural+contents,0,2.43263E+03,7.80064E-02
-Wood/Res,1000,structural+contents,0,5.34390E+03,1.71361E-01
-Wood/Res,5,contents,1,0.00000E+00,0.00000E+00
-Wood/Res,10,contents,1,0.00000E+00,0.00000E+00
-Wood/Res,20,contents,1,0.00000E+00,0.00000E+00
-Wood/Res,50,contents,1,0.00000E+00,0.00000E+00
-Wood/Res,100,contents,1,0.00000E+00,0.00000E+00
-Wood/Res,200,contents,1,0.00000E+00,0.00000E+00
-Wood/Res,500,contents,1,1.12650E+03,5.67650E-02
-Wood/Res,1000,contents,1,1.27660E+03,6.43284E-02
-Wood/Res,5,structural+contents,1,0.00000E+00,0.00000E+00
-Wood/Res,10,structural+contents,1,0.00000E+00,0.00000E+00
-Wood/Res,20,structural+contents,1,0.00000E+00,0.00000E+00
-Wood/Res,50,structural+contents,1,0.00000E+00,0.00000E+00
-Wood/Res,100,structural+contents,1,0.00000E+00,0.00000E+00
-Wood/Res,200,structural+contents,1,0.00000E+00,0.00000E+00
-Wood/Res,500,structural+contents,1,1.12650E+03,3.61232E-02
-Wood/Res,1000,structural+contents,1,1.27660E+03,4.09362E-02
+Wood/Res,500,structural,0,1.22506E+03,1.08030E-01
+Wood/Res,1000,structural,0,1.64512E+03,1.45072E-01
diff --git a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggrisk-stats-.csv b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggrisk-stats-.csv
index 83e1e9ff6796..b4da30587991 100644
--- a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggrisk-stats-.csv
+++ b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggrisk-stats-.csv
@@ -1,11 +1,5 @@
-#,,"generated_by='OpenQuake engine 3.21.0-git855f23bdf1', start_date='2024-06-04T05:50:50', checksum=1294572362"
+#,,"generated_by='OpenQuake engine 3.22.0-git36e91b9743', start_date='2024-11-05T09:57:17', checksum=17759650"
 loss_type,loss,stat
-contents,42364.053515625004,mean
-contents,23567.271050347223,quantile-0.15
-contents,40880.097005208336,quantile-0.85
-structural,69290.30058593751,mean
-structural,30165.505533854164,quantile-0.15
-structural,66201.5009765625,quantile-0.85
-structural+contents,111654.35078125,mean
-structural+contents,53732.778211805555,quantile-0.15
-structural+contents,107081.59505208333,quantile-0.85
+structural,70220.875,mean
+structural,30207.003246491182,quantile-0.15
+structural,67061.88573322882,quantile-0.85
diff --git a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggrisk-stats-NAME-taxonomy.csv b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggrisk-stats-NAME-taxonomy.csv
index 3dc568c11b1a..55a77888b263 100644
--- a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggrisk-stats-NAME-taxonomy.csv
+++ b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggrisk-stats-NAME-taxonomy.csv
@@ -1,38 +1,14 @@
-#,,,,"generated_by='OpenQuake engine 3.21.0-git855f23bdf1', start_date='2024-06-04T05:50:50', checksum=1294572362"
+#,,,,"generated_by='OpenQuake engine 3.22.0-git36e91b9743', start_date='2024-11-05T09:57:17', checksum=17759650"
 loss_type,loss,stat,NAME_1,taxonomy
-contents,15716.810742187501,mean,Far-Western,Adobe/Com
-contents,970.1735026041664,quantile-0.15,Far-Western,Adobe/Com
-contents,14552.6025390625,quantile-0.85,Far-Western,Adobe/Com
-structural,37673.17143554687,mean,Far-Western,Adobe/Com
-structural,8343.501057942707,quantile-0.15,Far-Western,Adobe/Com
-structural,35357.671142578125,quantile-0.85,Far-Western,Adobe/Com
-structural+contents,53389.98393554687,mean,Far-Western,Adobe/Com
-structural+contents,9313.674669053818,quantile-0.15,Far-Western,Adobe/Com
-structural+contents,49910.2753092448,quantile-0.85,Far-Western,Adobe/Com
-contents,9320.072143554688,mean,Mid-Western,Adobe/Res
-contents,3133.171373155382,quantile-0.15,Mid-Western,Adobe/Res
-contents,8831.632609049479,quantile-0.85,Mid-Western,Adobe/Res
-structural,29357.608203125,mean,Mid-Western,Adobe/Res
-structural,18126.899522569445,quantile-0.15,Mid-Western,Adobe/Res
-structural,28470.973307291664,quantile-0.85,Mid-Western,Adobe/Res
-structural+contents,38677.6810546875,mean,Mid-Western,Adobe/Res
-structural+contents,21260.0693359375,quantile-0.15,Mid-Western,Adobe/Res
-structural+contents,37302.6064453125,quantile-0.85,Mid-Western,Adobe/Res
-contents,9816.2484375,mean,Mid-Western,Wood/Com
-contents,8995.67578125,quantile-0.15,Mid-Western,Wood/Com
-contents,8995.67578125,quantile-0.85,Mid-Western,Wood/Com
-structural,378.9552734375,mean,Mid-Western,Wood/Com
-structural,0.0,quantile-0.15,Mid-Western,Wood/Com
-structural,0.0,quantile-0.85,Mid-Western,Wood/Com
-structural+contents,10195.20390625,mean,Mid-Western,Wood/Com
-structural+contents,8995.67578125,quantile-0.15,Mid-Western,Wood/Com
-structural+contents,8995.67578125,quantile-0.85,Mid-Western,Wood/Com
-contents,7510.922900390625,mean,Mid-Western,Wood/Res
-contents,2718.3959689670137,quantile-0.15,Mid-Western,Wood/Res
-contents,7132.565511067708,quantile-0.85,Mid-Western,Wood/Res
-structural,1880.5664794921875,mean,Mid-Western,Wood/Res
-structural,116.08435058593747,quantile-0.15,Mid-Western,Wood/Res
-structural,1741.2652587890625,quantile-0.85,Mid-Western,Wood/Res
-structural+contents,9391.488720703126,mean,Mid-Western,Wood/Res
-structural+contents,2834.480278862847,quantile-0.15,Mid-Western,Wood/Res
-structural+contents,8873.830159505207,quantile-0.85,Mid-Western,Wood/Res
+structural,38452.133,mean,Far-Western,Adobe/Com
+structural,3820.0213208515493,quantile-0.15,Far-Western,Adobe/Com
+structural,35718.020226298315,quantile-0.85,Far-Western,Adobe/Com
+structural,28225.174,mean,Mid-Western,Adobe/Res
+structural,22543.26497272051,quantile-0.15,Mid-Western,Adobe/Res
+structural,27776.603653023307,quantile-0.85,Mid-Western,Adobe/Res
+structural,960.3985,mean,Mid-Western,Wood/Com
+structural,637.8353881835938,quantile-0.15,Mid-Western,Wood/Com
+structural,637.8353881835938,quantile-0.85,Mid-Western,Wood/Com
+structural,2583.1636,mean,Mid-Western,Wood/Res
+structural,159.45454862563292,quantile-0.15,Mid-Western,Wood/Res
+structural,2391.818295914118,quantile-0.85,Mid-Western,Wood/Res
diff --git a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggrisk-stats-NAME.csv b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggrisk-stats-NAME.csv
index ce54fe313146..af79e79df720 100644
--- a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggrisk-stats-NAME.csv
+++ b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggrisk-stats-NAME.csv
@@ -1,20 +1,8 @@
-#,,,"generated_by='OpenQuake engine 3.21.0-git855f23bdf1', start_date='2024-06-04T05:50:50', checksum=1294572362"
+#,,,"generated_by='OpenQuake engine 3.22.0-git36e91b9743', start_date='2024-11-05T09:57:17', checksum=17759650"
 loss_type,loss,stat,NAME_1
-contents,15716.810742187501,mean,Far-Western
-contents,970.1735026041664,quantile-0.15,Far-Western
-contents,14552.6025390625,quantile-0.85,Far-Western
-structural,37673.17143554687,mean,Far-Western
-structural,8343.501057942707,quantile-0.15,Far-Western
-structural,35357.671142578125,quantile-0.85,Far-Western
-structural+contents,53389.98393554687,mean,Far-Western
-structural+contents,9313.674669053818,quantile-0.15,Far-Western
-structural+contents,49910.2753092448,quantile-0.85,Far-Western
-contents,26647.244531250002,mean,Mid-Western
-contents,22597.09765625,quantile-0.15,Mid-Western
-contents,26327.49609375,quantile-0.85,Mid-Western
-structural,31617.129296875,mean,Mid-Western
-structural,21822.005859375,quantile-0.15,Mid-Western
-structural,30843.830078125,quantile-0.85,Mid-Western
-structural+contents,58264.373828125,mean,Mid-Western
-structural+contents,44419.103515625,quantile-0.15,Mid-Western
-structural+contents,57171.326171875,quantile-0.85,Mid-Western
+structural,38452.133,mean,Far-Western
+structural,3820.0213208515493,quantile-0.15,Far-Western
+structural,35718.020226298315,quantile-0.85,Far-Western
+structural,31768.738,mean,Mid-Western
+structural,26386.984590841457,quantile-0.15,Mid-Western
+structural,31343.86276034833,quantile-0.85,Mid-Western
diff --git a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggrisk-stats-taxonomy.csv b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggrisk-stats-taxonomy.csv
index adb20eea4393..1e374e219b1f 100644
--- a/openquake/qa_tests_data/event_based_risk/case_5/expected/aggrisk-stats-taxonomy.csv
+++ b/openquake/qa_tests_data/event_based_risk/case_5/expected/aggrisk-stats-taxonomy.csv
@@ -1,38 +1,14 @@
-#,,,"generated_by='OpenQuake engine 3.21.0-git855f23bdf1', start_date='2024-06-04T05:50:50', checksum=1294572362"
+#,,,"generated_by='OpenQuake engine 3.22.0-git36e91b9743', start_date='2024-11-05T09:57:17', checksum=17759650"
 loss_type,loss,stat,taxonomy
-contents,15716.810742187501,mean,Adobe/Com
-contents,970.1735026041664,quantile-0.15,Adobe/Com
-contents,14552.6025390625,quantile-0.85,Adobe/Com
-structural,37673.17143554687,mean,Adobe/Com
-structural,8343.501057942707,quantile-0.15,Adobe/Com
-structural,35357.671142578125,quantile-0.85,Adobe/Com
-structural+contents,53389.98393554687,mean,Adobe/Com
-structural+contents,9313.674669053818,quantile-0.15,Adobe/Com
-structural+contents,49910.2753092448,quantile-0.85,Adobe/Com
-contents,9320.072143554688,mean,Adobe/Res
-contents,3133.171373155382,quantile-0.15,Adobe/Res
-contents,8831.632609049479,quantile-0.85,Adobe/Res
-structural,29357.608203125,mean,Adobe/Res
-structural,18126.899522569445,quantile-0.15,Adobe/Res
-structural,28470.973307291664,quantile-0.85,Adobe/Res
-structural+contents,38677.6810546875,mean,Adobe/Res
-structural+contents,21260.0693359375,quantile-0.15,Adobe/Res
-structural+contents,37302.6064453125,quantile-0.85,Adobe/Res
-contents,9816.2484375,mean,Wood/Com
-contents,8995.67578125,quantile-0.15,Wood/Com
-contents,8995.67578125,quantile-0.85,Wood/Com
-structural,378.9552734375,mean,Wood/Com
-structural,0.0,quantile-0.15,Wood/Com
-structural,0.0,quantile-0.85,Wood/Com
-structural+contents,10195.20390625,mean,Wood/Com
-structural+contents,8995.67578125,quantile-0.15,Wood/Com
-structural+contents,8995.67578125,quantile-0.85,Wood/Com
-contents,7510.922900390625,mean,Wood/Res
-contents,2718.3959689670137,quantile-0.15,Wood/Res
-contents,7132.565511067708,quantile-0.85,Wood/Res
-structural,1880.5664794921875,mean,Wood/Res
-structural,116.08435058593747,quantile-0.15,Wood/Res
-structural,1741.2652587890625,quantile-0.85,Wood/Res
-structural+contents,9391.488720703126,mean,Wood/Res
-structural+contents,2834.480278862847,quantile-0.15,Wood/Res
-structural+contents,8873.830159505207,quantile-0.85,Wood/Res
+structural,38452.133,mean,Adobe/Com
+structural,3820.0213208515493,quantile-0.15,Adobe/Com
+structural,35718.020226298315,quantile-0.85,Adobe/Com
+structural,28225.174,mean,Adobe/Res
+structural,22543.26497272051,quantile-0.15,Adobe/Res
+structural,27776.603653023307,quantile-0.85,Adobe/Res
+structural,960.3985,mean,Wood/Com
+structural,637.8353881835938,quantile-0.15,Wood/Com
+structural,637.8353881835938,quantile-0.85,Wood/Com
+structural,2583.1636,mean,Wood/Res
+structural,159.45454862563292,quantile-0.15,Wood/Res
+structural,2391.818295914118,quantile-0.85,Wood/Res
diff --git a/openquake/qa_tests_data/event_based_risk/case_5/job.ini b/openquake/qa_tests_data/event_based_risk/case_5/job.ini
index b770821bd0b1..ad12b55a2399 100644
--- a/openquake/qa_tests_data/event_based_risk/case_5/job.ini
+++ b/openquake/qa_tests_data/event_based_risk/case_5/job.ini
@@ -14,7 +14,7 @@ site_model_file = site_model.csv
 
 [vulnerability]
 structural_vulnerability_file = structural_vulnerability_model.xml
-contents_vulnerability_file = contents_vulnerability_model.xml
+#contents_vulnerability_file = contents_vulnerability_model.xml
 
 [taxonomy mapping]
 taxonomy_mapping_csv = taxonomy_map.csv
@@ -42,7 +42,7 @@ max_gmvs_chunk = 500
 
 [outputs]
 quantiles = 0.15 0.85
-total_losses = structural+contents
+#total_losses = structural+contents
 
 [export]
 export_dir = /tmp
diff --git a/openquake/qa_tests_data/event_based_risk/case_5/taxonomy_map.csv b/openquake/qa_tests_data/event_based_risk/case_5/taxonomy_map.csv
index 1e6853437513..6004fe617aa0 100644
--- a/openquake/qa_tests_data/event_based_risk/case_5/taxonomy_map.csv
+++ b/openquake/qa_tests_data/event_based_risk/case_5/taxonomy_map.csv
@@ -1,12 +1,8 @@
-loss_type,taxonomy,conversion,weight
-contents,Wood/Res,Wood/Res,1
-contents,Adobe/Res,Adobe/Res,1
-contents,Wood/Com,Wood/Com,1
-contents,Adobe/Com,Adobe/Com,1
-structural,Wood,Wood1,1
-structural,Wood/Res,Wood1,.5
-structural,Wood/Res,Wood2,.5
-structural,Adobe/Res,Adobe,1
-structural,Wood/Com,Wood1,.6
-structural,Wood/Com,Wood2,.4
-structural,Adobe/Com,Adobe,1
+taxonomy,conversion,weight
+Wood,Wood1,1
+Wood/Res,Wood1,.5
+Wood/Res,Wood2,.5
+Adobe/Res,Adobe,1
+Wood/Com,Wood1,.6
+Wood/Com,Wood2,.4
+Adobe/Com,Adobe,1
diff --git a/openquake/qa_tests_data/event_based_risk/case_8/expected/aggrisk-.csv b/openquake/qa_tests_data/event_based_risk/case_8/expected/aggrisk-.csv
index 3082fe626c96..89c522599b60 100644
--- a/openquake/qa_tests_data/event_based_risk/case_8/expected/aggrisk-.csv
+++ b/openquake/qa_tests_data/event_based_risk/case_8/expected/aggrisk-.csv
@@ -1,6 +1,4 @@
-#,,"generated_by='OpenQuake engine 3.17.0-git10f73a82f1', start_date='2023-06-08T10:11:04', checksum=1670099579, investigation_time=1.0, risk_investigation_time=1.0"
+#,,"generated_by='OpenQuake engine 3.22.0-git7b9b978a18', start_date='2024-11-05T14:06:19', checksum=485641226, investigation_time=1.0, risk_investigation_time=1.0"
 loss_type,loss_value,loss_ratio
 occupants_avg,1.65029E-04,6.60116E-07
-area,1.31186E+02,1.92601E-03
-number,9.02985E+01,1.09453E-03
 residents,3.41670E-02,1.36668E-04
diff --git a/openquake/qa_tests_data/event_based_risk/case_8/expected/aggrisk-OCCUPANCY.csv b/openquake/qa_tests_data/event_based_risk/case_8/expected/aggrisk-OCCUPANCY.csv
index 232113ca029e..d33b11c93540 100644
--- a/openquake/qa_tests_data/event_based_risk/case_8/expected/aggrisk-OCCUPANCY.csv
+++ b/openquake/qa_tests_data/event_based_risk/case_8/expected/aggrisk-OCCUPANCY.csv
@@ -1,12 +1,6 @@
-#,,,"generated_by='OpenQuake engine 3.18.0-git75e646bbdd', start_date='2023-08-23T11:47:53', checksum=1670099579, investigation_time=1.0, risk_investigation_time=1.0"
+#,,,"generated_by='OpenQuake engine 3.22.0-git7b9b978a18', start_date='2024-11-05T14:06:19', checksum=485641226, investigation_time=1.0, risk_investigation_time=1.0"
 loss_type,OCCUPANCY,loss_value,loss_ratio
 occupants_avg,Com,1.14000E-08,1.14000E-10
-area,Com,1.24163E+01,4.23058E-04
-number,Com,8.98843E+00,4.49422E-04
 occupants_avg,Ind,3.31565E-08,2.21043E-09
-area,Ind,2.08795E+01,9.10975E-04
-number,Ind,1.20236E+01,8.01572E-04
 occupants_avg,Res,1.64984E-04,1.22211E-06
-area,Res,9.78905E+01,6.17840E-03
-number,Res,6.92865E+01,1.45866E-03
 residents,Res,3.41670E-02,1.36668E-04
diff --git a/openquake/qa_tests_data/event_based_risk/case_8/job.ini b/openquake/qa_tests_data/event_based_risk/case_8/job.ini
index 08e00f36c04f..e47e1b2f1846 100644
--- a/openquake/qa_tests_data/event_based_risk/case_8/job.ini
+++ b/openquake/qa_tests_data/event_based_risk/case_8/job.ini
@@ -5,8 +5,8 @@ calculation_mode = event_based_risk
 [inputs]
 gmfs_file = gmf-data.hdf5
 exposure_file = Exposure_Singapore.xml
-area_vulnerability_file = area_vulnerability.xml
-number_vulnerability_file = number_vulnerability.xml  
+#area_vulnerability_file = area_vulnerability.xml
+#number_vulnerability_file = number_vulnerability.xml  
 occupants_vulnerability_file = vulnerability_fatalities.xml
 residents_vulnerability_file = vulnerability_residents.xml
 taxonomy_mapping_csv = taxonomy_map.csv
diff --git a/openquake/qa_tests_data/event_based_risk/case_8/taxonomy_map.csv b/openquake/qa_tests_data/event_based_risk/case_8/taxonomy_map.csv
index 9cc560dfa54c..c86b8ad62aa0 100644
--- a/openquake/qa_tests_data/event_based_risk/case_8/taxonomy_map.csv
+++ b/openquake/qa_tests_data/event_based_risk/case_8/taxonomy_map.csv
@@ -1,45 +1,12 @@
-loss_type,taxonomy,risk_id,weight
-occupants,CR/LFM+DUL/H:7/COM,CR/LFM+CDL+DUL/H7/COM,1.0
-occupants,CR+CIP/LFINF+DUL/H:5/RES,CR/LFINF+CDL+DUL/H5/RES,1.0
-occupants,CR+PC/LWAL+DUL/H:4-6/COM,CR/LWAL+CDL+DUL/H5/COM,1.0
-occupants,UNK/H:1-3/RES,CR/LFINF+CDL+DUL/H2/RES,0.2
-occupants,UNK/H:1-3/RES,MCF/LWAL+DUL/H2/RES,0.3
-occupants,UNK/H:1-3/RES,CR/LFM+CDL+DUL/H2/RES,0.3
-occupants,UNK/H:1-3/RES,MUR/LWAL+CDN/H2/RES,0.2
-occupants,UNK/IND,CR/LWAL+CDL+DUL/H5/IND,0.25
-occupants,UNK/IND,CR/LWAL+CDL+DUL/H8/IND,0.05
-occupants,UNK/IND,S/LFM+CDL+DUL/H1/IND,0.20
-occupants,UNK/IND,CR/LFM+CDL+DUL/H2/IND,0.50
-residents,CR/LFM+DUL/H:7/COM,CR/LFM+CDL+DUL/H7/COM,1.0
-residents,CR+CIP/LFINF+DUL/H:5/RES,CR/LFINF+CDL+DUL/H5/RES,1.0
-residents,CR+PC/LWAL+DUL/H:4-6/COM,CR/LWAL+CDL+DUL/H5/COM,1.0
-residents,UNK/H:1-3/RES,CR/LFINF+CDL+DUL/H2/RES,0.2
-residents,UNK/H:1-3/RES,MCF/LWAL+DUL/H2/RES,0.3
-residents,UNK/H:1-3/RES,CR/LFM+CDL+DUL/H2/RES,0.3
-residents,UNK/H:1-3/RES,MUR/LWAL+CDN/H2/RES,0.2
-residents,UNK/IND,CR/LWAL+CDL+DUL/H5/IND,0.25
-residents,UNK/IND,CR/LWAL+CDL+DUL/H8/IND,0.05
-residents,UNK/IND,S/LFM+CDL+DUL/H1/IND,0.20
-residents,UNK/IND,CR/LFM+CDL+DUL/H2/IND,0.50
-area,CR/LFM+DUL/H:7/COM,CR/LFM+DUL/H7/COM,1.0
-area,CR+CIP/LFINF+DUL/H:5/RES,CR/LFINF+DUL/H5/RES,1.0
-area,CR+PC/LWAL+DUL/H:4-6/COM,CR/LWAL+DUL/H5/COM,1.0
-area,UNK/H:1-3/RES,CR/LFINF+DUL/H2/RES,0.2
-area,UNK/H:1-3/RES,MCF/LWAL+DUL/H2/RES,0.3
-area,UNK/H:1-3/RES,CR/LFM+DUL/H2/RES,0.3
-area,UNK/H:1-3/RES,MUR/LWAL+DNO/H2/RES,0.2
-area,UNK/IND,CR/LWAL+DUL/H5/IND,0.25
-area,UNK/IND,CR/LWAL+DUL/H8/IND,0.05
-area,UNK/IND,S/LFM+DUL/H1/IND,0.20
-area,UNK/IND,CR/LFM+DUL/H2/IND,0.50
-number,CR/LFM+DUL/H:7/COM,CR/LFM+DUL/H7/COM,1.0
-number,CR+CIP/LFINF+DUL/H:5/RES,CR/LFINF+DUL/H5/RES,1.0
-number,CR+PC/LWAL+DUL/H:4-6/COM,CR/LWAL+DUL/H5/COM,1.0
-number,UNK/H:1-3/RES,CR/LFINF+DUL/H2/RES,0.2
-number,UNK/H:1-3/RES,MCF/LWAL+DUL/H2/RES,0.3
-number,UNK/H:1-3/RES,CR/LFM+DUL/H2/RES,0.3
-number,UNK/H:1-3/RES,MUR/LWAL+DNO/H2/RES,0.2
-number,UNK/IND,CR/LWAL+DUL/H5/IND,0.25
-number,UNK/IND,CR/LWAL+DUL/H8/IND,0.05
-number,UNK/IND,S/LFM+DUL/H1/IND,0.20
-number,UNK/IND,CR/LFM+DUL/H2/IND,0.50
+taxonomy,risk_id,weight
+CR/LFM+DUL/H:7/COM,CR/LFM+CDL+DUL/H7/COM,1.0
+CR+CIP/LFINF+DUL/H:5/RES,CR/LFINF+CDL+DUL/H5/RES,1.0
+CR+PC/LWAL+DUL/H:4-6/COM,CR/LWAL+CDL+DUL/H5/COM,1.0
+UNK/H:1-3/RES,CR/LFINF+CDL+DUL/H2/RES,0.2
+UNK/H:1-3/RES,MCF/LWAL+DUL/H2/RES,0.3
+UNK/H:1-3/RES,CR/LFM+CDL+DUL/H2/RES,0.3
+UNK/H:1-3/RES,MUR/LWAL+CDN/H2/RES,0.2
+UNK/IND,CR/LWAL+CDL+DUL/H5/IND,0.25
+UNK/IND,CR/LWAL+CDL+DUL/H8/IND,0.05
+UNK/IND,S/LFM+CDL+DUL/H1/IND,0.20
+UNK/IND,CR/LFM+CDL+DUL/H2/IND,0.50
diff --git a/openquake/qa_tests_data/infrastructure_risk/case_15/nonfunctional.csv b/openquake/qa_tests_data/infrastructure_risk/case_15/nonfunctional.csv
index 9f664301f986..0e65fedc9896 100644
--- a/openquake/qa_tests_data/infrastructure_risk/case_15/nonfunctional.csv
+++ b/openquake/qa_tests_data/infrastructure_risk/case_15/nonfunctional.csv
@@ -1,12 +1,12 @@
-taxonomy,consequence,loss_type,slight,moderate,extensive,complete
-demand,non_operational,structural,0,1,1,1
-pumping_station1,non_operational,structural,0,1,1,1
-pumping_station2,non_operational,structural,0,1,1,1
-well,non_operational,structural,0,1,1,1
-auxillary_node,non_operational,structural,0,1,1,1
-CI_regdia_300,non_operational,structural,0,1,1,1
-CI_regdia_500,non_operational,structural,0,1,1,1
-CI_regdia_100,non_operational,structural,0,1,1,1
-CI_regdia_200,non_operational,structural,0,1,1,1
-CI_regdia_150,non_operational,structural,0,1,1,1
-CI_regdia_250,non_operational,structural,0,1,1,1
+taxonomy,consequence,peril,slight,moderate,extensive,complete
+demand,non_operational,earthquake,0,1,1,1
+pumping_station1,non_operational,earthquake,0,1,1,1
+pumping_station2,non_operational,earthquake,0,1,1,1
+well,non_operational,earthquake,0,1,1,1
+auxillary_node,non_operational,earthquake,0,1,1,1
+CI_regdia_300,non_operational,earthquake,0,1,1,1
+CI_regdia_500,non_operational,earthquake,0,1,1,1
+CI_regdia_100,non_operational,earthquake,0,1,1,1
+CI_regdia_200,non_operational,earthquake,0,1,1,1
+CI_regdia_150,non_operational,earthquake,0,1,1,1
+CI_regdia_250,non_operational,earthquake,0,1,1,1
diff --git a/openquake/qa_tests_data/infrastructure_risk/demand_supply/nonfunctional.csv b/openquake/qa_tests_data/infrastructure_risk/demand_supply/nonfunctional.csv
index fbed923fbb1a..bd3ef86a9405 100644
--- a/openquake/qa_tests_data/infrastructure_risk/demand_supply/nonfunctional.csv
+++ b/openquake/qa_tests_data/infrastructure_risk/demand_supply/nonfunctional.csv
@@ -1,7 +1,7 @@
-taxonomy,consequence,loss_type,slight,moderate,extensive,complete
-tank,non_operational,structural,0,1,1,1
-tank1,non_operational,structural,0,1,1,1
-pipe,non_operational,structural,0,1,1,1
-pipe1,non_operational,structural,0,1,1,1
-demand,non_operational,structural,0,1,1,1
-connection,non_operational,structural,0,1,1,1
+taxonomy,consequence,peril,slight,moderate,extensive,complete
+tank,non_operational,earthquake,0,1,1,1
+tank1,non_operational,earthquake,0,1,1,1
+pipe,non_operational,earthquake,0,1,1,1
+pipe1,non_operational,earthquake,0,1,1,1
+demand,non_operational,earthquake,0,1,1,1
+connection,non_operational,earthquake,0,1,1,1
diff --git a/openquake/qa_tests_data/infrastructure_risk/directed/nonfunctional.csv b/openquake/qa_tests_data/infrastructure_risk/directed/nonfunctional.csv
index 38b7442c9e8b..5da508869637 100644
--- a/openquake/qa_tests_data/infrastructure_risk/directed/nonfunctional.csv
+++ b/openquake/qa_tests_data/infrastructure_risk/directed/nonfunctional.csv
@@ -1,5 +1,5 @@
-taxonomy,consequence,loss_type,minor,major
-bridge,non_operational,structural,0,1
-road,non_operational,structural,0,1
-connection,non_operational,structural,0,1
-TAZ,non_operational,structural,0,1
+taxonomy,consequence,peril,minor,major
+bridge,non_operational,earthquake,0,1
+road,non_operational,earthquake,0,1
+connection,non_operational,earthquake,0,1
+TAZ,non_operational,earthquake,0,1
diff --git a/openquake/qa_tests_data/infrastructure_risk/eff_loss_random/nonfunctional.csv b/openquake/qa_tests_data/infrastructure_risk/eff_loss_random/nonfunctional.csv
index c9196c246c6f..cf294c6ecd0e 100644
--- a/openquake/qa_tests_data/infrastructure_risk/eff_loss_random/nonfunctional.csv
+++ b/openquake/qa_tests_data/infrastructure_risk/eff_loss_random/nonfunctional.csv
@@ -1,4 +1,4 @@
-taxonomy,consequence,loss_type,slight,moderate,extensive,complete
-link,non_operational,structural,0,1,1,1
-link1,non_operational,structural,0,1,1,1
-connection,non_operational,structural,0,1,1,1
+taxonomy,consequence,peril,slight,moderate,extensive,complete
+link,non_operational,earthquake,0,1,1,1
+link1,non_operational,earthquake,0,1,1,1
+connection,non_operational,earthquake,0,1,1,1
diff --git a/openquake/qa_tests_data/infrastructure_risk/five_nodes_demsup_directed/nonfunctional.csv b/openquake/qa_tests_data/infrastructure_risk/five_nodes_demsup_directed/nonfunctional.csv
index 66a43f3b50a7..f573561e1122 100644
--- a/openquake/qa_tests_data/infrastructure_risk/five_nodes_demsup_directed/nonfunctional.csv
+++ b/openquake/qa_tests_data/infrastructure_risk/five_nodes_demsup_directed/nonfunctional.csv
@@ -1,5 +1,5 @@
-taxonomy,consequence,loss_type,minor,major
-bridge,non_operational,structural,0,1
-road,non_operational,structural,0,1
-connection,non_operational,structural,0,1
-POI,non_operational,structural,0,1
+taxonomy,consequence,peril,minor,major
+bridge,non_operational,earthquake,0,1
+road,non_operational,earthquake,0,1
+connection,non_operational,earthquake,0,1
+POI,non_operational,earthquake,0,1
diff --git a/openquake/qa_tests_data/infrastructure_risk/five_nodes_demsup_directedunweighted/nonfunctional.csv b/openquake/qa_tests_data/infrastructure_risk/five_nodes_demsup_directedunweighted/nonfunctional.csv
index 66a43f3b50a7..f573561e1122 100644
--- a/openquake/qa_tests_data/infrastructure_risk/five_nodes_demsup_directedunweighted/nonfunctional.csv
+++ b/openquake/qa_tests_data/infrastructure_risk/five_nodes_demsup_directedunweighted/nonfunctional.csv
@@ -1,5 +1,5 @@
-taxonomy,consequence,loss_type,minor,major
-bridge,non_operational,structural,0,1
-road,non_operational,structural,0,1
-connection,non_operational,structural,0,1
-POI,non_operational,structural,0,1
+taxonomy,consequence,peril,minor,major
+bridge,non_operational,earthquake,0,1
+road,non_operational,earthquake,0,1
+connection,non_operational,earthquake,0,1
+POI,non_operational,earthquake,0,1
diff --git a/openquake/qa_tests_data/infrastructure_risk/five_nodes_demsup_multidirected/nonfunctional.csv b/openquake/qa_tests_data/infrastructure_risk/five_nodes_demsup_multidirected/nonfunctional.csv
index 66a43f3b50a7..f573561e1122 100644
--- a/openquake/qa_tests_data/infrastructure_risk/five_nodes_demsup_multidirected/nonfunctional.csv
+++ b/openquake/qa_tests_data/infrastructure_risk/five_nodes_demsup_multidirected/nonfunctional.csv
@@ -1,5 +1,5 @@
-taxonomy,consequence,loss_type,minor,major
-bridge,non_operational,structural,0,1
-road,non_operational,structural,0,1
-connection,non_operational,structural,0,1
-POI,non_operational,structural,0,1
+taxonomy,consequence,peril,minor,major
+bridge,non_operational,earthquake,0,1
+road,non_operational,earthquake,0,1
+connection,non_operational,earthquake,0,1
+POI,non_operational,earthquake,0,1
diff --git a/openquake/qa_tests_data/infrastructure_risk/multidirected/nonfunctional.csv b/openquake/qa_tests_data/infrastructure_risk/multidirected/nonfunctional.csv
index 38b7442c9e8b..5da508869637 100644
--- a/openquake/qa_tests_data/infrastructure_risk/multidirected/nonfunctional.csv
+++ b/openquake/qa_tests_data/infrastructure_risk/multidirected/nonfunctional.csv
@@ -1,5 +1,5 @@
-taxonomy,consequence,loss_type,minor,major
-bridge,non_operational,structural,0,1
-road,non_operational,structural,0,1
-connection,non_operational,structural,0,1
-TAZ,non_operational,structural,0,1
+taxonomy,consequence,peril,minor,major
+bridge,non_operational,earthquake,0,1
+road,non_operational,earthquake,0,1
+connection,non_operational,earthquake,0,1
+TAZ,non_operational,earthquake,0,1
diff --git a/openquake/qa_tests_data/infrastructure_risk/multigraph/nonfunctional.csv b/openquake/qa_tests_data/infrastructure_risk/multigraph/nonfunctional.csv
index 38b7442c9e8b..5da508869637 100644
--- a/openquake/qa_tests_data/infrastructure_risk/multigraph/nonfunctional.csv
+++ b/openquake/qa_tests_data/infrastructure_risk/multigraph/nonfunctional.csv
@@ -1,5 +1,5 @@
-taxonomy,consequence,loss_type,minor,major
-bridge,non_operational,structural,0,1
-road,non_operational,structural,0,1
-connection,non_operational,structural,0,1
-TAZ,non_operational,structural,0,1
+taxonomy,consequence,peril,minor,major
+bridge,non_operational,earthquake,0,1
+road,non_operational,earthquake,0,1
+connection,non_operational,earthquake,0,1
+TAZ,non_operational,earthquake,0,1
diff --git a/openquake/qa_tests_data/infrastructure_risk/undirected/nonfunctional.csv b/openquake/qa_tests_data/infrastructure_risk/undirected/nonfunctional.csv
index 38b7442c9e8b..5da508869637 100644
--- a/openquake/qa_tests_data/infrastructure_risk/undirected/nonfunctional.csv
+++ b/openquake/qa_tests_data/infrastructure_risk/undirected/nonfunctional.csv
@@ -1,5 +1,5 @@
-taxonomy,consequence,loss_type,minor,major
-bridge,non_operational,structural,0,1
-road,non_operational,structural,0,1
-connection,non_operational,structural,0,1
-TAZ,non_operational,structural,0,1
+taxonomy,consequence,peril,minor,major
+bridge,non_operational,earthquake,0,1
+road,non_operational,earthquake,0,1
+connection,non_operational,earthquake,0,1
+TAZ,non_operational,earthquake,0,1
diff --git a/openquake/qa_tests_data/multi_risk/case_1/consequence_model.csv b/openquake/qa_tests_data/multi_risk/case_1/consequence_model.csv
index ae7f57f8e3a9..d41ee2b290d1 100644
--- a/openquake/qa_tests_data/multi_risk/case_1/consequence_model.csv
+++ b/openquake/qa_tests_data/multi_risk/case_1/consequence_model.csv
@@ -1,5 +1,5 @@
-taxonomy,consequence,loss_type,collapse
-Heavy_roof,losses,structural,4.000000E-01
-Moderate_roof,losses,structural,2.000000E-01
-Slab_roof,losses,structural,4.000000E-01
-Weak_roof,losses,structural,1.500000E-01
+taxonomy,consequence,peril,collapse
+Heavy_roof,losses,earthquake,4.000000E-01
+Moderate_roof,losses,earthquake,2.000000E-01
+Slab_roof,losses,earthquake,4.000000E-01
+Weak_roof,losses,earthquake,1.500000E-01
diff --git a/openquake/qa_tests_data/multi_risk/case_1/consequence_model_2.csv b/openquake/qa_tests_data/multi_risk/case_1/consequence_model_2.csv
index c82ed0af173a..7e75e567851c 100644
--- a/openquake/qa_tests_data/multi_risk/case_1/consequence_model_2.csv
+++ b/openquake/qa_tests_data/multi_risk/case_1/consequence_model_2.csv
@@ -1,5 +1,5 @@
-taxonomy,consequence,loss_type,moderate,collapse
-Heavy_roof,losses,structural,1.500000E-01,4.000000E-01
-Moderate_roof,losses,structural,7.500000E-02,2.000000E-01
-Slab_roof,losses,structural,1.500000E-01,4.000000E-01
-Weak_roof,losses,structural,5.000000E-02,1.500000E-01
+taxonomy,consequence,peril,moderate,collapse
+Heavy_roof,losses,earthquake,1.500000E-01,4.000000E-01
+Moderate_roof,losses,earthquake,7.500000E-02,2.000000E-01
+Slab_roof,losses,earthquake,1.500000E-01,4.000000E-01
+Weak_roof,losses,earthquake,5.000000E-02,1.500000E-01
diff --git a/openquake/qa_tests_data/scenario_damage/case_13/consequence_recovery_time.csv b/openquake/qa_tests_data/scenario_damage/case_13/consequence_recovery_time.csv
index e22713097f93..18eb945a0480 100644
--- a/openquake/qa_tests_data/scenario_damage/case_13/consequence_recovery_time.csv
+++ b/openquake/qa_tests_data/scenario_damage/case_13/consequence_recovery_time.csv
@@ -1,3 +1,3 @@
-taxonomy,consequence,loss_type,slight,moderate,extensive,complete
-UNM/C_LR/GOV2,losses,structural,35,90,197,287
+taxonomy,consequence,peril,slight,moderate,extensive,complete
+UNM/C_LR/GOV2,losses,earthquake,35,90,197,287
 
diff --git a/openquake/qa_tests_data/scenario_damage/case_14/consequence_model.csv b/openquake/qa_tests_data/scenario_damage/case_14/consequence_model.csv
index 8d4396eff7c7..8a4d8bad9795 100644
--- a/openquake/qa_tests_data/scenario_damage/case_14/consequence_model.csv
+++ b/openquake/qa_tests_data/scenario_damage/case_14/consequence_model.csv
@@ -1,10 +1,10 @@
-taxonomy,consequence,loss_type,slight,moderate,extensive,complete
-CR+PC/LDUAL/HBET:4.7/l,losses,structural,1.000000E-01,3.000000E-01,6.000000E-01,1.000000E+00
-CR+PC/LDUAL/HBET:4.7/m,losses,structural,1.000000E-01,3.000000E-01,6.000000E-01,1.000000E+00
-CR+PC/LDUAL/HBET:4.7/p,losses,structural,1.000000E-01,3.000000E-01,6.000000E-01,1.000000E+00
-CR+PC/LDUAL/HBET:8.19/h,losses,structural,1.000000E-01,3.000000E-01,6.000000E-01,1.000000E+00
-CR+PC/LDUAL/HBET:8.19/m,losses,structural,1.000000E-01,3.000000E-01,6.000000E-01,1.000000E+00
-CR/LFM/HBET:1.3/m,losses,structural,1.000000E-01,3.000000E-01,6.000000E-01,1.000000E+00
-CR/LFM/HBET:4.7/m,losses,structural,1.000000E-01,3.000000E-01,6.000000E-01,1.000000E+00
-S/LFM/HBET:1.3/l,losses,structural,1.000000E-01,3.000000E-01,6.000000E-01,1.000000E+00
-S/LFM/HBET:8.19/h,losses,structural,1.000000E-01,3.000000E-01,6.000000E-01,1.000000E+00
+taxonomy,consequence,peril,slight,moderate,extensive,complete
+CR+PC/LDUAL/HBET:4.7/l,losses,earthquake,1.000000E-01,3.000000E-01,6.000000E-01,1.000000E+00
+CR+PC/LDUAL/HBET:4.7/m,losses,earthquake,1.000000E-01,3.000000E-01,6.000000E-01,1.000000E+00
+CR+PC/LDUAL/HBET:4.7/p,losses,earthquake,1.000000E-01,3.000000E-01,6.000000E-01,1.000000E+00
+CR+PC/LDUAL/HBET:8.19/h,losses,earthquake,1.000000E-01,3.000000E-01,6.000000E-01,1.000000E+00
+CR+PC/LDUAL/HBET:8.19/m,losses,earthquake,1.000000E-01,3.000000E-01,6.000000E-01,1.000000E+00
+CR/LFM/HBET:1.3/m,losses,earthquake,1.000000E-01,3.000000E-01,6.000000E-01,1.000000E+00
+CR/LFM/HBET:4.7/m,losses,earthquake,1.000000E-01,3.000000E-01,6.000000E-01,1.000000E+00
+S/LFM/HBET:1.3/l,losses,earthquake,1.000000E-01,3.000000E-01,6.000000E-01,1.000000E+00
+S/LFM/HBET:8.19/h,losses,earthquake,1.000000E-01,3.000000E-01,6.000000E-01,1.000000E+00
diff --git a/openquake/qa_tests_data/scenario_damage/case_16/consequence_recovery_time.csv b/openquake/qa_tests_data/scenario_damage/case_16/consequence_recovery_time.csv
index 0dcd2877312a..dbab10f22a61 100644
--- a/openquake/qa_tests_data/scenario_damage/case_16/consequence_recovery_time.csv
+++ b/openquake/qa_tests_data/scenario_damage/case_16/consequence_recovery_time.csv
@@ -1,3 +1,3 @@
-taxonomy,consequence,loss_type,slight,moderate,extensive,complete
-UNM/C_LR/GOV,losses,structural,35,90,197,287
+taxonomy,consequence,peril,slight,moderate,extensive,complete
+UNM/C_LR/GOV,losses,earthquake,35,90,197,287
 
diff --git a/openquake/qa_tests_data/scenario_damage/case_17/consequence_displaced.csv b/openquake/qa_tests_data/scenario_damage/case_17/consequence_displaced.csv
index 83309a69a6a7..630dec0f4a0f 100644
--- a/openquake/qa_tests_data/scenario_damage/case_17/consequence_displaced.csv
+++ b/openquake/qa_tests_data/scenario_damage/case_17/consequence_displaced.csv
@@ -1,4 +1,4 @@
-taxonomy,consequence,loss_type,uninhabitable,collapsed
-ND,homeless,structural,1,0
-UH,homeless,structural,1,0
-CP,homeless,structural,1,0
+taxonomy,consequence,peril,uninhabitable,collapsed
+ND,homeless,earthquake,1,0
+UH,homeless,earthquake,1,0
+CP,homeless,earthquake,1,0
diff --git a/openquake/qa_tests_data/scenario_damage/case_17/consequence_fatalities.csv b/openquake/qa_tests_data/scenario_damage/case_17/consequence_fatalities.csv
index 6879fd91d67f..12d9f7df69bd 100644
--- a/openquake/qa_tests_data/scenario_damage/case_17/consequence_fatalities.csv
+++ b/openquake/qa_tests_data/scenario_damage/case_17/consequence_fatalities.csv
@@ -1,4 +1,4 @@
-taxonomy,consequence,loss_type,uninhabitable,collapsed
-ND,fatalities,structural,0,1
-UH,fatalities,structural,0,1
-CP,fatalities,structural,0,1
+taxonomy,consequence,peril,uninhabitable,collapsed
+ND,fatalities,earthquake,0,1
+UH,fatalities,earthquake,0,1
+CP,fatalities,earthquake,0,1
diff --git a/openquake/qa_tests_data/scenario_damage/case_18/consequence_displaced.csv b/openquake/qa_tests_data/scenario_damage/case_18/consequence_displaced.csv
index 83309a69a6a7..630dec0f4a0f 100644
--- a/openquake/qa_tests_data/scenario_damage/case_18/consequence_displaced.csv
+++ b/openquake/qa_tests_data/scenario_damage/case_18/consequence_displaced.csv
@@ -1,4 +1,4 @@
-taxonomy,consequence,loss_type,uninhabitable,collapsed
-ND,homeless,structural,1,0
-UH,homeless,structural,1,0
-CP,homeless,structural,1,0
+taxonomy,consequence,peril,uninhabitable,collapsed
+ND,homeless,earthquake,1,0
+UH,homeless,earthquake,1,0
+CP,homeless,earthquake,1,0
diff --git a/openquake/qa_tests_data/scenario_damage/case_18/consequence_fatalities.csv b/openquake/qa_tests_data/scenario_damage/case_18/consequence_fatalities.csv
index 6879fd91d67f..12d9f7df69bd 100644
--- a/openquake/qa_tests_data/scenario_damage/case_18/consequence_fatalities.csv
+++ b/openquake/qa_tests_data/scenario_damage/case_18/consequence_fatalities.csv
@@ -1,4 +1,4 @@
-taxonomy,consequence,loss_type,uninhabitable,collapsed
-ND,fatalities,structural,0,1
-UH,fatalities,structural,0,1
-CP,fatalities,structural,0,1
+taxonomy,consequence,peril,uninhabitable,collapsed
+ND,fatalities,earthquake,0,1
+UH,fatalities,earthquake,0,1
+CP,fatalities,earthquake,0,1
diff --git a/openquake/qa_tests_data/scenario_damage/case_21/consequence_multiple_loss_types.csv b/openquake/qa_tests_data/scenario_damage/case_21/consequence_multiple_loss_types.csv
index 86ce85d77276..0adf2027e449 100644
--- a/openquake/qa_tests_data/scenario_damage/case_21/consequence_multiple_loss_types.csv
+++ b/openquake/qa_tests_data/scenario_damage/case_21/consequence_multiple_loss_types.csv
@@ -1,6 +1,6 @@
-taxonomy,consequence,loss_type,slight,moderate,extensive,complete
-bridge1,non_operational,structural,0,0,1,1
-connection,non_operational,structural,0,0,1,1
+taxonomy,consequence,peril,slight,moderate,extensive,complete
+bridge1,non_operational,earthquake,0,0,1,1
+connection,non_operational,earthquake,0,0,1,1
 bridge1,non_operational,liquefaction,0,0,0,1
 connection,non_operational,liquefaction,0,0,0,1
 bridge1,non_operational,landslide,0,0,0,1
diff --git a/openquake/qa_tests_data/scenario_damage/case_21/expected/aggrisk-parent.csv b/openquake/qa_tests_data/scenario_damage/case_21/expected/aggrisk-parent.csv
index 1751dfaaad8d..17802897daee 100644
--- a/openquake/qa_tests_data/scenario_damage/case_21/expected/aggrisk-parent.csv
+++ b/openquake/qa_tests_data/scenario_damage/case_21/expected/aggrisk-parent.csv
@@ -1,8 +1,8 @@
-#,,,,,,,,,"generated_by='OpenQuake engine 3.22.0-git5d9564908c', start_date='2024-10-29T05:10:19', checksum=2614000066, investigation_time=None, risk_investigation_time=None"
+#,,,,,,,,,"generated_by='OpenQuake engine 3.22.0-git30e245f39e', start_date='2024-11-05T09:13:45', checksum=525960216, investigation_time=None, risk_investigation_time=None"
 loss_type,parent_id,rlz_id,no_damage,slight,moderate,extensive,complete,non_operational_value,non_operational_ratio
-structural,A,0,9.66667E-01,0.00000E+00,0.00000E+00,0.00000E+00,1.00000E-01,1.00000E-01,1.00000E-01
-structural,A,1,9.33333E-01,0.00000E+00,0.00000E+00,0.00000E+00,2.00000E-01,2.00000E-01,2.00000E-01
-structural,B,0,1.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00
-structural,B,1,1.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00
-structural,E1,0,6.66667E-01,0.00000E+00,0.00000E+00,0.00000E+00,1.00000E+00,3.00000E+00,3.00000E+00
-structural,E1,1,6.66667E-01,0.00000E+00,0.00000E+00,0.00000E+00,1.00000E+00,3.00000E+00,3.00000E+00
+structural,A,0,1.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00
+structural,A,1,1.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00
+structural,B,0,9.00000E-01,0.00000E+00,0.00000E+00,0.00000E+00,1.00000E-01,3.00000E-01,3.00000E-01
+structural,B,1,8.00000E-01,0.00000E+00,0.00000E+00,0.00000E+00,2.00000E-01,4.00000E-01,4.00000E-01
+structural,E1,0,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,1.00000E+00,3.00000E+00,3.00000E+00
+structural,E1,1,0.00000E+00,0.00000E+00,0.00000E+00,0.00000E+00,1.00000E+00,3.00000E+00,3.00000E+00
diff --git a/openquake/qa_tests_data/scenario_damage/case_21/expected/aggrisk.csv b/openquake/qa_tests_data/scenario_damage/case_21/expected/aggrisk.csv
index 4cba24e6e8ac..18d84a702421 100644
--- a/openquake/qa_tests_data/scenario_damage/case_21/expected/aggrisk.csv
+++ b/openquake/qa_tests_data/scenario_damage/case_21/expected/aggrisk.csv
@@ -1,4 +1,4 @@
-#,,,,,,,,"generated_by='OpenQuake engine 3.22.0-git5d9564908c', start_date='2024-10-29T05:10:19', checksum=2614000066, investigation_time=None, risk_investigation_time=None"
+#,,,,,,,,"generated_by='OpenQuake engine 3.22.0-git30e245f39e', start_date='2024-11-05T09:13:45', checksum=525960216, investigation_time=None, risk_investigation_time=None"
 loss_type,rlz_id,no_damage,slight,moderate,extensive,complete,non_operational_value,non_operational_ratio
-structural,0,2.63333E+00,0.00000E+00,0.00000E+00,0.00000E+00,1.10000E+00,3.10000E+00,1.03333E+00
-structural,1,2.60000E+00,0.00000E+00,0.00000E+00,0.00000E+00,1.20000E+00,3.20000E+00,1.06667E+00
+structural,0,1.90000E+00,0.00000E+00,0.00000E+00,0.00000E+00,1.10000E+00,3.30000E+00,1.10000E+00
+structural,1,1.80000E+00,0.00000E+00,0.00000E+00,0.00000E+00,1.20000E+00,3.40000E+00,1.13333E+00
diff --git a/openquake/qa_tests_data/scenario_damage/case_21/fragility_model_landslide.xml b/openquake/qa_tests_data/scenario_damage/case_21/fragility_model_landslide.xml
index 65a5b9305da0..e2a0be20cb72 100644
--- a/openquake/qa_tests_data/scenario_damage/case_21/fragility_model_landslide.xml
+++ b/openquake/qa_tests_data/scenario_damage/case_21/fragility_model_landslide.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <nrml xmlns="http://openquake.org/xmlns/nrml/0.5">
-	<fragilityModel id="1" assetCategory="RDN" lossCategory="landslide">
+	<fragilityModel id="1" assetCategory="RDN" lossCategory="structural">
 		<description>Road Network</description>
 		<limitStates>slight moderate extensive complete</limitStates>
 		<fragilityFunction id="connection" format="discrete">
diff --git a/openquake/qa_tests_data/scenario_damage/case_21/fragility_model_liquefaction.xml b/openquake/qa_tests_data/scenario_damage/case_21/fragility_model_liquefaction.xml
index 1ef334754fc5..35021cafa7f2 100644
--- a/openquake/qa_tests_data/scenario_damage/case_21/fragility_model_liquefaction.xml
+++ b/openquake/qa_tests_data/scenario_damage/case_21/fragility_model_liquefaction.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <nrml xmlns="http://openquake.org/xmlns/nrml/0.5">
-	<fragilityModel id="1" assetCategory="RDN" lossCategory="liquefaction">
+	<fragilityModel id="1" assetCategory="RDN" lossCategory="structural">
 		<description>Road Network</description>
 		<limitStates>slight moderate extensive complete</limitStates>
 		<fragilityFunction id="connection" format="discrete">
diff --git a/openquake/qa_tests_data/scenario_damage/case_21/job.ini b/openquake/qa_tests_data/scenario_damage/case_21/job.ini
index 764c6b2ed2b1..042069d09230 100644
--- a/openquake/qa_tests_data/scenario_damage/case_21/job.ini
+++ b/openquake/qa_tests_data/scenario_damage/case_21/job.ini
@@ -26,8 +26,8 @@ exposure_file = exposure.xml
 
 [fragility]
 structural_fragility_file = fragility_model_structural.xml
-liquefaction_fragility_file = fragility_model_liquefaction.xml
-landslide_fragility_file = fragility_model_landslide.xml
+liquefaction_fragility_file = {'structural': "fragility_model_liquefaction.xml"}
+landslide_fragility_file = {'structural': "fragility_model_landslide.xml"}
 
 [consequence]
 total_losses = structural
diff --git a/openquake/qa_tests_data/scenario_damage/case_22/consequences.csv b/openquake/qa_tests_data/scenario_damage/case_22/consequences.csv
index c4a55750cfe9..05a189a937a4 100644
--- a/openquake/qa_tests_data/scenario_damage/case_22/consequences.csv
+++ b/openquake/qa_tests_data/scenario_damage/case_22/consequences.csv
@@ -1,6 +1,6 @@
-taxonomy,consequence,loss_type,slight,moderate,extreme,complete
-Concrete,losses,structural,0.04,0.31,0.6,1
-Wood,losses,structural,0.04,0.31,0.6,1
+taxonomy,consequence,peril,slight,moderate,extreme,complete
+Concrete,losses,earthquake,0.04,0.31,0.6,1
+Wood,losses,earthquake,0.04,0.31,0.6,1
 Concrete,losses,liquefaction,0,0,0,1
 Wood,losses,liquefaction,0,0,0,1
 Concrete,losses,landslide,0,0,0,1
diff --git a/openquake/qa_tests_data/scenario_damage/case_22/expected/aggrisk.csv b/openquake/qa_tests_data/scenario_damage/case_22/expected/aggrisk.csv
index 1aa06a766529..9f89e08bc86a 100644
--- a/openquake/qa_tests_data/scenario_damage/case_22/expected/aggrisk.csv
+++ b/openquake/qa_tests_data/scenario_damage/case_22/expected/aggrisk.csv
@@ -1,3 +1,3 @@
-#,,,,,,,"generated_by='OpenQuake engine 3.22.0-git5d9564908c', start_date='2024-10-29T05:10:20', checksum=4025559538, investigation_time=None, risk_investigation_time=None"
+#,,,,,,,"generated_by='OpenQuake engine 3.22.0-git795c396951', start_date='2024-11-05T10:07:11', checksum=1872246383, investigation_time=None, risk_investigation_time=None"
 loss_type,no_damage,slight,moderate,extreme,complete,losses_value,losses_ratio
-structural,1.23759E+01,8.90538E-01,6.46055E-01,2.16562E-01,6.11920E+00,1.84217E+04,1.08299E-01
+structural,9.10790E+00,1.04866E+00,8.59773E-01,4.06873E-01,3.57679E+00,1.84217E+04,1.08299E-01
diff --git a/openquake/qa_tests_data/scenario_damage/case_22/expected/dmg.csv b/openquake/qa_tests_data/scenario_damage/case_22/expected/dmg.csv
index 2f29682c3904..547adf42671f 100644
--- a/openquake/qa_tests_data/scenario_damage/case_22/expected/dmg.csv
+++ b/openquake/qa_tests_data/scenario_damage/case_22/expected/dmg.csv
@@ -1,4 +1,4 @@
-#,,,,,,,,,,"generated_by='OpenQuake engine 3.22.0-git5d9564908c', start_date='2024-10-29T05:10:20', checksum=4025559538"
+#,,,,,,,,,,"generated_by='OpenQuake engine 3.22.0-git795c396951', start_date='2024-11-05T10:07:11', checksum=1872246383"
 asset_id,NAME_1,taxonomy,lon,lat,no_damage,slight,moderate,extreme,complete,losses
 a1,a,Wood1,83.31382,29.46117,7.801411E-01,1.301565E-01,7.167403E-02,1.495041E-02,3.078026E-03,4.476292E+02
 a2,a,Wood1,83.31382,29.23617,7.971102E-01,1.201108E-01,6.614210E-02,1.379650E-02,2.840465E-03,4.130804E+02
@@ -6,12 +6,12 @@ a3,a,Wood1,83.53882,29.08617,6.995793E-01,1.664932E-01,1.008736E-01,2.538038E-02
 a4,a,Wood1,80.68882,28.93617,1.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00
 a5,a,Wood1,83.53882,29.01117,5.816740E-01,2.215957E-01,1.431113E-01,3.980681E-02,1.381211E-02,1.031084E+03
 a6,a,Wood1,81.13882,28.78617,1.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00
-a7,a,Wood1,83.98882,28.48617,2.691395E-01,2.521818E-01,2.642543E-01,1.226281E-01,9.179634E-02,2.763948E+03
-a8,a,Concrete1,83.23882,29.38617,0.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00,1.000000E+00,1.620410E+03
-a9,a,Concrete1,83.01382,29.08617,0.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00,1.000000E+00,1.518432E+03
-a10,a,Concrete1,83.31382,28.71117,0.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00,1.000000E+00,3.197053E+03
-a11,a,Concrete1,86.91382,27.73617,0.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00,1.000000E+00,8.564750E+02
-a12,a,Concrete1,83.16382,29.31117,0.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00,1.000000E+00,1.279804E+03
+a7,a,Wood1,83.98882,28.48617,2.732201E-01,2.542852E-01,2.626550E-01,1.192409E-01,9.059871E-02,2.763948E+03
+a8,a,Concrete1,83.23882,29.38617,4.304808E-01,2.356633E-02,3.248136E-02,2.912861E-02,4.843429E-01,1.620410E+03
+a9,a,Concrete1,83.01382,29.08617,3.883127E-01,3.027743E-02,4.171199E-02,3.736362E-02,5.023342E-01,1.518432E+03
+a10,a,Concrete1,83.31382,28.71117,1.177844E-01,2.779621E-02,3.839571E-02,3.461971E-02,7.814040E-01,3.197053E+03
+a11,a,Concrete1,86.91382,27.73617,5.506500E-01,2.571168E-02,3.542192E-02,3.172928E-02,3.564871E-01,8.564750E+02
+a12,a,Concrete1,83.16382,29.31117,4.493183E-01,3.425396E-02,4.719029E-02,4.227083E-02,4.269666E-01,1.279804E+03
 a13,a,Concrete1,80.61382,28.93617,1.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00
-a14,a,Concrete1,83.91382,29.01117,0.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00,1.000000E+00,4.603935E+03
+a14,a,Concrete1,83.91382,29.01117,3.962755E-02,1.441644E-02,2.011603E-02,1.858578E-02,9.072542E-01,4.603935E+03
 a15,a,Concrete1,82.03882,30.28617,1.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00,0.000000E+00
diff --git a/openquake/qa_tests_data/scenario_damage/case_22/fragility_model_landslide.xml b/openquake/qa_tests_data/scenario_damage/case_22/fragility_model_landslide.xml
index 0d5702a8ed3d..ecd7eb36b968 100644
--- a/openquake/qa_tests_data/scenario_damage/case_22/fragility_model_landslide.xml
+++ b/openquake/qa_tests_data/scenario_damage/case_22/fragility_model_landslide.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <nrml xmlns="http://openquake.org/xmlns/nrml/0.5">
-	<fragilityModel id="1" assetCategory="RDN" lossCategory="landslide">
+	<fragilityModel id="1" assetCategory="RDN" lossCategory="structural">
 		<description>Road Network</description>
 		<limitStates>slight moderate extreme complete</limitStates>
 		<fragilityFunction id="Wood" format="discrete">
diff --git a/openquake/qa_tests_data/scenario_damage/case_22/fragility_model_liquefaction.xml b/openquake/qa_tests_data/scenario_damage/case_22/fragility_model_liquefaction.xml
index 4c14181d25fa..8b1deadebe7b 100644
--- a/openquake/qa_tests_data/scenario_damage/case_22/fragility_model_liquefaction.xml
+++ b/openquake/qa_tests_data/scenario_damage/case_22/fragility_model_liquefaction.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <nrml xmlns="http://openquake.org/xmlns/nrml/0.5">
-	<fragilityModel id="1" assetCategory="RDN" lossCategory="liquefaction">
+	<fragilityModel id="1" assetCategory="RDN" lossCategory="structural">
 		<description>Road Network</description>
 		<limitStates>slight moderate extreme complete</limitStates>
 		<fragilityFunction id="Wood" format="discrete">
diff --git a/openquake/qa_tests_data/scenario_damage/case_22/job_r.ini b/openquake/qa_tests_data/scenario_damage/case_22/job_r.ini
index 87ccf22c4e24..8788fe997128 100644
--- a/openquake/qa_tests_data/scenario_damage/case_22/job_r.ini
+++ b/openquake/qa_tests_data/scenario_damage/case_22/job_r.ini
@@ -3,10 +3,10 @@ description = Scenario Damage and Consequences Demo (Nepal)
 calculation_mode = scenario_damage
 
 [fragility]
-structural_fragility_file = fragility_model_structural.xml
-liquefaction_fragility_file = fragility_model_liquefaction.xml
-landslide_fragility_file = fragility_model_landslide.xml
-taxonomy_mapping_csv = mapping_multiple_loss_types.csv
+earthquake_fragility_file = {'structural': "fragility_model_structural.xml"}
+liquefaction_fragility_file = {'structural': "fragility_model_liquefaction.xml"}
+landslide_fragility_file = {'structural': "fragility_model_landslide.xml"}
+taxonomy_mapping_csv = mapping_multiple_perils.csv
 
 [consequence]
 total_losses = structural
diff --git a/openquake/qa_tests_data/scenario_damage/case_22/mapping_multiple_loss_types.csv b/openquake/qa_tests_data/scenario_damage/case_22/mapping_multiple_perils.csv
similarity index 55%
rename from openquake/qa_tests_data/scenario_damage/case_22/mapping_multiple_loss_types.csv
rename to openquake/qa_tests_data/scenario_damage/case_22/mapping_multiple_perils.csv
index 6871342b83a2..9b4b3309808e 100644
--- a/openquake/qa_tests_data/scenario_damage/case_22/mapping_multiple_loss_types.csv
+++ b/openquake/qa_tests_data/scenario_damage/case_22/mapping_multiple_perils.csv
@@ -1,6 +1,6 @@
-taxonomy,conversion,weight,loss_type
-Wood1,Wood,1,structural
-Concrete1,Concrete,1,structural
+taxonomy,conversion,weight,peril
+Wood1,Wood,1,earthquake
+Concrete1,Concrete,1,earthquake
 Wood1,Wood,1,liquefaction
 Concrete1,Concrete,1,liquefaction
 Wood1,Wood,1,landslide
diff --git a/openquake/qa_tests_data/scenario_damage/case_4b/consequence_model.csv b/openquake/qa_tests_data/scenario_damage/case_4b/consequence_model.csv
index 3c2d6419190f..8fc307a3c22c 100644
--- a/openquake/qa_tests_data/scenario_damage/case_4b/consequence_model.csv
+++ b/openquake/qa_tests_data/scenario_damage/case_4b/consequence_model.csv
@@ -1,10 +1,10 @@
-taxonomy,consequence,loss_type,ds1,ds2,ds3,ds4
-tax1,losses,contents,1.000000E-01,3.000000E-01,6.000000E-01,9.000000E-01
-tax2,losses,contents,1.000000E-01,3.000000E-01,6.000000E-01,9.000000E-01
-tax3,losses,contents,1.000000E-01,3.000000E-01,6.000000E-01,9.000000E-01
-tax1,losses,structural,4.000000E-02,1.600000E-01,3.200000E-01,6.400000E-01
-tax2,losses,structural,4.000000E-02,1.600000E-01,3.200000E-01,6.400000E-01
-tax3,losses,structural,4.000000E-02,1.600000E-01,3.200000E-01,6.400000E-01
-tax1,losses,nonstructural,5.000000E-02,2.500000E-01,5.000000E-01,7.500000E-01
-tax2,losses,nonstructural,5.000000E-02,2.500000E-01,5.000000E-01,7.500000E-01
-tax3,losses,nonstructural,5.000000E-02,2.500000E-01,5.000000E-01,7.500000E-01
+taxonomy,consequence,peril,ds1,ds2,ds3,ds4
+tax1,losses,landslide,1.000000E-01,3.000000E-01,6.000000E-01,9.000000E-01
+tax2,losses,landslide,1.000000E-01,3.000000E-01,6.000000E-01,9.000000E-01
+tax3,losses,landslide,1.000000E-01,3.000000E-01,6.000000E-01,9.000000E-01
+tax1,losses,earthquake,4.000000E-02,1.600000E-01,3.200000E-01,6.400000E-01
+tax2,losses,earthquake,4.000000E-02,1.600000E-01,3.200000E-01,6.400000E-01
+tax3,losses,earthquake,4.000000E-02,1.600000E-01,3.200000E-01,6.400000E-01
+tax1,losses,liquefaction,5.000000E-02,2.500000E-01,5.000000E-01,7.500000E-01
+tax2,losses,liquefaction,5.000000E-02,2.500000E-01,5.000000E-01,7.500000E-01
+tax3,losses,liquefaction,5.000000E-02,2.500000E-01,5.000000E-01,7.500000E-01
diff --git a/openquake/qa_tests_data/scenario_damage/case_4b/expected/risk_by_event.csv b/openquake/qa_tests_data/scenario_damage/case_4b/expected/risk_by_event.csv
index aef4b468bb46..ff715920b6e8 100644
--- a/openquake/qa_tests_data/scenario_damage/case_4b/expected/risk_by_event.csv
+++ b/openquake/qa_tests_data/scenario_damage/case_4b/expected/risk_by_event.csv
@@ -1,202 +1,202 @@
-#,,,,,,"generated_by='OpenQuake engine 3.22.0-git522b788ab0', start_date='2024-10-29T06:59:42', checksum=800090399"
+#,,,,,,"generated_by='OpenQuake engine 3.22.0-git30e245f39e', start_date='2024-11-05T09:25:30', checksum=913995796"
 event_id,ds1,ds2,ds3,ds4,losses,loss_type
-0,1.49079E+00,2.06413E+00,1.48737E+00,1.17147E+00,1.70022E+04,structural+nonstructural+contents
-1,1.06885E+00,1.62750E+00,1.40978E+00,1.66149E+00,1.90440E+04,structural+nonstructural+contents
-2,1.43799E+00,1.81743E+00,1.14906E+00,8.79241E-01,1.27354E+04,structural+nonstructural+contents
-3,1.25828E+00,2.09661E+00,1.67957E+00,1.53027E+00,2.03996E+04,structural+nonstructural+contents
-4,1.23923E+00,1.22524E+00,1.01928E+00,1.69224E+00,1.88885E+04,structural+nonstructural+contents
-5,1.31618E+00,1.88871E+00,1.41785E+00,1.57804E+00,1.92720E+04,structural+nonstructural+contents
-6,1.75962E+00,2.09440E+00,1.13570E+00,6.87110E-01,1.18723E+04,structural+nonstructural+contents
-7,1.30751E+00,1.73470E+00,1.40814E+00,1.54331E+00,1.89675E+04,structural+nonstructural+contents
-8,1.92525E+00,1.29022E+00,5.24107E-01,1.89987E-01,5.51424E+03,structural+nonstructural+contents
-9,1.51354E+00,1.81321E+00,9.95618E-01,1.49036E+00,1.88761E+04,structural+nonstructural+contents
-10,1.11993E+00,1.76300E+00,1.63411E+00,1.88603E+00,2.20113E+04,structural+nonstructural+contents
-11,1.31250E+00,2.05280E+00,1.36069E+00,1.09960E+00,1.52338E+04,structural+nonstructural+contents
-12,1.79963E+00,1.87483E+00,8.98826E-01,4.52026E-01,8.81386E+03,structural+nonstructural+contents
-13,9.79339E-01,1.65208E+00,1.62457E+00,2.21391E+00,2.43522E+04,structural+nonstructural+contents
-14,1.92677E+00,1.86354E+00,9.01828E-01,4.49382E-01,9.44350E+03,structural+nonstructural+contents
-15,1.72769E+00,1.91166E+00,9.49945E-01,5.21264E-01,9.87571E+03,structural+nonstructural+contents
-16,1.97687E+00,2.00980E+00,9.83197E-01,5.25995E-01,1.05526E+04,structural+nonstructural+contents
-17,1.61358E+00,1.50879E+00,9.00935E-01,6.77708E-01,1.07265E+04,structural+nonstructural+contents
-18,1.61814E+00,1.78026E+00,1.06895E+00,6.98410E-01,1.10426E+04,structural+nonstructural+contents
-19,1.15239E+00,1.43369E+00,1.22752E+00,2.69808E+00,2.86450E+04,structural+nonstructural+contents
-20,1.33540E+00,1.72613E+00,1.48114E+00,1.50869E+00,1.89341E+04,structural+nonstructural+contents
-21,2.05352E+00,1.89349E+00,8.64696E-01,4.03664E-01,9.34623E+03,structural+nonstructural+contents
-22,1.85118E+00,1.18466E+00,4.69552E-01,1.34604E-01,4.36558E+03,structural+nonstructural+contents
-23,1.09527E+00,1.93963E+00,1.72023E+00,1.72473E+00,2.10434E+04,structural+nonstructural+contents
-24,1.61988E+00,1.54043E+00,7.32252E-01,3.62872E-01,7.06129E+03,structural+nonstructural+contents
-25,1.48061E+00,1.67846E+00,9.56047E-01,6.23478E-01,1.00936E+04,structural+nonstructural+contents
-26,1.69577E+00,1.60437E+00,8.76220E-01,6.25156E-01,1.05244E+04,structural+nonstructural+contents
-27,1.34718E+00,1.28456E+00,8.21173E-01,8.25517E-01,1.12359E+04,structural+nonstructural+contents
-28,1.82492E+00,1.77360E+00,8.42269E-01,4.11159E-01,9.04734E+03,structural+nonstructural+contents
-29,1.71823E+00,1.73616E+00,1.05386E+00,8.03446E-01,1.19059E+04,structural+nonstructural+contents
-30,1.44159E+00,1.62119E+00,1.12562E+00,9.53004E-01,1.28931E+04,structural+nonstructural+contents
-31,1.69758E+00,1.90113E+00,1.14601E+00,8.20003E-01,1.25964E+04,structural+nonstructural+contents
-32,1.49903E+00,1.60641E+00,1.09915E+00,8.38738E-01,1.23124E+04,structural+nonstructural+contents
-33,1.43105E+00,1.72032E+00,1.26845E+00,1.08870E+00,1.50233E+04,structural+nonstructural+contents
-34,1.61581E+00,1.18575E+00,5.07210E-01,2.24409E-01,5.16050E+03,structural+nonstructural+contents
-35,1.68565E+00,1.64401E+00,8.34843E-01,4.42222E-01,8.63658E+03,structural+nonstructural+contents
-36,1.78671E+00,1.91527E+00,9.53219E-01,5.24280E-01,1.03431E+04,structural+nonstructural+contents
-37,1.54965E+00,1.85488E+00,1.12345E+00,7.37257E-01,1.16852E+04,structural+nonstructural+contents
-38,1.69675E+00,1.41654E+00,8.24840E-01,5.73727E-01,8.99595E+03,structural+nonstructural+contents
-39,1.49082E+00,1.79888E+00,1.14604E+00,8.25298E-01,1.26677E+04,structural+nonstructural+contents
-40,1.38021E+00,1.45512E+00,8.77995E-01,6.38902E-01,9.73960E+03,structural+nonstructural+contents
-41,1.67223E+00,1.89571E+00,1.15559E+00,7.45349E-01,1.23788E+04,structural+nonstructural+contents
-42,1.23882E+00,1.56121E+00,1.42807E+00,2.34091E+00,2.62395E+04,structural+nonstructural+contents
-43,1.79964E+00,1.27493E+00,6.14493E-01,3.60480E-01,7.56274E+03,structural+nonstructural+contents
-44,1.68918E+00,1.99430E+00,1.17905E+00,7.29604E-01,1.21981E+04,structural+nonstructural+contents
-45,1.20942E+00,1.88765E+00,1.47645E+00,1.22912E+00,1.61870E+04,structural+nonstructural+contents
-46,1.56470E+00,1.35615E+00,1.06753E+00,1.27146E+00,1.60296E+04,structural+nonstructural+contents
-47,1.77548E+00,1.63413E+00,8.40394E-01,5.02865E-01,8.81963E+03,structural+nonstructural+contents
-48,1.71778E+00,2.18814E+00,1.25569E+00,7.91895E-01,1.36612E+04,structural+nonstructural+contents
-49,1.68132E+00,1.50658E+00,7.66875E-01,4.31508E-01,7.97259E+03,structural+nonstructural+contents
-50,1.91071E+00,1.93720E+00,9.71768E-01,5.12927E-01,1.06492E+04,structural+nonstructural+contents
-51,1.13582E+00,1.75891E+00,1.24347E+00,1.21229E+00,1.53254E+04,structural+nonstructural+contents
-52,1.75570E+00,1.67569E+00,8.22159E-01,4.32694E-01,8.18169E+03,structural+nonstructural+contents
-53,1.88195E+00,1.87672E+00,1.05009E+00,7.43130E-01,1.26087E+04,structural+nonstructural+contents
-54,1.87461E+00,1.69186E+00,7.35211E-01,2.95252E-01,7.08296E+03,structural+nonstructural+contents
-55,1.93417E+00,1.91479E+00,9.40641E-01,4.83223E-01,9.82981E+03,structural+nonstructural+contents
-56,1.22059E+00,1.63563E+00,1.26371E+00,1.32728E+00,1.62285E+04,structural+nonstructural+contents
-57,1.49185E+00,1.89808E+00,1.50626E+00,1.42650E+00,1.90249E+04,structural+nonstructural+contents
-58,1.63596E+00,1.37897E+00,7.46419E-01,4.83737E-01,8.31061E+03,structural+nonstructural+contents
-59,1.47753E+00,1.88829E+00,1.28343E+00,1.03572E+00,1.49911E+04,structural+nonstructural+contents
-60,1.77211E+00,1.64542E+00,1.00643E+00,6.61447E-01,1.08973E+04,structural+nonstructural+contents
-61,1.75390E+00,1.98626E+00,9.72086E-01,5.20951E-01,9.92126E+03,structural+nonstructural+contents
-62,1.61147E+00,1.22711E+00,7.40712E-01,5.00110E-01,8.02976E+03,structural+nonstructural+contents
-63,1.93441E+00,9.52273E-01,3.85422E-01,1.22903E-01,4.08364E+03,structural+nonstructural+contents
-64,1.01485E+00,1.57624E+00,1.70143E+00,2.14311E+00,2.39343E+04,structural+nonstructural+contents
-65,1.75063E+00,1.24709E+00,5.67461E-01,2.60022E-01,5.83086E+03,structural+nonstructural+contents
-66,1.56615E+00,1.86648E+00,1.27066E+00,1.03639E+00,1.49763E+04,structural+nonstructural+contents
-67,1.37031E+00,1.19252E+00,9.00304E-01,8.93157E-01,1.08172E+04,structural+nonstructural+contents
-68,1.79270E+00,9.85248E-01,3.72464E-01,1.22581E-01,4.17779E+03,structural+nonstructural+contents
-69,1.50221E+00,1.73293E+00,1.43117E+00,1.43346E+00,1.89970E+04,structural+nonstructural+contents
-70,1.89928E+00,1.34457E+00,5.85242E-01,2.86447E-01,6.66772E+03,structural+nonstructural+contents
-71,1.67425E+00,1.76713E+00,1.05983E+00,8.15970E-01,1.24468E+04,structural+nonstructural+contents
-72,1.77365E+00,1.76014E+00,9.19242E-01,5.34016E-01,9.39930E+03,structural+nonstructural+contents
-73,1.09473E+00,2.02348E+00,1.66300E+00,1.60241E+00,2.05758E+04,structural+nonstructural+contents
-74,1.72991E+00,1.03615E+00,4.24148E-01,1.43387E-01,4.45899E+03,structural+nonstructural+contents
-75,1.77694E+00,1.77072E+00,8.55110E-01,4.33540E-01,8.70502E+03,structural+nonstructural+contents
-76,1.20965E+00,1.61413E+00,1.45901E+00,1.50227E+00,1.85284E+04,structural+nonstructural+contents
-77,1.52519E+00,1.98381E+00,1.39609E+00,1.22530E+00,1.72023E+04,structural+nonstructural+contents
-78,1.12444E+00,1.66930E+00,1.59744E+00,2.07257E+00,2.38116E+04,structural+nonstructural+contents
-79,1.16144E+00,1.85861E+00,1.70306E+00,1.78697E+00,2.16037E+04,structural+nonstructural+contents
-80,2.02288E+00,1.68238E+00,9.02176E-01,5.87898E-01,1.07150E+04,structural+nonstructural+contents
-81,1.29752E+00,1.68988E+00,1.59428E+00,1.87575E+00,2.25913E+04,structural+nonstructural+contents
-82,1.95460E+00,1.63100E+00,9.38419E-01,6.29906E-01,1.07105E+04,structural+nonstructural+contents
-83,1.84767E+00,1.78251E+00,8.70055E-01,4.66176E-01,9.33436E+03,structural+nonstructural+contents
-84,9.65227E-01,1.84569E+00,1.61021E+00,1.85278E+00,2.22439E+04,structural+nonstructural+contents
-85,1.44128E+00,1.59976E+00,1.28208E+00,1.19161E+00,1.60612E+04,structural+nonstructural+contents
-86,1.87936E+00,1.89949E+00,1.07810E+00,6.99877E-01,1.18564E+04,structural+nonstructural+contents
-87,1.63461E+00,1.74566E+00,9.67060E-01,5.51932E-01,9.96395E+03,structural+nonstructural+contents
-88,1.47494E+00,1.99245E+00,1.26841E+00,9.93328E-01,1.42535E+04,structural+nonstructural+contents
-89,1.76667E+00,1.59382E+00,9.01652E-01,5.69850E-01,9.65268E+03,structural+nonstructural+contents
-90,1.19860E+00,1.70951E+00,1.42445E+00,1.59360E+00,1.96739E+04,structural+nonstructural+contents
-91,1.69270E+00,1.53354E+00,8.07632E-01,4.48776E-01,7.98808E+03,structural+nonstructural+contents
-92,1.55440E+00,1.74885E+00,1.00473E+00,6.33847E-01,1.04068E+04,structural+nonstructural+contents
-93,1.99677E+00,1.60819E+00,7.52708E-01,4.05512E-01,8.69932E+03,structural+nonstructural+contents
-94,1.32206E+00,1.16022E+00,5.68292E-01,2.38535E-01,4.54855E+03,structural+nonstructural+contents
-95,1.58924E+00,1.87012E+00,1.01782E+00,6.03494E-01,1.02521E+04,structural+nonstructural+contents
-96,1.40305E+00,1.87581E+00,1.13694E+00,7.29950E-01,1.18802E+04,structural+nonstructural+contents
-97,1.43854E+00,1.93121E+00,1.17956E+00,8.61524E-01,1.31241E+04,structural+nonstructural+contents
-98,1.15507E+00,1.78936E+00,1.25140E+00,1.29807E+00,1.64765E+04,structural+nonstructural+contents
-99,1.46313E+00,2.16826E+00,1.36283E+00,9.62367E-01,1.45539E+04,structural+nonstructural+contents
-100,1.81699E+00,1.69170E+00,9.42881E-01,5.89080E-01,1.00056E+04,structural+nonstructural+contents
-101,1.30394E+00,1.74419E+00,1.45949E+00,1.53731E+00,1.92167E+04,structural+nonstructural+contents
-102,1.34520E+00,1.68310E+00,1.23663E+00,1.05055E+00,1.40732E+04,structural+nonstructural+contents
-103,1.68044E+00,1.73219E+00,1.17962E+00,9.56862E-01,1.40897E+04,structural+nonstructural+contents
-104,1.06703E+00,1.86274E+00,1.56416E+00,1.65583E+00,2.08575E+04,structural+nonstructural+contents
-105,1.43282E+00,1.84299E+00,1.29456E+00,1.13996E+00,1.63619E+04,structural+nonstructural+contents
-106,1.00926E+00,1.67408E+00,1.65819E+00,1.80588E+00,2.07699E+04,structural+nonstructural+contents
-107,1.62228E+00,1.67975E+00,9.11273E-01,5.77355E-01,1.01752E+04,structural+nonstructural+contents
-108,1.22422E+00,1.43624E+00,1.10869E+00,1.20020E+00,1.45215E+04,structural+nonstructural+contents
-109,1.22856E+00,2.05248E+00,1.41351E+00,1.46021E+00,1.83108E+04,structural+nonstructural+contents
-110,1.25012E+00,1.80915E+00,1.09475E+00,8.01366E-01,1.18748E+04,structural+nonstructural+contents
-111,8.73500E-01,1.52399E+00,1.41719E+00,1.80435E+00,2.04467E+04,structural+nonstructural+contents
-112,9.41678E-01,1.87864E+00,1.82522E+00,2.07796E+00,2.43231E+04,structural+nonstructural+contents
-113,7.82406E-01,9.34403E-01,1.41971E+00,3.12215E+00,3.04188E+04,structural+nonstructural+contents
-114,9.67510E-01,1.35572E+00,1.31666E+00,2.58007E+00,2.72380E+04,structural+nonstructural+contents
-115,1.48746E+00,1.91359E+00,1.31558E+00,1.12172E+00,1.56550E+04,structural+nonstructural+contents
-116,1.86176E+00,1.57407E+00,6.92139E-01,2.90494E-01,6.86677E+03,structural+nonstructural+contents
-117,1.13728E+00,1.41705E+00,1.47588E+00,1.87795E+00,2.06243E+04,structural+nonstructural+contents
-118,1.52248E+00,1.53956E+00,8.90808E-01,5.98622E-01,9.60027E+03,structural+nonstructural+contents
-119,1.36545E+00,1.90036E+00,1.27588E+00,9.34641E-01,1.43073E+04,structural+nonstructural+contents
-120,1.59770E+00,1.59984E+00,8.53795E-01,4.73176E-01,9.19385E+03,structural+nonstructural+contents
-121,1.43351E+00,2.14802E+00,1.40130E+00,1.04233E+00,1.55778E+04,structural+nonstructural+contents
-122,9.82448E-01,1.06046E+00,1.16506E+00,2.83337E+00,2.82792E+04,structural+nonstructural+contents
-123,1.29689E+00,1.86525E+00,1.41665E+00,1.51130E+00,1.88370E+04,structural+nonstructural+contents
-124,1.64446E+00,2.07201E+00,1.20672E+00,7.46789E-01,1.26347E+04,structural+nonstructural+contents
-125,1.24181E+00,1.53274E+00,1.04387E+00,9.28583E-01,1.27687E+04,structural+nonstructural+contents
-126,1.47440E+00,1.74273E+00,1.16014E+00,8.36327E-01,1.25658E+04,structural+nonstructural+contents
-127,1.41073E+00,1.77533E+00,1.40080E+00,1.29266E+00,1.76434E+04,structural+nonstructural+contents
-128,1.40244E+00,1.79945E+00,1.28724E+00,1.19693E+00,1.57380E+04,structural+nonstructural+contents
-129,1.59468E+00,1.62494E+00,1.11010E+00,1.03593E+00,1.44625E+04,structural+nonstructural+contents
-130,1.13924E+00,1.54665E+00,1.36484E+00,1.59466E+00,1.87633E+04,structural+nonstructural+contents
-131,1.54767E+00,1.88708E+00,1.04874E+00,6.51627E-01,1.10205E+04,structural+nonstructural+contents
-132,1.77731E+00,1.81033E+00,9.41398E-01,5.69376E-01,1.04466E+04,structural+nonstructural+contents
-133,9.45200E-01,1.29028E+00,1.46700E+00,2.68204E+00,2.79076E+04,structural+nonstructural+contents
-134,1.56572E+00,1.63879E+00,1.25108E+00,1.16804E+00,1.62918E+04,structural+nonstructural+contents
-135,1.38435E+00,1.98675E+00,1.22207E+00,8.78850E-01,1.33368E+04,structural+nonstructural+contents
-136,1.33081E+00,1.97692E+00,1.61992E+00,1.48914E+00,1.98350E+04,structural+nonstructural+contents
-137,1.43008E+00,2.16266E+00,1.36750E+00,9.70145E-01,1.46210E+04,structural+nonstructural+contents
-138,1.00309E+00,1.84933E+00,1.56250E+00,1.80770E+00,2.13396E+04,structural+nonstructural+contents
-139,1.69857E+00,1.79365E+00,9.16424E-01,5.12215E-01,9.57397E+03,structural+nonstructural+contents
-140,1.51666E+00,1.63622E+00,1.02762E+00,9.27614E-01,1.30484E+04,structural+nonstructural+contents
-141,1.49961E+00,1.79491E+00,1.41704E+00,1.28054E+00,1.75919E+04,structural+nonstructural+contents
-142,1.56676E+00,1.78962E+00,1.14011E+00,7.72190E-01,1.24820E+04,structural+nonstructural+contents
-143,1.78637E+00,1.70806E+00,9.37404E-01,5.43041E-01,1.04871E+04,structural+nonstructural+contents
-144,1.56187E+00,1.43156E+00,8.73825E-01,1.02060E+00,1.35805E+04,structural+nonstructural+contents
-145,1.82262E+00,1.96144E+00,9.95361E-01,5.52481E-01,1.05343E+04,structural+nonstructural+contents
-146,1.44858E+00,1.82589E+00,1.26281E+00,1.00813E+00,1.44814E+04,structural+nonstructural+contents
-147,1.01921E+00,1.71440E+00,1.72202E+00,1.99111E+00,2.31341E+04,structural+nonstructural+contents
-148,9.74628E-01,1.74154E+00,1.50479E+00,1.69196E+00,2.03915E+04,structural+nonstructural+contents
-149,1.74684E+00,1.63410E+00,1.10627E+00,1.00244E+00,1.40302E+04,structural+nonstructural+contents
-150,1.63434E+00,1.82179E+00,8.89845E-01,4.77360E-01,9.41330E+03,structural+nonstructural+contents
-151,1.57025E+00,1.81216E+00,1.10196E+00,7.55224E-01,1.26403E+04,structural+nonstructural+contents
-152,1.94840E+00,1.66081E+00,7.25073E-01,3.01545E-01,7.18277E+03,structural+nonstructural+contents
-153,1.64977E+00,1.72170E+00,9.34080E-01,5.61985E-01,9.38150E+03,structural+nonstructural+contents
-154,1.50398E+00,1.95603E+00,1.26301E+00,1.01343E+00,1.55000E+04,structural+nonstructural+contents
-155,1.41816E+00,1.82958E+00,1.29426E+00,1.45716E+00,1.84172E+04,structural+nonstructural+contents
-156,9.47685E-01,1.60472E+00,1.64778E+00,2.35702E+00,2.59263E+04,structural+nonstructural+contents
-157,1.63716E+00,1.65662E+00,1.05897E+00,7.84916E-01,1.15852E+04,structural+nonstructural+contents
-158,1.11617E+00,1.79372E+00,1.51921E+00,1.47279E+00,1.83506E+04,structural+nonstructural+contents
-159,9.55218E-01,1.44803E+00,1.39483E+00,2.49718E+00,2.84545E+04,structural+nonstructural+contents
-160,7.33236E-01,1.54545E+00,1.82751E+00,2.64224E+00,2.82134E+04,structural+nonstructural+contents
-161,1.40952E+00,1.97933E+00,1.43609E+00,1.13336E+00,1.60640E+04,structural+nonstructural+contents
-162,1.43123E+00,1.83953E+00,1.43884E+00,1.26992E+00,1.71858E+04,structural+nonstructural+contents
-163,1.39900E+00,1.78111E+00,1.21905E+00,1.28686E+00,1.61646E+04,structural+nonstructural+contents
-164,9.45614E-01,1.77567E+00,1.56846E+00,1.83017E+00,2.18174E+04,structural+nonstructural+contents
-165,9.63368E-01,1.39261E+00,1.61825E+00,2.18758E+00,2.35718E+04,structural+nonstructural+contents
-166,1.83292E+00,1.95172E+00,1.16971E+00,7.55524E-01,1.30922E+04,structural+nonstructural+contents
-167,1.61529E+00,1.34143E+00,7.49375E-01,5.27517E-01,8.19346E+03,structural+nonstructural+contents
-168,1.57018E+00,1.73496E+00,1.08245E+00,7.91382E-01,1.23679E+04,structural+nonstructural+contents
-169,1.68383E+00,1.65594E+00,8.43067E-01,4.85467E-01,8.92927E+03,structural+nonstructural+contents
-170,1.18287E+00,1.60501E+00,1.30771E+00,1.41661E+00,1.66824E+04,structural+nonstructural+contents
-171,1.17155E+00,1.70353E+00,1.16573E+00,9.92176E-01,1.40897E+04,structural+nonstructural+contents
-172,1.80807E+00,1.96466E+00,1.01218E+00,5.65940E-01,1.05162E+04,structural+nonstructural+contents
-173,6.25093E-01,1.01113E+00,1.55330E+00,3.26848E+00,3.21588E+04,structural+nonstructural+contents
-174,1.56114E+00,1.86534E+00,1.08165E+00,7.75459E-01,1.25425E+04,structural+nonstructural+contents
-175,1.85902E+00,1.85208E+00,1.02216E+00,6.07159E-01,1.09549E+04,structural+nonstructural+contents
-176,1.32565E+00,1.99968E+00,1.46608E+00,1.21457E+00,1.69784E+04,structural+nonstructural+contents
-177,1.09348E+00,1.76541E+00,1.52331E+00,1.63247E+00,1.97248E+04,structural+nonstructural+contents
-178,7.64266E-01,1.36734E+00,1.57513E+00,2.94359E+00,3.05436E+04,structural+nonstructural+contents
-179,1.45039E+00,1.96302E+00,1.30888E+00,1.05329E+00,1.48953E+04,structural+nonstructural+contents
-180,8.10324E-01,1.33784E+00,1.62229E+00,2.72294E+00,2.87540E+04,structural+nonstructural+contents
-181,1.62638E+00,1.75666E+00,1.10333E+00,8.17176E-01,1.22837E+04,structural+nonstructural+contents
-182,1.38976E+00,2.10662E+00,1.45722E+00,1.15867E+00,1.61768E+04,structural+nonstructural+contents
-183,1.28676E+00,1.63891E+00,1.11798E+00,1.36912E+00,1.66574E+04,structural+nonstructural+contents
-184,7.72965E-01,1.31926E+00,1.38991E+00,2.02665E+00,2.13982E+04,structural+nonstructural+contents
-185,8.68904E-01,1.33839E+00,1.36029E+00,2.90270E+00,3.18257E+04,structural+nonstructural+contents
-186,1.17931E+00,1.92132E+00,1.33551E+00,1.04519E+00,1.45249E+04,structural+nonstructural+contents
-187,1.14980E+00,1.54275E+00,1.21145E+00,1.23737E+00,1.53979E+04,structural+nonstructural+contents
-188,1.26626E+00,1.76680E+00,1.09264E+00,8.55252E-01,1.23865E+04,structural+nonstructural+contents
-189,1.71309E+00,1.78511E+00,1.07770E+00,7.55103E-01,1.20133E+04,structural+nonstructural+contents
-190,1.64769E+00,1.59490E+00,9.86729E-01,8.70863E-01,1.29074E+04,structural+nonstructural+contents
-191,1.53351E+00,1.97457E+00,1.23743E+00,9.35328E-01,1.39136E+04,structural+nonstructural+contents
-192,9.30400E-01,1.48790E+00,1.59238E+00,2.35903E+00,2.57518E+04,structural+nonstructural+contents
-193,1.36041E+00,1.55096E+00,1.08366E+00,8.25100E-01,1.20496E+04,structural+nonstructural+contents
-194,8.09720E-01,1.37389E+00,1.62080E+00,2.81301E+00,2.92733E+04,structural+nonstructural+contents
-195,1.67692E+00,2.12513E+00,1.20881E+00,7.80368E-01,1.27193E+04,structural+nonstructural+contents
-196,1.82873E+00,1.78481E+00,8.22966E-01,4.06957E-01,8.79255E+03,structural+nonstructural+contents
-197,1.59725E+00,1.74341E+00,8.54262E-01,4.45954E-01,9.11414E+03,structural+nonstructural+contents
-198,5.66937E-01,1.14751E+00,1.59836E+00,3.06058E+00,3.11811E+04,structural+nonstructural+contents
-199,1.74579E+00,1.80200E+00,9.39682E-01,5.39037E-01,1.00910E+04,structural+nonstructural+contents
+0,1.27859E+00,6.50314E-01,1.80069E-01,1.02339E-01,2.78313E+03,structural
+1,1.34522E+00,7.85093E-01,3.45512E-01,3.47580E-01,5.12439E+03,structural
+2,1.04408E+00,4.40809E-01,1.44295E-01,8.42860E-02,2.12410E+03,structural
+3,1.44735E+00,8.11989E-01,2.62528E-01,1.56738E-01,3.72133E+03,structural
+4,8.23804E-01,6.14389E-01,3.14012E-01,6.51569E-01,6.48743E+03,structural
+5,1.23593E+00,7.00490E-01,3.07244E-01,3.36746E-01,4.75351E+03,structural
+6,1.00828E+00,3.44309E-01,8.91627E-02,5.56473E-02,1.59567E+03,structural
+7,1.18319E+00,7.38688E-01,2.97483E-01,2.85633E-01,4.43517E+03,structural
+8,3.15366E-01,5.84011E-02,8.60714E-03,2.33384E-03,2.62068E+02,structural
+9,8.54757E-01,4.01503E-01,1.94660E-01,6.69054E-01,5.88917E+03,structural
+10,1.43617E+00,9.02210E-01,3.59089E-01,4.57962E-01,6.09804E+03,structural
+11,1.26434E+00,5.53070E-01,1.83325E-01,1.16392E-01,2.72220E+03,structural
+12,8.01555E-01,2.05354E-01,4.70294E-02,2.66666E-02,9.70349E+02,structural
+13,1.36562E+00,9.39890E-01,4.32677E-01,7.07908E-01,7.96525E+03,structural
+14,7.17567E-01,2.30817E-01,3.87186E-02,1.71460E-02,8.89968E+02,structural
+15,8.64055E-01,2.57577E-01,5.53745E-02,3.12840E-02,1.13516E+03,structural
+16,8.05655E-01,2.50030E-01,5.31758E-02,2.66236E-02,1.06286E+03,structural
+17,7.20682E-01,3.37808E-01,1.11877E-01,8.69688E-02,1.74337E+03,structural
+18,9.61682E-01,3.93905E-01,1.04945E-01,7.56035E-02,1.83461E+03,structural
+19,1.12588E+00,9.36026E-01,5.57821E-01,8.31862E-01,9.05693E+03,structural
+20,1.25824E+00,7.86153E-01,2.86288E-01,2.23228E-01,4.10593E+03,structural
+21,6.46242E-01,1.93504E-01,2.65652E-02,8.82528E-03,7.09594E+02,structural
+22,2.47220E-01,3.24796E-02,4.08594E-03,1.37345E-03,1.72720E+02,structural
+23,1.56922E+00,9.01411E-01,3.26423E-01,2.43607E-01,4.67358E+03,structural
+24,6.52532E-01,1.77743E-01,3.90068E-02,2.17987E-02,8.09736E+02,structural
+25,8.65517E-01,3.32926E-01,9.11341E-02,7.17112E-02,1.62947E+03,structural
+26,7.15053E-01,2.98913E-01,8.67015E-02,3.18191E-02,1.24537E+03,structural
+27,6.98198E-01,3.82640E-01,1.57902E-01,8.18983E-02,1.92094E+03,structural
+28,6.20515E-01,2.02270E-01,2.97298E-02,8.01437E-03,7.18265E+02,structural
+29,8.90309E-01,3.75402E-01,1.40234E-01,1.39913E-01,2.30096E+03,structural
+30,9.86729E-01,4.81407E-01,1.77646E-01,1.61619E-01,2.76777E+03,structural
+31,9.64074E-01,3.83777E-01,1.31062E-01,1.02951E-01,2.07796E+03,structural
+32,9.79269E-01,4.84306E-01,1.38066E-01,1.08160E-01,2.30064E+03,structural
+33,1.03870E+00,5.70571E-01,1.85069E-01,1.73038E-01,3.02806E+03,structural
+34,4.13705E-01,9.66726E-02,2.02297E-02,1.07932E-02,4.53970E+02,structural
+35,7.11049E-01,2.47983E-01,4.31546E-02,2.01543E-02,9.48274E+02,structural
+36,7.87947E-01,2.33184E-01,5.12985E-02,2.00986E-02,9.81060E+02,structural
+37,1.03292E+00,4.15247E-01,1.02482E-01,6.97136E-02,1.85167E+03,structural
+38,7.17502E-01,2.65165E-01,9.55548E-02,8.47387E-02,1.55937E+03,structural
+39,1.00968E+00,4.56984E-01,1.23158E-01,6.78799E-02,1.96358E+03,structural
+40,7.56791E-01,2.90768E-01,9.59080E-02,4.05157E-02,1.33415E+03,structural
+41,9.75430E-01,4.25672E-01,8.98194E-02,3.16270E-02,1.56108E+03,structural
+42,1.13657E+00,9.47846E-01,4.71438E-01,5.95149E-01,7.28873E+03,structural
+43,3.76796E-01,1.58672E-01,4.06856E-02,1.07575E-02,6.03635E+02,structural
+44,1.02337E+00,4.10268E-01,9.09260E-02,5.08316E-02,1.68206E+03,structural
+45,1.37602E+00,6.88259E-01,2.13489E-01,1.68727E-01,3.41464E+03,structural
+46,7.41300E-01,5.59879E-01,2.25737E-01,3.73651E-01,4.30605E+03,structural
+47,7.18107E-01,2.36177E-01,7.32343E-02,6.06254E-02,1.28748E+03,structural
+48,1.05349E+00,4.16353E-01,9.05717E-02,3.23622E-02,1.58451E+03,structural
+49,6.52715E-01,2.00153E-01,5.35554E-02,3.01129E-02,9.45430E+02,structural
+50,7.65793E-01,2.72911E-01,4.18092E-02,1.41415E-02,9.67270E+02,structural
+51,1.18998E+00,5.63110E-01,2.26594E-01,2.92586E-01,3.97462E+03,structural
+52,6.90465E-01,2.04798E-01,5.32799E-02,3.71196E-02,1.01192E+03,structural
+53,8.06443E-01,3.67082E-01,1.03682E-01,4.20983E-02,1.51112E+03,structural
+54,5.52594E-01,1.21057E-01,1.76862E-02,7.31829E-03,5.18162E+02,structural
+55,7.74289E-01,2.49780E-01,4.53668E-02,2.25412E-02,9.98801E+02,structural
+56,1.12659E+00,6.20057E-01,2.44345E-01,3.55010E-01,4.49670E+03,structural
+57,1.18477E+00,7.25876E-01,2.50193E-01,2.22144E-01,3.85765E+03,structural
+58,6.29736E-01,2.29917E-01,7.31818E-02,5.40765E-02,1.20003E+03,structural
+59,1.08703E+00,5.37500E-01,1.67923E-01,1.52930E-01,2.81091E+03,structural
+60,7.70740E-01,3.77196E-01,9.70736E-02,7.30999E-02,1.69028E+03,structural
+61,9.06037E-01,2.40871E-01,5.24870E-02,2.59638E-02,1.08193E+03,structural
+62,5.90192E-01,2.40388E-01,7.94516E-02,5.01818E-02,1.19611E+03,structural
+63,1.81698E-01,3.26095E-02,5.02582E-03,1.12252E-03,1.48121E+02,structural
+64,1.49424E+00,1.04949E+00,4.48063E-01,4.19105E-01,6.39294E+03,structural
+65,4.37027E-01,1.03660E-01,2.38827E-02,1.13129E-02,4.89494E+02,structural
+66,1.08134E+00,5.43577E-01,1.73442E-01,1.33921E-01,2.71436E+03,structural
+67,8.17153E-01,4.31435E-01,1.94561E-01,2.27436E-01,3.09534E+03,structural
+68,1.98076E-01,3.40328E-02,4.74595E-03,1.52468E-03,1.58628E+02,structural
+69,1.09434E+00,7.26560E-01,2.55021E-01,2.41579E-01,3.96240E+03,structural
+70,4.40621E-01,1.39015E-01,2.83597E-02,1.55938E-02,5.89223E+02,structural
+71,9.00625E-01,3.91034E-01,1.31084E-01,7.05765E-02,1.85706E+03,structural
+72,7.93547E-01,2.48779E-01,7.23451E-02,4.98634E-02,1.26610E+03,structural
+73,1.55571E+00,8.55424E-01,2.86666E-01,1.67536E-01,3.98053E+03,structural
+74,2.16459E-01,3.85060E-02,5.71864E-03,1.12416E-03,1.73687E+02,structural
+75,7.02827E-01,1.89416E-01,4.16391E-02,1.75299E-02,8.29633E+02,structural
+76,1.30907E+00,8.16003E-01,2.89322E-01,1.84255E-01,3.93429E+03,structural
+77,1.12240E+00,5.99699E-01,2.07525E-01,1.91779E-01,3.29995E+03,structural
+78,1.37248E+00,9.73994E-01,4.25309E-01,4.23332E-01,6.17769E+03,structural
+79,1.49698E+00,9.17057E-01,3.46805E-01,2.92659E-01,5.04888E+03,structural
+80,6.79644E-01,2.96345E-01,8.37693E-02,5.64189E-02,1.37515E+03,structural
+81,1.30275E+00,9.22341E-01,3.76172E-01,2.68762E-01,4.92067E+03,structural
+82,6.91898E-01,3.39976E-01,9.79131E-02,8.92048E-02,1.70495E+03,structural
+83,7.08964E-01,2.27040E-01,4.92118E-02,2.67062E-02,9.75247E+02,structural
+84,1.58856E+00,9.53036E-01,3.67987E-01,2.22139E-01,4.75953E+03,structural
+85,1.05453E+00,6.48986E-01,2.13197E-01,1.26874E-01,2.95441E+03,structural
+86,8.51854E-01,3.62451E-01,1.01680E-01,8.54366E-02,1.79283E+03,structural
+87,8.31603E-01,3.19340E-01,5.94044E-02,2.69719E-02,1.20630E+03,structural
+88,1.17795E+00,4.90666E-01,1.66005E-01,1.55856E-01,2.78494E+03,structural
+89,7.25250E-01,3.13357E-01,8.43192E-02,6.93635E-02,1.50522E+03,structural
+90,1.24334E+00,7.82981E-01,3.07914E-01,2.63902E-01,4.42441E+03,structural
+91,7.15796E-01,2.03096E-01,5.66407E-02,3.26144E-02,1.00125E+03,structural
+92,9.19203E-01,3.54599E-01,8.81470E-02,5.90147E-02,1.59480E+03,structural
+93,5.71314E-01,1.96278E-01,4.26688E-02,2.17110E-02,8.18061E+02,structural
+94,5.00522E-01,8.66876E-02,2.08604E-02,1.03091E-02,4.71641E+02,structural
+95,9.48933E-01,3.21865E-01,7.78719E-02,4.95347E-02,1.46077E+03,structural
+96,1.06066E+00,4.21076E-01,9.04925E-02,4.50403E-02,1.67582E+03,structural
+97,1.07349E+00,4.35478E-01,1.32254E-01,1.00087E-01,2.18993E+03,structural
+98,1.26468E+00,6.44075E-01,2.47161E-01,1.42821E-01,3.24136E+03,structural
+99,1.22307E+00,5.00744E-01,1.41524E-01,9.31087E-02,2.33919E+03,structural
+100,7.70868E-01,2.67219E-01,8.53524E-02,6.19883E-02,1.40575E+03,structural
+101,1.25636E+00,7.73886E-01,2.91220E-01,2.57082E-01,4.31799E+03,structural
+102,1.09958E+00,5.62562E-01,1.93181E-01,1.49751E-01,2.91652E+03,structural
+103,9.15010E-01,5.00602E-01,1.58463E-01,1.59241E-01,2.69319E+03,structural
+104,1.44653E+00,8.63814E-01,3.08832E-01,1.63987E-01,3.99849E+03,structural
+105,1.10657E+00,6.09074E-01,1.80608E-01,7.42126E-02,2.47005E+03,structural
+106,1.50945E+00,9.31527E-01,3.76332E-01,3.63489E-01,5.62481E+03,structural
+107,7.50998E-01,2.91635E-01,7.49483E-02,3.81713E-02,1.25115E+03,structural
+108,1.11807E+00,6.10721E-01,2.53043E-01,1.32157E-01,3.07993E+03,structural
+109,1.40476E+00,6.90806E-01,2.85986E-01,1.89284E-01,3.79376E+03,structural
+110,1.04173E+00,3.92932E-01,1.28499E-01,1.08283E-01,2.14959E+03,structural
+111,1.29250E+00,8.48941E-01,3.84642E-01,3.80062E-01,5.53856E+03,structural
+112,1.60614E+00,1.02691E+00,4.00999E-01,3.85246E-01,6.03429E+03,structural
+113,1.28698E+00,1.14055E+00,7.80673E-01,1.00930E+00,1.12974E+04,structural
+114,1.24779E+00,9.40487E-01,6.10704E-01,6.87966E-01,8.36113E+03,structural
+115,1.13922E+00,5.43688E-01,1.94070E-01,1.33349E-01,2.80004E+03,structural
+116,5.15534E-01,1.06861E-01,1.93010E-02,6.89779E-03,4.83100E+02,structural
+117,1.35671E+00,9.14856E-01,4.15590E-01,4.02270E-01,5.91087E+03,structural
+118,8.17206E-01,2.91888E-01,8.68128E-02,4.66445E-02,1.37023E+03,structural
+119,1.14019E+00,5.31636E-01,1.28610E-01,5.59106E-02,2.07607E+03,structural
+120,6.73435E-01,2.74291E-01,4.67674E-02,2.03996E-02,9.88453E+02,structural
+121,1.29309E+00,5.57774E-01,1.57388E-01,9.63346E-02,2.52985E+03,structural
+122,1.07342E+00,9.24015E-01,6.26799E-01,1.09414E+00,1.09160E+04,structural
+123,1.29361E+00,7.24813E-01,2.93972E-01,2.48959E-01,4.21119E+03,structural
+124,1.07516E+00,4.14523E-01,9.08929E-02,4.66048E-02,1.68243E+03,structural
+125,8.86839E-01,4.55653E-01,1.67932E-01,1.24920E-01,2.42065E+03,structural
+126,1.04968E+00,4.86482E-01,1.29688E-01,8.75416E-02,2.17351E+03,structural
+127,1.11628E+00,6.79079E-01,2.22344E-01,1.81644E-01,3.40706E+03,structural
+128,1.12971E+00,5.79967E-01,2.11741E-01,2.69320E-01,3.78105E+03,structural
+129,9.60600E-01,5.37563E-01,1.89497E-01,8.31047E-02,2.38260E+03,structural
+130,1.32513E+00,8.01375E-01,3.43622E-01,1.90099E-01,4.12847E+03,structural
+131,9.53366E-01,3.42544E-01,8.35217E-02,5.24670E-02,1.53247E+03,structural
+132,8.09233E-01,2.79517E-01,6.75493E-02,3.11414E-02,1.18638E+03,structural
+133,1.36177E+00,1.12712E+00,6.22919E-01,6.69572E-01,8.62671E+03,structural
+134,1.00582E+00,6.36648E-01,1.98982E-01,8.59743E-02,2.60794E+03,structural
+135,1.16752E+00,4.62422E-01,1.26594E-01,6.34123E-02,2.01782E+03,structural
+136,1.34794E+00,7.87676E-01,2.55469E-01,1.92894E-01,3.85148E+03,structural
+137,1.24091E+00,5.10384E-01,1.40909E-01,8.27876E-02,2.29373E+03,structural
+138,1.53496E+00,8.88737E-01,3.73614E-01,2.61257E-01,4.90357E+03,structural
+139,8.10422E-01,2.67161E-01,5.72099E-02,3.13716E-02,1.13548E+03,structural
+140,8.14832E-01,4.11451E-01,1.64357E-01,2.24442E-01,2.94663E+03,structural
+141,1.17379E+00,7.02431E-01,2.18784E-01,1.27121E-01,3.10709E+03,structural
+142,9.68364E-01,4.49172E-01,1.02202E-01,5.11005E-02,1.76011E+03,structural
+143,7.25544E-01,3.15054E-01,5.17253E-02,1.56700E-02,1.06011E+03,structural
+144,7.58694E-01,4.48869E-01,2.09684E-01,1.25753E-01,2.49748E+03,structural
+145,8.21968E-01,2.63372E-01,5.86469E-02,2.56067E-02,1.10173E+03,structural
+146,1.11415E+00,5.46481E-01,1.69018E-01,1.41412E-01,2.76592E+03,structural
+147,1.58481E+00,1.01918E+00,4.11928E-01,2.92772E-01,5.45652E+03,structural
+148,1.35573E+00,8.04534E-01,3.05943E-01,4.00585E-01,5.37230E+03,structural
+149,7.92566E-01,4.73807E-01,1.75286E-01,2.43568E-01,3.19487E+03,structural
+150,7.49646E-01,2.09290E-01,4.37634E-02,1.43860E-02,8.66835E+02,structural
+151,8.99740E-01,4.17374E-01,9.37012E-02,3.28089E-02,1.53752E+03,structural
+152,5.51702E-01,1.07745E-01,1.93835E-02,7.44624E-03,5.02757E+02,structural
+153,8.62468E-01,2.69542E-01,7.95301E-02,5.19348E-02,1.36313E+03,structural
+154,1.05447E+00,5.28893E-01,1.52062E-01,6.87875E-02,2.19486E+03,structural
+155,1.07405E+00,6.06332E-01,2.52916E-01,4.26065E-01,4.93590E+03,structural
+156,1.40424E+00,1.03135E+00,4.77867E-01,6.23550E-01,7.73174E+03,structural
+157,8.74091E-01,3.58102E-01,1.30990E-01,1.04975E-01,2.01361E+03,structural
+158,1.41490E+00,7.84335E-01,2.79489E-01,2.23504E-01,4.14568E+03,structural
+159,1.29593E+00,9.11157E-01,4.01763E-01,9.17962E-01,9.13682E+03,structural
+160,1.62727E+00,1.21795E+00,5.59205E-01,6.22185E-01,8.37106E+03,structural
+161,1.29168E+00,6.33277E-01,1.80064E-01,1.23468E-01,2.89631E+03,structural
+162,1.21294E+00,6.90807E-01,2.16593E-01,1.26813E-01,3.09517E+03,structural
+163,1.08243E+00,5.49740E-01,2.29305E-01,3.78367E-01,4.46788E+03,structural
+164,1.41010E+00,8.67381E-01,3.49240E-01,3.54753E-01,5.33984E+03,structural
+165,1.45581E+00,1.04778E+00,4.76540E-01,4.79853E-01,6.85475E+03,structural
+166,9.32363E-01,4.27953E-01,9.41436E-02,4.98625E-02,1.67805E+03,structural
+167,6.02858E-01,2.49839E-01,9.50180E-02,9.90615E-02,1.57894E+03,structural
+168,9.34143E-01,4.32090E-01,1.22711E-01,1.01228E-01,2.10553E+03,structural
+169,7.25274E-01,2.26976E-01,6.03149E-02,3.63452E-02,1.07889E+03,structural
+170,1.20507E+00,6.68681E-01,2.78314E-01,3.89869E-01,4.93769E+03,structural
+171,1.04306E+00,5.30569E-01,1.57757E-01,7.06276E-02,2.22297E+03,structural
+172,8.41939E-01,2.75936E-01,6.52877E-02,3.61597E-02,1.21862E+03,structural
+173,1.46745E+00,1.32658E+00,7.77458E-01,8.69956E-01,1.07651E+04,structural
+174,9.22959E-01,3.92670E-01,1.04827E-01,3.92924E-02,1.58437E+03,structural
+175,8.32313E-01,3.35501E-01,7.46107E-02,4.80270E-02,1.41585E+03,structural
+176,1.34584E+00,6.71512E-01,1.94545E-01,1.07381E-01,2.92254E+03,structural
+177,1.43824E+00,8.39604E-01,3.20882E-01,2.53237E-01,4.56620E+03,structural
+178,1.43790E+00,1.17102E+00,6.06270E-01,9.10753E-01,1.02177E+04,structural
+179,1.17940E+00,5.35857E-01,1.76063E-01,1.40346E-01,2.79075E+03,structural
+180,1.48174E+00,1.20383E+00,5.84350E-01,5.71949E-01,8.04922E+03,structural
+181,9.98316E-01,4.43790E-01,1.37430E-01,1.14318E-01,2.28080E+03,structural
+182,1.35100E+00,6.12014E-01,1.96190E-01,1.46338E-01,3.08400E+03,structural
+183,1.10517E+00,6.15028E-01,2.92746E-01,2.10235E-01,3.70840E+03,structural
+184,1.35652E+00,9.39165E-01,4.61523E-01,4.67356E-01,6.51323E+03,structural
+185,1.28002E+00,9.84663E-01,5.43799E-01,1.01834E+00,1.03450E+04,structural
+186,1.32084E+00,5.76510E-01,1.71427E-01,1.13116E-01,2.72327E+03,structural
+187,1.18392E+00,6.48616E-01,2.45355E-01,1.25766E-01,3.10139E+03,structural
+188,1.05868E+00,4.17080E-01,1.34880E-01,6.55454E-02,1.94190E+03,structural
+189,8.93645E-01,4.01615E-01,1.15237E-01,1.04021E-01,2.03454E+03,structural
+190,8.04674E-01,4.27702E-01,1.51367E-01,8.09457E-02,2.00862E+03,structural
+191,1.11619E+00,4.74362E-01,1.47793E-01,9.44240E-02,2.28271E+03,structural
+192,1.42793E+00,1.03883E+00,4.89217E-01,5.64714E-01,7.41297E+03,structural
+193,9.69424E-01,4.85051E-01,1.27317E-01,6.64128E-02,1.99631E+03,structural
+194,1.55068E+00,1.22678E+00,6.54513E-01,5.79482E-01,8.38625E+03,structural
+195,1.09757E+00,3.98127E-01,1.08805E-01,7.92801E-02,1.93160E+03,structural
+196,6.64979E-01,1.72974E-01,3.29133E-02,1.19702E-02,7.24682E+02,structural
+197,6.63205E-01,2.16851E-01,3.75131E-02,1.08604E-02,8.01793E+02,structural
+198,1.48930E+00,1.28008E+00,6.38826E-01,8.22151E-01,9.94985E+03,structural
+199,7.93060E-01,2.85297E-01,6.11528E-02,3.41845E-02,1.18817E+03,structural
diff --git a/openquake/qa_tests_data/scenario_damage/case_4b/job_risk.ini b/openquake/qa_tests_data/scenario_damage/case_4b/job_risk.ini
index 2d85e59699ac..981cf68865b2 100644
--- a/openquake/qa_tests_data/scenario_damage/case_4b/job_risk.ini
+++ b/openquake/qa_tests_data/scenario_damage/case_4b/job_risk.ini
@@ -10,9 +10,9 @@ asset_hazard_distance = 20.0
 
 [fragility]
 structural_fragility_file = structural_fragility_model.xml
-nonstructural_fragility_file = nonstructural_fragility_model.xml
-contents_fragility_file = contents_fragility_model.xml
-total_losses = structural+nonstructural+contents
+#nonstructural_fragility_file = nonstructural_fragility_model.xml
+#contents_fragility_file = contents_fragility_model.xml
+#total_losses = structural+nonstructural+contents
 
 [consequence]
 consequence_file = {'taxonomy': 'consequence_model.csv'}
diff --git a/openquake/qa_tests_data/scenario_damage/case_7/expected/dmg_by_asset.csv b/openquake/qa_tests_data/scenario_damage/case_7/expected/dmg_by_asset.csv
index a9b9a64ca11c..0bba28ea247d 100644
--- a/openquake/qa_tests_data/scenario_damage/case_7/expected/dmg_by_asset.csv
+++ b/openquake/qa_tests_data/scenario_damage/case_7/expected/dmg_by_asset.csv
@@ -1,3 +1,3 @@
-#,,,,,,,,"generated_by='OpenQuake engine 3.22.0-git5d9564908c', start_date='2024-10-29T05:10:21', checksum=1335928015"
+#,,,,,,,,"generated_by='OpenQuake engine 3.22.0-git30e245f39e', start_date='2024-11-05T09:25:31', checksum=3271930950"
 asset_id,taxonomy,lon,lat,no_damage,ds1,ds2,ds3,ds4
-a1,tax1,-122.00000,38.11300,5.960464E-08,1.200000E-01,2.400000E-01,3.200000E-01,3.200000E-01
+a1,tax1,-122.00000,38.11300,3.900000E-01,2.800000E-01,1.300000E-01,8.000000E-02,1.200000E-01
diff --git a/openquake/qa_tests_data/scenario_damage/case_7/job_r.ini b/openquake/qa_tests_data/scenario_damage/case_7/job_r.ini
index 185d60facdde..1c6d0ac94cde 100644
--- a/openquake/qa_tests_data/scenario_damage/case_7/job_r.ini
+++ b/openquake/qa_tests_data/scenario_damage/case_7/job_r.ini
@@ -11,9 +11,9 @@ asset_hazard_distance = 20.0
 
 [fragility]
 structural_fragility_file = structural_fragility_model.xml
-nonstructural_fragility_file = nonstructural_fragility_model.xml
-contents_fragility_file = contents_fragility_model.xml
-total_losses = structural+nonstructural+contents
+#nonstructural_fragility_file = nonstructural_fragility_model.xml
+#contents_fragility_file = contents_fragility_model.xml
+#total_losses = structural+nonstructural+contents
 
 [export]
 export_dir = ./
diff --git a/openquake/qa_tests_data/scenario_damage/case_9/consequences_by_taxonomy.csv b/openquake/qa_tests_data/scenario_damage/case_9/consequences_by_taxonomy.csv
index 767f22a3444f..7a6c8699aaf0 100644
--- a/openquake/qa_tests_data/scenario_damage/case_9/consequences_by_taxonomy.csv
+++ b/openquake/qa_tests_data/scenario_damage/case_9/consequences_by_taxonomy.csv
@@ -1,21 +1,21 @@
-taxonomy,consequence,loss_type,slight,moderate,extensive,complete
-CR_LFINF-DUH_H2,losses,structural,0.05,0.25,0.6,1
-CR_LFINF-DUH_H4,losses,structural,0.05,0.25,0.6,1
-MCF_LWAL-DNO_H3,losses,structural,0.05,0.25,0.6,1
-MR_LWAL-DNO_H1,losses,structural,0.05,0.25,0.6,1
-MR_LWAL-DNO_H2,losses,structural,0.05,0.25,0.6,1
-MUR_LWAL-DNO_H1,losses,structural,0.05,0.25,0.6,1
-W-WS_LPB-DNO_H1,losses,structural,0.05,0.25,0.6,1
-W-WWD_LWAL-DNO_H1,losses,structural,0.05,0.25,0.6,1
-MISSING_TAXONOMY,losses,structural,0.05,0.25,0.6,1
-MR_LWAL-DNO_H3,losses,structural,0.05,0.25,0.6,1
-CR_LFINF-DUH_H2,collapsed,structural,0,0,0,1
-CR_LFINF-DUH_H4,collapsed,structural,0,0,0,1
-MCF_LWAL-DNO_H3,collapsed,structural,0,0,0,1
-MR_LWAL-DNO_H1,collapsed,structural,0,0,0,1
-MR_LWAL-DNO_H2,collapsed,structural,0,0,0,1
-MUR_LWAL-DNO_H1,collapsed,structural,0,0,0,1
-W-WS_LPB-DNO_H1,collapsed,structural,0,0,0,1
-W-WWD_LWAL-DNO_H1,collapsed,structural,0,0,0,1
-MISSING_TAXONOMY,collapsed,structural,0,0,0,1
-MR_LWAL-DNO_H3,collapsed,structural,0,0,0,1
+taxonomy,consequence,peril,slight,moderate,extensive,complete
+CR_LFINF-DUH_H2,losses,earthquake,0.05,0.25,0.6,1
+CR_LFINF-DUH_H4,losses,earthquake,0.05,0.25,0.6,1
+MCF_LWAL-DNO_H3,losses,earthquake,0.05,0.25,0.6,1
+MR_LWAL-DNO_H1,losses,earthquake,0.05,0.25,0.6,1
+MR_LWAL-DNO_H2,losses,earthquake,0.05,0.25,0.6,1
+MUR_LWAL-DNO_H1,losses,earthquake,0.05,0.25,0.6,1
+W-WS_LPB-DNO_H1,losses,earthquake,0.05,0.25,0.6,1
+W-WWD_LWAL-DNO_H1,losses,earthquake,0.05,0.25,0.6,1
+MISSING_TAXONOMY,losses,earthquake,0.05,0.25,0.6,1
+MR_LWAL-DNO_H3,losses,earthquake,0.05,0.25,0.6,1
+CR_LFINF-DUH_H2,collapsed,earthquake,0,0,0,1
+CR_LFINF-DUH_H4,collapsed,earthquake,0,0,0,1
+MCF_LWAL-DNO_H3,collapsed,earthquake,0,0,0,1
+MR_LWAL-DNO_H1,collapsed,earthquake,0,0,0,1
+MR_LWAL-DNO_H2,collapsed,earthquake,0,0,0,1
+MUR_LWAL-DNO_H1,collapsed,earthquake,0,0,0,1
+W-WS_LPB-DNO_H1,collapsed,earthquake,0,0,0,1
+W-WWD_LWAL-DNO_H1,collapsed,earthquake,0,0,0,1
+MISSING_TAXONOMY,collapsed,earthquake,0,0,0,1
+MR_LWAL-DNO_H3,collapsed,earthquake,0,0,0,1
diff --git a/openquake/risklib/riskmodels.py b/openquake/risklib/riskmodels.py
index ac8606594f52..5bc5cf6fe85c 100644
--- a/openquake/risklib/riskmodels.py
+++ b/openquake/risklib/riskmodels.py
@@ -74,7 +74,7 @@ def get_risk_files(inputs):
                 if isinstance(value, dict):  # cost_type -> fname
                     peril = match.group(1)
                     for cost_type, fname in value.items():
-                        rfs[f'{peril}/{kind}/{cost_type}'] = fname                        
+                        rfs[f'{peril}/{kind}/{cost_type}'] = fname
                 else:
                     cost_type = match.group(1)
                     rfs[f'earthquake/{kind}/{cost_type}'] = value
@@ -283,7 +283,7 @@ def __call__(self, assets, gmf_df, rndgen=None):
         meth = getattr(self, self.calcmode)
         res = {(peril, lt): meth(peril, lt, assets, gmf_df, rndgen)
                for peril in self.risk_functions for lt in self.loss_types}
-        # for event_based_risk this is a map loss_type -> DataFrame(eid, aid, loss)
+        # for event_based_risk `res` is a map loss_type -> DataFrame(eid, aid, loss)
         return PerilDict(res)
 
     def __toh5__(self):
@@ -501,16 +501,16 @@ class ValidationError(Exception):
     pass
 
 
-def get_cdict(fractions, coeffs, df, loss_types):
+def get_cdict(fractions, coeffs, df, perils):
     """
-    :returns: a dict loss_type -> array of shape (A, E)
+    :returns: a dict peril -> array of shape (A, E)
     """
     cdict = {}
-    for li, loss_type in enumerate(loss_types):
-        for lt, risk_id, weight in zip(df.loss_type, df.risk_id, df.weight):
+    for pi, peril in enumerate(perils):
+        for per, risk_id, weight in zip(df.peril, df.risk_id, df.weight):
             cs = coeffs[risk_id]
-            if lt == loss_type or lt == '*':
-                cdict[loss_type] = fractions[li] @ cs[loss_type] * weight
+            if per == peril or per == '*':
+                cdict[peril] = fractions[pi] @ cs[peril]['structural'] * weight
     return cdict
 
 
@@ -587,15 +587,14 @@ def set_tmap(self, tmap_df):
                 csq_files.append(fnames)
         cfs = '\n'.join(csq_files)
         df = self.tmap_df
-        for loss_type in self.oqparam.loss_types:
+        for peril in self.perils:
             for byname, coeffs in self.consdict.items():
                 # ex. byname = "losses_by_taxonomy"
                 if len(coeffs):
-                    for lt, risk_id, weight in zip(
-                            df.loss_type, df.risk_id, df.weight):
-                        if (lt == '*' or lt == loss_type) and risk_id != '?':
+                    for per, risk_id, weight in zip(df.peril, df.risk_id, df.weight):
+                        if (per == '*' or per == peril) and risk_id != '?':
                             try:
-                                coeffs[risk_id][loss_type]
+                                coeffs[risk_id][peril]
                             except KeyError as err:
                                 raise InvalidFile(
                                     'Missing %s in\n%s' % (err, cfs))
@@ -608,8 +607,7 @@ def check_risk_ids(self, inputs):
         for riskfunc in self.risklist:
             ids_by_kind[riskfunc.kind].add(riskfunc.id)
         kinds = tuple(ids_by_kind)  # vulnerability, fragility, ...
-        fnames = [fname for kind, fname in inputs.items()
-                  if kind.endswith(kinds)]
+        fnames = [fname for kind, fname in inputs.items() if kind.endswith(kinds)]
         if len(ids_by_kind) > 1:
             k = next(iter(ids_by_kind))
             base_ids = set(ids_by_kind.pop(k))
@@ -619,31 +617,34 @@ def check_risk_ids(self, inputs):
                         'Check in the files %s the IDs %s' %
                         (fnames, sorted(base_ids.symmetric_difference(ids))))
 
-        # check imt_by_lt has consistent loss types for all taxonomies
         if self._riskmodels:
-            missing = AccumDict(accum=[])
-            for lt in self.loss_types:
+            for peril in self.perils:
+                # check imt_by_lt has consistent loss types for all taxonomies
+                missing = AccumDict(accum=[])
                 rms = []
                 if len(self.tmap_df):
-                    if len(self.tmap_df.loss_type.unique()) == 1:
+                    if len(self.tmap_df.peril.unique()) == 1:
                         risk_ids = self.tmap_df.risk_id
                     else:
-                        risk_ids = self.tmap_df[self.tmap_df.loss_type==lt].risk_id
+                        risk_ids = self.tmap_df[self.tmap_df.peril==peril].risk_id
                     for risk_id in risk_ids.unique():
                         rms.append(self._riskmodels[risk_id])
                 else:
                     rms.extend(self._riskmodels.values())
                 for rm in rms:
-                    try:
-                        rm.imt_by_lt[lt]
-                    except KeyError:
-                        key = '%s/%s' % (kinds[0], lt)
-                        fname = self.oqparam._risk_files[key]
-                        missing[fname].append(rm.taxonomy)
-            if missing:
-                for fname, ids in missing.items():
-                    raise InvalidFile(
-                        '%s: missing %s' % (fname, ' '.join(ids)))
+                    # NB: in event_based_risk/case_8 the loss types are
+                    # area, number, occupants, residents
+                    for lt in self.loss_types:
+                        try:
+                            rm.imt_by_lt[lt]
+                        except KeyError:
+                            key = '%s/%s/%s' % (peril, kinds[0], lt)
+                            fname = self.oqparam._risk_files[key]
+                            missing[fname].append(rm.taxonomy)
+                if missing:
+                    for fname, ids in missing.items():
+                        raise InvalidFile(
+                            '%s: missing %s %s' % (fname, peril, ' '.join(ids)))
 
     def compute_csq(self, assets, fractions, tmap_df, oq):
         """
@@ -661,7 +662,7 @@ def compute_csq(self, assets, fractions, tmap_df, oq):
                 consequence, _tagname = byname.split('_by_')
                 # by construction all assets have the same taxonomy
                 for risk_id, df in tmap_df.groupby('risk_id'):
-                    cdict = get_cdict(fractions[:, :, :, 1:], coeffs, df, oq.loss_types)
+                    cdict = get_cdict(fractions[:, :, :, 1:], coeffs, df, self.perils)
                     csq[consequence] += scientific.consequence(
                         consequence, assets, cdict, oq.total_loss_types, oq.time_event)
         return csq
@@ -669,7 +670,7 @@ def compute_csq(self, assets, fractions, tmap_df, oq):
     def init(self):
         oq = self.oqparam
         if self.risklist:
-            oq.set_risk_imts(self.risklist)
+            self.perils = oq.set_risk_imts(self.risklist)
         self.damage_states = []
         self._riskmodels = {}  # riskid -> crmodel
         if oq.calculation_mode.endswith('_bcr'):
@@ -834,15 +835,18 @@ def get_output(self, asset_df, haz, sec_losses=(), rndgen=None):
         :param haz: a DataFrame of GMVs on the sites of the assets
         :param sec_losses: a list of functions
         :param rndgen: a MultiEventRNG instance
-        :returns: a dictionary keyed by extended loss type
+        :returns: one or more dictionaries loss_type-> output
         """
         # rc.pprint()
         # dic = rc.todict()
         # rc2 = get_riskcomputer(dic)
         # dic2 = rc2.todict()
         # _assert_equal(dic, dic2)
-        return scientific.RiskComputer(self, asset_df).output(
-            haz, sec_losses, rndgen)
+        rc = scientific.RiskComputer(self, asset_df)
+        out = rc.output(haz, sec_losses, rndgen)
+        if not hasattr(haz, 'eid'):  # classical
+            return next(out)
+        return out
 
     def __iter__(self):
         return iter(sorted(self._riskmodels))
diff --git a/openquake/risklib/scientific.py b/openquake/risklib/scientific.py
index fd162554ed17..3949418a929e 100644
--- a/openquake/risklib/scientific.py
+++ b/openquake/risklib/scientific.py
@@ -71,7 +71,6 @@
 structural_ins+contents_ins+business_interruption_ins
 nonstructural_ins+contents_ins+business_interruption_ins
 structural_ins+nonstructural_ins+contents_ins+business_interruption_ins
-liquefaction landslide
 '''.split())
 
 TOTLOSSES = [lt for lt in LOSSTYPE if '+' in lt]
@@ -1660,17 +1659,20 @@ def __init__(self, crm, asset_df):
         self.imtls = oq.imtls
         self.calculation_mode = oq.calculation_mode
         self.loss_types = crm.loss_types
+        self.perils = crm.perils
         self.minimum_asset_loss = oq.minimum_asset_loss  # lt->float
-        self.wdic = {}
+        self.wdic = {}  # (riskid, peril) -> weight
         tm = crm.tmap_df[crm.tmap_df.taxi == taxidx]
         country_str = getattr(asset_df, 'country', '?')
-        for country, loss_type, riskid, weight in zip(
-                tm.country, tm.loss_type, tm.risk_id, tm.weight):
-            for lt in self.minimum_asset_loss:
-                if loss_type in ('*', lt):
-                    if country == '?' or country_str in country:
-                        self[riskid] = crm._riskmodels[riskid]
-                        self.wdic[riskid, lt] = weight
+        for country, peril, riskid, weight in zip(
+                tm.country, tm.peril, tm.risk_id, tm.weight):
+            if country == '?' or country_str in country:
+                self[riskid] = crm._riskmodels[riskid]
+                if peril == '*':
+                    for per in self.perils:
+                        self.wdic[riskid, per] = weight
+                else:
+                    self.wdic[riskid, peril] = weight
 
     def output(self, haz, sec_losses=(), rndgen=None):
         """
@@ -1679,31 +1681,32 @@ def output(self, haz, sec_losses=(), rndgen=None):
         :param haz: a DataFrame of GMFs or an array of PoEs
         :param sec_losses: a list of functions updating the loss dict
         :param rndgen: None or MultiEventRNG instance
-        :returns: loss dict {extended_loss_type: loss_output}
+        :yields: dictionaries {loss_type: loss_output}
         """
-        dic = collections.defaultdict(list)  # lt -> outs
-        weights = collections.defaultdict(list)  # lt -> weights
+        dic = collections.defaultdict(list)  # peril, lt -> outs
+        weights = collections.defaultdict(list)  # peril, lt -> weights
         for riskid, rm in self.items():
             for (peril, lt), res in rm(self.asset_df, haz, rndgen).items():
-                weights[lt].append(self.wdic[riskid, lt])
-                dic[lt].append(res)
-        out = {}
-        for lt in self.minimum_asset_loss:
-            outs = dic[lt]
-            if len(outs) == 0:  # can happen for nonstructural_ins
-                continue
-            elif len(outs) > 1 and hasattr(outs[0], 'loss'):
-                # computing the average dataframe for event_based_risk/case_8
-                out[lt] = _agg(outs, weights[lt])
-            elif len(outs) > 1:
-                # for oq-risk-tests/test/event_based_damage/inputs/cali/job.ini
-                out[lt] = numpy.average(outs, weights=weights[lt], axis=0)
-            else:
-                out[lt] = outs[0]
-        if hasattr(haz, 'eid'):  # event based
-            for update_losses in sec_losses:
-                update_losses(self.asset_df, out)
-        return out
+                weights[peril, lt].append(self.wdic[riskid, peril])
+                dic[peril, lt].append(res)
+        for peril in self.perils:
+            out = {}
+            for lt in self.minimum_asset_loss:
+                outs = dic[peril, lt]
+                if len(outs) == 0:  # can happen for nonstructural_ins
+                    continue
+                elif len(outs) > 1 and hasattr(outs[0], 'loss'):
+                    # computing the average dataframe for event_based_risk/case_8
+                    out[lt] = _agg(outs, weights[peril, lt])
+                elif len(outs) > 1:
+                    # for oq-risk-tests/test/event_based_damage/inputs/cali/job.ini
+                    out[lt] = numpy.average(outs, weights=weights[peril, lt], axis=0)
+                else:
+                    out[lt] = outs[0]
+            if hasattr(haz, 'eid'):  # event based
+                for update_losses in sec_losses:
+                    update_losses(self.asset_df, out)
+            yield out
 
     def todict(self):
         """
@@ -1739,7 +1742,7 @@ def _max(lossdic):
     if len(lossdic) == 1:
         res = lossdic[next(iter(lossdic))]
     else:
-        res = numpy.array([lossdic[lt] for lt in lossdic]).max(axis=0)
+        res = numpy.array([lossdic[peril] for peril in lossdic]).max(axis=0)
     return res
 
 
@@ -1747,7 +1750,7 @@ def _sum(lossdic):
     if len(lossdic) == 1:
         res = lossdic[next(iter(lossdic))]
     else:
-        res = sum(lossdic[lt] for lt in lossdic)
+        res = sum(lossdic[peril] for peril in lossdic)
     return res
 
 
@@ -1755,14 +1758,14 @@ def consequence(consequence, assets, coeffs, total_loss_types, time_event):
     """
     :param consequence: kind of consequence
     :param assets: asset array (shape A)
-    :param coeffs: an array of multiplicative coefficients of shape (A, E)
+    :param coeffs: a composite array of multiplicative coefficients of shape (A, E)
     :param time_event: time event string
     :returns: array of shape (A, E)
     """
     if consequence not in KNOWN_CONSEQUENCES:
         raise NotImplementedError(consequence)
     if consequence.startswith('losses'):
-        res = _max({lt: assets['value-' + lt].reshape(-1, 1) * coeffs[lt]
+        res = _max({lt: assets['value-' + lt].reshape(-1, 1) * coeffs['earthquake']
                     for lt in total_loss_types}) / assets['value-number'].reshape(-1, 1)
         return res
     elif consequence in ['collapsed', 'non_operational']: