diff --git a/app/samples/emikatScenarioDataHeatWave.json b/app/samples/emikatScenarioDataHeatWave.json
index 619d810..2a403ad 100644
--- a/app/samples/emikatScenarioDataHeatWave.json
+++ b/app/samples/emikatScenarioDataHeatWave.json
@@ -1,1143 +1,195 @@
 {
     "name": "TAB Aggregated impact for all event types",
     "description": "TAB Aggregated impact for all event types\nThe sum or AVG of the cell values are calculated for the whole study area. \nAll event tpes are included\n",
-    "columnnames": [
-        "STUDY_VARIANT",
-        "TIME_PERIOD",
-        "EMISSIONS_SCENARIO",
-        "EVENT_FREQUENCY",
-        "SZM_SZENARIO_REF",
-        "HW_EXPOSEDQUANTITY",
-        "HW_DAMAGEQUANTITY",
-        "HW_DISCOMFORT_LEVEL",
-        "HW_HEAT_WAVE_IMPACT",
-        "AO_COST_DEVELOPMENT",
-        "AO_COST_MAINTENANCE",
-        "AO_COST_RETROFITTING",
-        "PF_FLOOD_IMPACT_EURO",
-        "PF_DAMAGEPROBABILITY",
-        "PF_DAMAGE_CLASS"
-    ],
-    "rows": [
-        {
+    "columnnames": ["STUDY_VARIANT", 
+        "TIME_PERIOD", 
+        "EMISSIONS_SCENARIO", 
+        "EVENT_FREQUENCY", 
+        "SZM_SZENARIO_REF", 
+        "HW_EXPOSEDQUANTITY", 
+        "HW_DAMAGEQUANTITY", 
+        "HW_DISCOMFORT_LEVEL", 
+        "HW_HEAT_WAVE_IMPACT", 
+        "HW_ECO_IMPACT_DIRECT", 
+        "HW_ECO_IMPACT_INDIRECT", 
+        "HW_ECO_IMPACT_LIFE", 
+        "AO_COST_DEVELOPMENT", 
+        "AO_COST_MAINTENANCE", 
+        "AO_COST_RETROFITTING", 
+        "PF_FLOOD_IMPACT_EURO", 
+        "PF_ECO_IMPACT_RESIDENTAL_BLDG", 
+        "PF_ECO_IMPACT_NONRESIDENT_BLDG", 
+        "PF_ECO_IMPACT_ROAD", 
+        "PF_DAMAGEPROBABILITY", 
+        "PF_DAMAGE_CLASS"],
+    "rows": [{
             "rownum": 0,
-            "values": [
-                "ADAPTATION-01",
-                "20110101-20401231",
-                "rcp26",
-                "Frequent",
-                3183.0,
-                171640.0,
-                63.68035987323578,
-                4.0,
-                18.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20110101-20401231", "rcp26", "Frequent", 3207.0, 368987.0, 65.12586659605682, 4.0, 5.0, 515261.7225, 20889.563847984104, 1.0420138655369091E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 1,
-            "values": [
-                "ADAPTATION-01",
-                "20110101-20401231",
-                "rcp26",
-                "Occasional",
-                3183.0,
-                171640.0,
-                133.3483594401374,
-                5.0,
-                21.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20110101-20401231", "rcp26", "Occasional", 3207.0, 368987.0, 137.83160972216666, 4.0, 5.0, 523017.81, 21077.098372965116, 2.2053057555546662E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 2,
-            "values": [
-                "ADAPTATION-01",
-                "20110101-20401231",
-                "rcp26",
-                "Rare",
-                3183.0,
-                171640.0,
-                147.1376495597371,
-                5.0,
-                21.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                1.7167968376976E8,
-                84.0,
-                5.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20110101-20401231", "rcp26", "Rare", 3207.0, 368987.0, 187.2734155265588, 4.0, 5.0, 523039.0725, 21077.61247918651, 2.996374648424941E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 3,
-            "values": [
-                "ADAPTATION-01",
-                "20110101-20401231",
-                "rcp45",
-                "Frequent",
-                3183.0,
-                171640.0,
-                56.9686891745341,
-                4.0,
-                17.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20110101-20401231", "rcp45", "Frequent", 3207.0, 368987.0, 72.66039467965194, 4.0, 5.0, 519832.3725, 21000.077644612167, 1.162566314874431E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 4,
-            "values": [
-                "ADAPTATION-01",
-                "20110101-20401231",
-                "rcp45",
-                "Occasional",
-                3183.0,
-                171640.0,
-                98.10239956092705,
-                5.0,
-                20.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20110101-20401231", "rcp45", "Occasional", 3207.0, 368987.0, 152.83989892411688, 4.0, 5.0, 523039.0725, 21077.61247918651, 2.44543838278587E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 5,
-            "values": [
-                "ADAPTATION-01",
-                "20110101-20401231",
-                "rcp45",
-                "Rare",
-                3183.0,
-                171640.0,
-                147.1376495597371,
-                5.0,
-                21.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                69.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20110101-20401231", "rcp45", "Rare", 3207.0, 368987.0, 228.2525155942518, 5.0, 6.0, 523039.0725, 21077.61247918651, 3.652040249508029E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 6,
-            "values": [
-                "ADAPTATION-01",
-                "20110101-20401231",
-                "rcp85",
-                "Frequent",
-                3183.0,
-                171640.0,
-                63.68035987323578,
-                4.0,
-                18.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20110101-20401231", "rcp85", "Frequent", 3207.0, 368987.0, 72.66039467965194, 4.0, 5.0, 519832.3725, 21000.077644612167, 1.162566314874431E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 7,
-            "values": [
-                "ADAPTATION-01",
-                "20110101-20401231",
-                "rcp85",
-                "Rare",
-                3183.0,
-                171640.0,
-                120.60492783072324,
-                5.0,
-                21.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                1.7212999835216E8,
-                99.0,
-                5.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20110101-20401231", "rcp85", "Occasional", 3207.0, 368987.0, 152.83989892411688, 4.0, 5.0, 523039.0725, 21077.61247918651, 2.44543838278587E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 8,
-            "values": [
-                "ADAPTATION-01",
-                "20410101-20701231",
-                "rcp26",
-                "Frequent",
-                3183.0,
-                171640.0,
-                71.09503308230344,
-                4.0,
-                19.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20110101-20401231", "rcp85", "Rare", 3207.0, 368987.0, 187.2734155265588, 4.0, 5.0, 523039.0725, 21077.61247918651, 2.996374648424941E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.5291451353356853E9, 4.302727846968746E8, 1.0666998893522131E9, 3.217246128659735E7, 98.0, 4.0]
+        }, {
             "rownum": 9,
-            "values": [
-                "ADAPTATION-01",
-                "20410101-20701231",
-                "rcp26",
-                "Occasional",
-                3183.0,
-                171640.0,
-                108.87069318912576,
-                5.0,
-                21.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20410101-20701231", "rcp26", "Frequent", 3207.0, 368987.0, 81.00989466394627, 4.0, 5.0, 521452.26, 21039.244922293754, 1.2961583146231402E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 10,
-            "values": [
-                "ADAPTATION-01",
-                "20410101-20701231",
-                "rcp26",
-                "Rare",
-                3183.0,
-                171640.0,
-                120.60492783072324,
-                5.0,
-                21.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                69.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20410101-20701231", "rcp26", "Occasional", 3207.0, 368987.0, 169.28739659967667, 4.0, 5.0, 523039.0725, 21077.61247918651, 2.708598345594827E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 11,
-            "values": [
-                "ADAPTATION-01",
-                "20410101-20701231",
-                "rcp45",
-                "Frequent",
-                3183.0,
-                171640.0,
-                88.25182536049964,
-                5.0,
-                20.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20410101-20701231", "rcp45", "Frequent", 3207.0, 368987.0, 100.46577694031046, 4.0, 5.0, 522395.685, 21062.056005746617, 1.6074524310449675E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 12,
-            "values": [
-                "ADAPTATION-01",
-                "20410101-20701231",
-                "rcp45",
-                "Occasional",
-                3183.0,
-                171640.0,
-                120.60492783072324,
-                5.0,
-                21.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                69.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20410101-20701231", "rcp45", "Occasional", 3207.0, 368987.0, 187.2734155265588, 4.0, 5.0, 523039.0725, 21077.61247918651, 2.996374648424941E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 13,
-            "values": [
-                "ADAPTATION-01",
-                "20410101-20701231",
-                "rcp45",
-                "Rare",
-                3183.0,
-                171640.0,
-                162.0011680725032,
-                5.0,
-                21.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                1.7212999835216E8,
-                99.0,
-                5.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20410101-20701231", "rcp85", "Frequent", 3207.0, 368987.0, 137.83160972216666, 4.0, 5.0, 523017.81, 21077.098372965116, 2.2053057555546662E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 14,
-            "values": [
-                "ADAPTATION-01",
-                "20410101-20701231",
-                "rcp85",
-                "Frequent",
-                3183.0,
-                171640.0,
-                98.10239956092705,
-                5.0,
-                20.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20410101-20701231", "rcp85", "Occasional", 3207.0, 368987.0, 228.2525155942518, 5.0, 6.0, 523039.0725, 21077.61247918651, 3.652040249508029E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 15,
-            "values": [
-                "ADAPTATION-01",
-                "20410101-20701231",
-                "rcp85",
-                "Occasional",
-                3183.0,
-                171640.0,
-                162.0011680725032,
-                5.0,
-                21.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20410101-20701231", "rcp85", "Rare", 3207.0, 368987.0, 251.43306929288585, 5.0, 6.0, 523039.0725, 21077.61247918651, 4.0229291086861736E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.817486064754431E9, 4.5782860920833766E8, 1.325083933175808E9, 3.457352237028535E7, 127.0, 5.0]
+        }, {
             "rownum": 16,
-            "values": [
-                "ADAPTATION-01",
-                "20710101-21001231",
-                "rcp26",
-                "Frequent",
-                3183.0,
-                171640.0,
-                50.906361515909616,
-                4.0,
-                17.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20710101-21001231", "rcp26", "Frequent", 3207.0, 368987.0, 65.12586659605682, 4.0, 5.0, 515261.7225, 20889.563847984104, 1.0420138655369091E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 17,
-            "values": [
-                "ADAPTATION-01",
-                "20710101-21001231",
-                "rcp26",
-                "Occasional",
-                3183.0,
-                171640.0,
-                98.10239956092705,
-                5.0,
-                20.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20710101-21001231", "rcp26", "Occasional", 3207.0, 368987.0, 152.83989892411688, 4.0, 5.0, 523039.0725, 21077.61247918651, 2.44543838278587E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 18,
-            "values": [
-                "ADAPTATION-01",
-                "20710101-21001231",
-                "rcp26",
-                "Rare",
-                3183.0,
-                171640.0,
-                108.87069318912576,
-                5.0,
-                21.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                1.7167968376976E8,
-                84.0,
-                5.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20710101-21001231", "rcp26", "Rare", 3207.0, 368987.0, 169.28739659967667, 4.0, 5.0, 523039.0725, 21077.61247918651, 2.708598345594827E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 19,
-            "values": [
-                "ADAPTATION-01",
-                "20710101-21001231",
-                "rcp45",
-                "Frequent",
-                3183.0,
-                171640.0,
-                88.25182536049964,
-                5.0,
-                20.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20710101-21001231", "rcp45", "Frequent", 3207.0, 368987.0, 124.16387359644486, 4.0, 5.0, 522876.8475, 21073.690039127003, 1.9866219775431177E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 20,
-            "values": [
-                "ADAPTATION-01",
-                "20710101-21001231",
-                "rcp45",
-                "Occasional",
-                3183.0,
-                171640.0,
-                147.1376495597371,
-                5.0,
-                21.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20710101-21001231", "rcp45", "Occasional", 3207.0, 368987.0, 187.2734155265588, 4.0, 5.0, 523039.0725, 21077.61247918651, 2.996374648424941E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 21,
-            "values": [
-                "ADAPTATION-01",
-                "20710101-21001231",
-                "rcp45",
-                "Rare",
-                3183.0,
-                171640.0,
-                273.8836952622464,
-                5.0,
-                21.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                69.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20710101-21001231", "rcp45", "Rare", 3207.0, 368987.0, 206.89646154198473, 4.0, 5.0, 523039.0725, 21077.61247918651, 3.310343384671756E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.6306269792106164E9, 4.2588106568748087E8, 1.1726129437687743E9, 3.213296975436135E7, 112.0, 4.0]
+        }, {
             "rownum": 22,
-            "values": [
-                "ADAPTATION-01",
-                "20710101-21001231",
-                "rcp85",
-                "Frequent",
-                3183.0,
-                171640.0,
-                147.1376495597371,
-                5.0,
-                21.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20710101-21001231", "rcp85", "Frequent", 3207.0, 368987.0, 228.2525155942518, 5.0, 6.0, 523039.0725, 21077.61247918651, 3.652040249508029E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 23,
-            "values": [
-                "ADAPTATION-01",
-                "20710101-21001231",
-                "rcp85",
-                "Occasional",
-                3183.0,
-                171640.0,
-                252.64020420288963,
-                5.0,
-                21.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20710101-21001231", "rcp85", "Occasional", 3207.0, 368987.0, 332.72204599830485, 5.0, 6.0, 523039.0725, 21077.61247918651, 5.323552735972878E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 24,
-            "values": [
-                "ADAPTATION-01",
-                "20710101-21001231",
-                "rcp85",
-                "Rare",
-                3183.0,
-                171640.0,
-                273.8836952622464,
-                5.0,
-                21.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                69.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "20710101-21001231", "rcp85", "Rare", 3207.0, 368987.0, 432.8045821625757, 5.0, 6.0, 523039.0725, 21077.61247918651, 6.924873314601212E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.5291451353356853E9, 4.302727846968746E8, 1.0666998893522131E9, 3.217246128659735E7, 98.0, 4.0]
+        }, {
             "rownum": 25,
-            "values": [
-                "ADAPTATION-01",
-                "Baseline",
-                "Baseline",
-                "Frequent",
-                3183.0,
-                171640.0,
-                45.44130313384079,
-                4.0,
-                17.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "Baseline", "Baseline", "Frequent", 3207.0, 368987.0, 52.21917986583559, 4.0, 4.0, 495410.4225, 20409.579046915835, 8.355068778533694E7, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 26,
-            "values": [
-                "ADAPTATION-01",
-                "Baseline",
-                "Baseline",
-                "Occasional",
-                3183.0,
-                171640.0,
-                79.26729411272127,
-                5.0,
-                20.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "Baseline", "Baseline", "Occasional", 3207.0, 368987.0, 100.46577694031046, 4.0, 5.0, 522395.685, 21062.056005746617, 1.6074524310449675E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 27,
-            "values": [
-                "ADAPTATION-01",
-                "Baseline",
-                "Baseline",
-                "Rare",
-                3183.0,
-                171640.0,
-                98.10239956092705,
-                5.0,
-                20.0,
-                1229608.0,
-                0.0,
-                614794.0,
-                4.338972211625E7,
-                69.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["ADAPTATION-01", "Baseline", "Baseline", "Rare", 3207.0, 368987.0, 152.83989892411688, 4.0, 5.0, 523039.0725, 21077.61247918651, 2.44543838278587E8, 9.430754011E9, 0.0, 1.1343976415E10, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 28,
-            "values": [
-                "BASELINE",
-                "20110101-20401231",
-                "rcp26",
-                "Frequent",
-                3183.0,
-                171640.0,
-                63.68035987323578,
-                4.0,
-                18.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20110101-20401231", "rcp26", "Frequent", 3207.0, 368987.0, 70.94886342467883, 4.0, 4.0, 508004.1225, 20714.08225774905, 1.1351818147948612E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 29,
-            "values": [
-                "BASELINE",
-                "20110101-20401231",
-                "rcp26",
-                "Occasional",
-                3183.0,
-                171640.0,
-                133.3483594401374,
-                5.0,
-                21.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20110101-20401231", "rcp26", "Occasional", 3207.0, 368987.0, 151.87835509648795, 4.0, 5.0, 522734.31, 21070.24362334656, 2.4300536815438074E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 30,
-            "values": [
-                "BASELINE",
-                "20110101-20401231",
-                "rcp26",
-                "Rare",
-                3183.0,
-                171640.0,
-                147.1376495597371,
-                5.0,
-                21.0,
-                0.0,
-                0.0,
-                0.0,
-                1.7167968376976E8,
-                84.0,
-                5.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20110101-20401231", "rcp26", "Rare", 3207.0, 368987.0, 206.89900884875902, 4.0, 5.0, 523039.0725, 21077.61247918651, 3.310384141580144E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 31,
-            "values": [
-                "BASELINE",
-                "20110101-20401231",
-                "rcp45",
-                "Frequent",
-                3183.0,
-                171640.0,
-                56.9686891745341,
-                4.0,
-                17.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20110101-20401231", "rcp45", "Frequent", 3207.0, 368987.0, 79.31283010087985, 4.0, 5.0, 512334.585, 20818.788558172506, 1.2690052816140775E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 32,
-            "values": [
-                "BASELINE",
-                "20110101-20401231",
-                "rcp45",
-                "Occasional",
-                3183.0,
-                171640.0,
-                98.10239956092705,
-                5.0,
-                20.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20110101-20401231", "rcp45", "Occasional", 3207.0, 368987.0, 168.59477422631406, 4.0, 5.0, 522977.6475, 21076.12728343582, 2.697516387621025E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 33,
-            "values": [
-                "BASELINE",
-                "20110101-20401231",
-                "rcp45",
-                "Rare",
-                3183.0,
-                171640.0,
-                147.1376495597371,
-                5.0,
-                21.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                69.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20110101-20401231", "rcp45", "Rare", 3207.0, 368987.0, 252.35161448380956, 5.0, 5.0, 523039.0725, 21077.61247918651, 4.037625831740953E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 34,
-            "values": [
-                "BASELINE",
-                "20110101-20401231",
-                "rcp85",
-                "Frequent",
-                3183.0,
-                171640.0,
-                63.68035987323578,
-                4.0,
-                18.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20110101-20401231", "rcp85", "Frequent", 3207.0, 368987.0, 79.31283010087985, 4.0, 5.0, 512334.585, 20818.788558172506, 1.2690052816140775E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 35,
-            "values": [
-                "BASELINE",
-                "20110101-20401231",
-                "rcp85",
-                "Rare",
-                3183.0,
-                171640.0,
-                120.60492783072324,
-                5.0,
-                21.0,
-                0.0,
-                0.0,
-                0.0,
-                1.7212999835216E8,
-                99.0,
-                5.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20110101-20401231", "rcp85", "Occasional", 3207.0, 368987.0, 168.59477422631406, 4.0, 5.0, 522977.6475, 21076.12728343582, 2.697516387621025E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 36,
-            "values": [
-                "BASELINE",
-                "20410101-20701231",
-                "rcp26",
-                "Frequent",
-                3183.0,
-                171640.0,
-                71.09503308230344,
-                4.0,
-                19.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20110101-20401231", "rcp85", "Rare", 3207.0, 368987.0, 206.89900884875902, 4.0, 5.0, 523039.0725, 21077.61247918651, 3.310384141580144E8, 0.0, 0.0, 0.0, 1.5291451353356853E9, 4.302727846968746E8, 1.0666998893522131E9, 3.217246128659735E7, 98.0, 4.0]
+        }, {
             "rownum": 37,
-            "values": [
-                "BASELINE",
-                "20410101-20701231",
-                "rcp26",
-                "Occasional",
-                3183.0,
-                171640.0,
-                108.87069318912576,
-                5.0,
-                21.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20410101-20701231", "rcp26", "Frequent", 3207.0, 368987.0, 88.5926669833169, 4.0, 5.0, 516642.21, 20922.942670432243, 1.4174826717330703E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 38,
-            "values": [
-                "BASELINE",
-                "20410101-20701231",
-                "rcp26",
-                "Rare",
-                3183.0,
-                171640.0,
-                120.60492783072324,
-                5.0,
-                21.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                69.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20410101-20701231", "rcp26", "Occasional", 3207.0, 368987.0, 186.9013399523754, 4.0, 5.0, 523014.66, 21077.022209080467, 2.9904214392380065E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 39,
-            "values": [
-                "BASELINE",
-                "20410101-20701231",
-                "rcp45",
-                "Frequent",
-                3183.0,
-                171640.0,
-                88.25182536049964,
-                5.0,
-                20.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20410101-20701231", "rcp45", "Frequent", 3207.0, 368987.0, 110.24683707942516, 4.0, 5.0, 520824.6225, 21024.069268277115, 1.7639493932708025E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 40,
-            "values": [
-                "BASELINE",
-                "20410101-20701231",
-                "rcp45",
-                "Occasional",
-                3183.0,
-                171640.0,
-                120.60492783072324,
-                5.0,
-                21.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                69.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20410101-20701231", "rcp45", "Occasional", 3207.0, 368987.0, 206.89900884875902, 4.0, 5.0, 523039.0725, 21077.61247918651, 3.310384141580144E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 41,
-            "values": [
-                "BASELINE",
-                "20410101-20701231",
-                "rcp45",
-                "Rare",
-                3183.0,
-                171640.0,
-                162.0011680725032,
-                5.0,
-                21.0,
-                0.0,
-                0.0,
-                0.0,
-                1.7212999835216E8,
-                99.0,
-                5.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20410101-20701231", "rcp85", "Frequent", 3207.0, 368987.0, 151.87835509648795, 4.0, 5.0, 522734.31, 21070.24362334656, 2.4300536815438074E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 42,
-            "values": [
-                "BASELINE",
-                "20410101-20701231",
-                "rcp85",
-                "Frequent",
-                3183.0,
-                171640.0,
-                98.10239956092705,
-                5.0,
-                20.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20410101-20701231", "rcp85", "Occasional", 3207.0, 368987.0, 252.35161448380956, 5.0, 5.0, 523039.0725, 21077.61247918651, 4.037625831740953E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 43,
-            "values": [
-                "BASELINE",
-                "20410101-20701231",
-                "rcp85",
-                "Occasional",
-                3183.0,
-                171640.0,
-                162.0011680725032,
-                5.0,
-                21.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20410101-20701231", "rcp85", "Rare", 3207.0, 368987.0, 277.98170854425945, 5.0, 6.0, 523039.0725, 21077.61247918651, 4.4477073367081517E8, 0.0, 0.0, 0.0, 1.817486064754431E9, 4.5782860920833766E8, 1.325083933175808E9, 3.457352237028535E7, 127.0, 5.0]
+        }, {
             "rownum": 44,
-            "values": [
-                "BASELINE",
-                "20710101-21001231",
-                "rcp26",
-                "Frequent",
-                3183.0,
-                171640.0,
-                50.906361515909616,
-                4.0,
-                17.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20710101-21001231", "rcp26", "Frequent", 3207.0, 368987.0, 70.94886342467883, 4.0, 4.0, 508004.1225, 20714.08225774905, 1.1351818147948612E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 45,
-            "values": [
-                "BASELINE",
-                "20710101-21001231",
-                "rcp26",
-                "Occasional",
-                3183.0,
-                171640.0,
-                98.10239956092705,
-                5.0,
-                20.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20710101-21001231", "rcp26", "Occasional", 3207.0, 368987.0, 168.59477422631406, 4.0, 5.0, 522977.6475, 21076.12728343582, 2.697516387621025E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 46,
-            "values": [
-                "BASELINE",
-                "20710101-21001231",
-                "rcp26",
-                "Rare",
-                3183.0,
-                171640.0,
-                108.87069318912576,
-                5.0,
-                21.0,
-                0.0,
-                0.0,
-                0.0,
-                1.7167968376976E8,
-                84.0,
-                5.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20710101-21001231", "rcp26", "Rare", 3207.0, 368987.0, 186.9013399523754, 4.0, 5.0, 523014.66, 21077.022209080467, 2.9904214392380065E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 47,
-            "values": [
-                "BASELINE",
-                "20710101-21001231",
-                "rcp45",
-                "Frequent",
-                3183.0,
-                171640.0,
-                88.25182536049964,
-                5.0,
-                20.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20710101-21001231", "rcp45", "Frequent", 3207.0, 368987.0, 136.64956243845253, 4.0, 5.0, 522286.2225, 21059.40931075501, 2.1863929990152407E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 48,
-            "values": [
-                "BASELINE",
-                "20710101-21001231",
-                "rcp45",
-                "Occasional",
-                3183.0,
-                171640.0,
-                147.1376495597371,
-                5.0,
-                21.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20710101-21001231", "rcp45", "Occasional", 3207.0, 368987.0, 206.89900884875902, 4.0, 5.0, 523039.0725, 21077.61247918651, 3.310384141580144E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 49,
-            "values": [
-                "BASELINE",
-                "20710101-21001231",
-                "rcp45",
-                "Rare",
-                3183.0,
-                171640.0,
-                273.8836952622464,
-                5.0,
-                21.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                69.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20710101-21001231", "rcp45", "Rare", 3207.0, 368987.0, 228.68520828579676, 4.0, 5.0, 523039.0725, 21077.61247918651, 3.658963332572748E8, 0.0, 0.0, 0.0, 1.6306269792106164E9, 4.2588106568748087E8, 1.1726129437687743E9, 3.213296975436135E7, 112.0, 4.0]
+        }, {
             "rownum": 50,
-            "values": [
-                "BASELINE",
-                "20710101-21001231",
-                "rcp85",
-                "Frequent",
-                3183.0,
-                171640.0,
-                147.1376495597371,
-                5.0,
-                21.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20710101-21001231", "rcp85", "Frequent", 3207.0, 368987.0, 252.35161448380956, 5.0, 5.0, 523039.0725, 21077.61247918651, 4.037625831740953E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 51,
-            "values": [
-                "BASELINE",
-                "20710101-21001231",
-                "rcp85",
-                "Occasional",
-                3183.0,
-                171640.0,
-                252.64020420288963,
-                5.0,
-                21.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20710101-21001231", "rcp85", "Occasional", 3207.0, 368987.0, 367.3105779742173, 5.0, 6.0, 523039.0725, 21077.61247918651, 5.876969247587477E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 52,
-            "values": [
-                "BASELINE",
-                "20710101-21001231",
-                "rcp85",
-                "Rare",
-                3183.0,
-                171640.0,
-                273.8836952622464,
-                5.0,
-                21.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                69.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "20710101-21001231", "rcp85", "Rare", 3207.0, 368987.0, 475.9759848049291, 5.0, 6.0, 523039.0725, 21077.61247918651, 7.615615756878866E8, 0.0, 0.0, 0.0, 1.5291451353356853E9, 4.302727846968746E8, 1.0666998893522131E9, 3.217246128659735E7, 98.0, 4.0]
+        }, {
             "rownum": 53,
-            "values": [
-                "BASELINE",
-                "Baseline",
-                "Baseline",
-                "Frequent",
-                3183.0,
-                171640.0,
-                45.44130313384079,
-                4.0,
-                17.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "Baseline", "Baseline", "Frequent", 3207.0, 368987.0, 56.65180741266124, 4.0, 4.0, 488636.3925, 20245.598203263027, 9.064289186025798E7, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 54,
-            "values": [
-                "BASELINE",
-                "Baseline",
-                "Baseline",
-                "Occasional",
-                3183.0,
-                171640.0,
-                79.26729411272127,
-                5.0,
-                20.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                54.0,
-                4.0
-            ]
-        },
-        {
+            "values": ["BASELINE", "Baseline", "Baseline", "Occasional", 3207.0, 368987.0, 110.24683707942516, 4.0, 5.0, 520824.6225, 21024.069268277115, 1.7639493932708025E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
+        }, {
             "rownum": 55,
-            "values": [
-                "BASELINE",
-                "Baseline",
-                "Baseline",
-                "Rare",
-                3183.0,
-                171640.0,
-                98.10239956092705,
-                5.0,
-                20.0,
-                0.0,
-                0.0,
-                0.0,
-                4.338972211625E7,
-                69.0,
-                4.0
-            ]
+            "values": ["BASELINE", "Baseline", "Baseline", "Rare", 3207.0, 368987.0, 168.59477422631406, 4.0, 5.0, 522977.6475, 21076.12728343582, 2.697516387621025E8, 0.0, 0.0, 0.0, 1.7302268355270808E9, 5.191594877774183E8, 1.1762937322043178E9, 3.4773615545344666E7, 83.0, 4.0]
         }
     ]
 }
\ No newline at end of file
diff --git a/app/scripts/services/drupalService.js b/app/scripts/services/drupalService.js
index b1b7bcd..b7c9679 100644
--- a/app/scripts/services/drupalService.js
+++ b/app/scripts/services/drupalService.js
@@ -406,6 +406,7 @@ angular.module(
                              worldstate.iccdata[indicatorsetKeyHeatWave] = indicatorsetHeatWave;
                          }
 
+                        // DISCOMFORT_LEVEL  Mortality Rate ........................................................
                         /**
                          * This is a 'virtual' indicator that has to be calculated based on DAMAGEQUANTITY and EXPOSEDQUANTITY
                          */
@@ -419,7 +420,7 @@ angular.module(
                             indicator.value = 0;
                             indicatorsetHeatWave[indicatorKey] = indicator;
                         } else {
-                            console.warn(worldstate.name + '/' + indicatorSet.name + '/' + indicator.displayName + ' = ' + indicator.value + ' already exists!');
+                            console.warn(worldstate.name + '/' + indicatorsetHeatWave.name + '/' + indicator.displayName + ' = ' + indicator.value + ' already exists!');
                         }
 
                         // FIXME: Heavily hardcoded calculation of indicator value
@@ -436,7 +437,7 @@ angular.module(
                             indicator.value = 0;
                             indicatorsetHeatWave[indicatorKey] = indicator;
                         } else {
-                            console.warn(worldstate.name + '/' + indicatorSet.name + '/' + indicator.displayName + ' = ' + indicator.value + ' already exists!');
+                            console.warn(worldstate.name + '/' + indicatorsetHeatWave.name + '/' + indicator.displayName + ' = ' + indicator.value + ' already exists!');
                         }
                         indicator.value = column[criteriaMap['HW_DISCOMFORT_LEVEL']];
 
@@ -451,10 +452,55 @@ angular.module(
                             indicator.value = 0;
                             indicatorsetHeatWave[indicatorKey] = indicator;
                         } else {
-                            console.warn(worldstate.name + '/' + indicatorSet.name + '/' + indicator.displayName + ' = ' + indicator.value + ' already exists!');
+                            console.warn(worldstate.name + '/' + indicatorsetHeatWave.name + '/' + indicator.displayName + ' = ' + indicator.value + ' already exists!');
                         }
                         indicator.value = column[criteriaMap['HW_HEAT_WAVE_IMPACT']];
 
+                        // HW_ECO_IMPACT_DIRECT HWImpact........................................................
+                        indicatorKey = 'indicatorHeatWaveEconimicImpactDirect' + column[criteriaMap['EVENT_FREQUENCY']];
+                        indicator = indicatorsetHeatWave[indicatorKey];
+                        if (!indicator || indicator === null) {
+                            indicator = {};
+                            indicator.displayName = 'Direct Economic Impact (' + column[criteriaMap['EVENT_FREQUENCY']] + ')';
+                            indicator.iconResource = 'dollar_direct_16.png';
+                            indicator.unit = '€'; 
+                            indicator.value = 0;
+                            indicatorsetHeatWave[indicatorKey] = indicator;
+                        } else {
+                            console.warn(worldstate.name + '/' + indicatorsetHeatWave.name + '/' + indicator.displayName + ' = ' + indicator.value + ' already exists!');
+                        }
+                        indicator.value = column[criteriaMap['HW_ECO_IMPACT_DIRECT']];
+
+                        // HW_ECO_IMPACT_DIRECT HWImpact........................................................
+                        indicatorKey = 'indicatorHeatWaveEconimicImpactIndirect' + column[criteriaMap['EVENT_FREQUENCY']];
+                        indicator = indicatorsetHeatWave[indicatorKey];
+                        if (!indicator || indicator === null) {
+                            indicator = {};
+                            indicator.displayName = 'Indirect Economic Impact (' + column[criteriaMap['EVENT_FREQUENCY']] + ')';
+                            indicator.iconResource = 'dollar_direct_16.png';
+                            indicator.unit = '€'; 
+                            indicator.value = 0;
+                            indicatorsetHeatWave[indicatorKey] = indicator;
+                        } else {
+                            console.warn(worldstate.name + '/' + indicatorsetHeatWave.name + '/' + indicator.displayName + ' = ' + indicator.value + ' already exists!');
+                        }
+                        indicator.value = column[criteriaMap['HW_ECO_IMPACT_INDIRECT']];
+
+                        // HW_ECO_IMPACT_DIRECT HWImpact........................................................
+                        indicatorKey = 'indicatorHeatWaveEconimicImpactLife' + column[criteriaMap['EVENT_FREQUENCY']];
+                        indicator = indicatorsetHeatWave[indicatorKey];
+                        if (!indicator || indicator === null) {
+                            indicator = {};
+                            indicator.displayName = 'Economic Impact on Life (' + column[criteriaMap['EVENT_FREQUENCY']] + ')';
+                            indicator.iconResource = 'dollar_direct_16.png';
+                            indicator.unit = '€'; 
+                            indicator.value = 0;
+                            indicatorsetHeatWave[indicatorKey] = indicator;
+                        } else {
+                            console.warn(worldstate.name + '/' + indicatorsetHeatWave.name + '/' + indicator.displayName + ' = ' + indicator.value + ' already exists!');
+                        }
+                        indicator.value = column[criteriaMap['HW_ECO_IMPACT_LIFE']];
+
                         // PluvialFlood #######################################################################################
                         var indicatorsetKeyPluvialFlood = 'indicatorsetPluvialFlood';// + column[criteriaMap['EMISSIONS_SCENARIO']];
                         //indicator set (group of indicators)
@@ -467,7 +513,7 @@ angular.module(
                          }
 
                         // PF_DAMAGEPROBABILITY PluvialFloodDamageProbability........................................................
-                        indicatorKey = 'indicatorPluvialFloodDamageProbability' + column[criteriaMap['EVENT_FREQUENCY']];
+                        /*indicatorKey = 'indicatorPluvialFloodDamageProbability' + column[criteriaMap['EVENT_FREQUENCY']];
                         indicator = indicatorsetPluvialFlood[indicatorKey];
                         if (!indicator || indicator === null) {
                             indicator = {};
@@ -477,9 +523,9 @@ angular.module(
                             indicator.value = 0;
                             indicatorsetPluvialFlood[indicatorKey] = indicator;
                         } else {
-                            console.warn(worldstate.name + '/' + indicatorSet.name + '/' + indicator.displayName + ' = ' + indicator.value + ' already exists!');
+                            console.warn(worldstate.name + '/' + indicatorsetPluvialFlood.name + '/' + indicator.displayName + ' = ' + indicator.value + ' already exists!');
                         }
-                        indicator.value = column[criteriaMap['PF_DAMAGEPROBABILITY']];
+                        indicator.value = column[criteriaMap['PF_DAMAGEPROBABILITY']];*/
 
                         // PF_DAMAGE_CLASS PluvialFloodDamageClass........................................................
                         indicatorKey = 'indicatorPluvialFloodDamageClass' + column[criteriaMap['EVENT_FREQUENCY']];
@@ -492,12 +538,58 @@ angular.module(
                             indicator.value = 0;
                             indicatorsetPluvialFlood[indicatorKey] = indicator;
                         } else {
-                            console.warn(worldstate.name + '/' + indicatorSet.name + '/' + indicator.displayName + ' = ' + indicator.value + ' already exists!');
+                            console.warn(worldstate.name + '/' + indicatorsetPluvialFlood.name + '/' + indicator.displayName + ' = ' + indicator.value + ' already exists!');
                         }
                         indicator.value = column[criteriaMap['PF_DAMAGE_CLASS']];
 
-                        // PF_DAMAGE_CLASS PluvialFloodImpact........................................................
-                        indicatorKey = 'indicatorPluvialFloodImpact' + column[criteriaMap['EVENT_FREQUENCY']];
+                        // PF_ECO_IMPACT_RESIDENTAL_BLDG PluvialFloodImpact........................................................
+                        indicatorKey = 'indicatorPluvialFloodImpactResidentialBuildings' + column[criteriaMap['EVENT_FREQUENCY']];
+                        indicator = indicatorsetPluvialFlood[indicatorKey];
+                        if (!indicator || indicator === null) {
+                            indicator = {};
+                            indicator.displayName = 'Economic Impact: residential Buildings (' + column[criteriaMap['EVENT_FREQUENCY']] + ')';
+                            indicator.iconResource = 'dollar_direct_16.png';
+                            indicator.unit = '€'; 
+                            indicator.value = 0;
+                            indicatorsetPluvialFlood[indicatorKey] = indicator;
+                        } else {
+                            console.warn(worldstate.name + '/' + indicatorsetPluvialFlood.name + '/' + indicator.displayName + ' = ' + indicator.value + ' already exists!');
+                        }
+                        indicator.value = column[criteriaMap['PF_ECO_IMPACT_RESIDENTAL_BLDG']];
+
+                        // PF_ECO_IMPACT_NONRESIDENT_BLDG PluvialFloodImpact........................................................
+                        indicatorKey = 'indicatorPluvialFloodImpactNonresidentialBuildings' + column[criteriaMap['EVENT_FREQUENCY']];
+                        indicator = indicatorsetPluvialFlood[indicatorKey];
+                        if (!indicator || indicator === null) {
+                            indicator = {};
+                            indicator.displayName = 'Economic Impact: non-residential Buildings (' + column[criteriaMap['EVENT_FREQUENCY']] + ')';
+                            indicator.iconResource = 'dollar_direct_16.png';
+                            indicator.unit = '€'; 
+                            indicator.value = 0;
+                            indicatorsetPluvialFlood[indicatorKey] = indicator;
+                        } else {
+                            console.warn(worldstate.name + '/' + indicatorsetPluvialFlood.name + '/' + indicator.displayName + ' = ' + indicator.value + ' already exists!');
+                        }
+                        indicator.value = column[criteriaMap['PF_ECO_IMPACT_NONRESIDENT_BLDG']];
+
+                        // PF_ECO_IMPACT_ROAD PluvialFloodImpact........................................................
+                        indicatorKey = 'indicatorPluvialFloodImpactRods' + column[criteriaMap['EVENT_FREQUENCY']];
+                        indicator = indicatorsetPluvialFlood[indicatorKey];
+                        if (!indicator || indicator === null) {
+                            indicator = {};
+                            indicator.displayName = 'Economic Impact: Roads (' + column[criteriaMap['EVENT_FREQUENCY']] + ')';
+                            indicator.iconResource = 'dollar_direct_16.png';
+                            indicator.unit = '€'; 
+                            indicator.value = 0;
+                            indicatorsetPluvialFlood[indicatorKey] = indicator;
+                        } else {
+                            console.warn(worldstate.name + '/' + indicatorsetPluvialFlood.name + '/' + indicator.displayName + ' = ' + indicator.value + ' already exists!');
+                        }
+                        indicator.value = column[criteriaMap['PF_ECO_IMPACT_ROAD']];
+
+
+                        // PF_FLOOD_IMPACT_EURO PluvialFloodImpact........................................................
+                        /*indicatorKey = 'indicatorPluvialFloodImpact' + column[criteriaMap['EVENT_FREQUENCY']];
                         indicator = indicatorsetPluvialFlood[indicatorKey];
                         if (!indicator || indicator === null) {
                             indicator = {};
@@ -509,9 +601,9 @@ angular.module(
                         } else {
                             console.warn(worldstate.name + '/' + indicatorSet.name + '/' + indicator.displayName + ' = ' + indicator.value + ' already exists!');
                         }
-                        indicator.value = column[criteriaMap['PF_FLOOD_IMPACT_EURO']];
+                        indicator.value = column[criteriaMap['PF_FLOOD_IMPACT_EURO']];*/
 
-                        // Bot needed ATM!
+                        // Not needed ATM!
                         // EconomicIndicators #######################################################################################
                         /*var indicatorsetKeyAdaptationCost = 'indicatorsetAdaptationCost';// + column[criteriaMap['EMISSIONS_SCENARIO']];
                         var indicatorsetAdaptationCost = worldstate.iccdata[indicatorsetKeyAdaptationCost];