diff --git a/data/GDP_PPP_30arcsec_v3_mapped_default.csv b/data/GDP_PPP_30arcsec_v3_mapped_default.csv
index 563f9672..f0e640b3 100644
--- a/data/GDP_PPP_30arcsec_v3_mapped_default.csv
+++ b/data/GDP_PPP_30arcsec_v3_mapped_default.csv
@@ -5,128 +5,147 @@ name,GDP_PPP,country
 3152,897871.2903553953,MD
 3246,645554.8588933202,MD
 7049,1150156.4449477682,MD
-2974,1429346.9791503416,UA
-2977,1184037.1954527602,UA
-2979,852288.6407749397,UA
-2980,1141957.2320047219,UA
-3031,299907.8424350093,UA
-3032,540505.3630082514,UA
-3033,731859.4763005031,UA
-3035,314498.5956075456,UA
-3036,1395320.326728076,UA
-3037,3919945.2712070397,UA
-3038,999131.4109861901,UA
-3039,821068.8720677503,UA
-3040,1457787.5810853438,UA
-3044,335571.59866607585,UA
-3045,1064634.3405434713,UA
-3047,792971.761649712,UA
-3049,510605.4821418032,UA
-3050,3638242.4912859774,UA
-3051,444013.21109525755,UA
-3052,465181.02500159526,UA
-3065,895603.1905944779,UA
-3073,449860.38651911984,UA
-3074,1175651.877493475,UA
-3077,2135051.5999965193,UA
-3078,362168.0452884817,UA
-3079,3607981.0625132015,UA
-3080,4233498.630740752,UA
-3082,537084.8817353246,UA
-3083,2515629.8724866738,UA
-3084,4609095.285358652,UA
-3086,342242.86550652795,UA
-3088,898588.9872438356,UA
-3089,7859722.964484261,UA
-3090,1432598.033194942,UA
-3093,618419.8999497935,UA
-3095,1171283.6729280027,UA
-3099,916533.7005387213,UA
-3100,462131.02892833116,UA
-3105,1537446.5115850708,UA
-3107,445836.83944411995,UA
-3108,382432.2856035484,UA
-3109,1285538.7407001844,UA
-3144,509273.95059122046,UA
-3146,517821.1960943163,UA
-3158,735868.6569094345,UA
-3164,9448178.188636135,UA
-3165,419603.1564887444,UA
-3166,1910082.1056196615,UA
-3167,793458.5551586347,UA
-3168,491572.01905424666,UA
-3170,460316.0122962181,UA
-3171,718111.4320172183,UA
-3172,455260.41800177627,UA
-3173,4860607.447307272,UA
-3174,600762.5699649104,UA
-3176,441568.70846794057,UA
-3177,723706.4364823938,UA
-3178,491795.2492212899,UA
-3179,2235010.0852423543,UA
-3180,808969.7786791098,UA
-3181,494384.7021374778,UA
-3187,523420.95882261824,UA
-3189,330937.20319717313,UA
-3190,555126.1867613273,UA
-3197,429139.1729323294,UA
-3198,939667.6587172563,UA
-3199,596839.7472973168,UA
-3229,486477.8278959141,UA
-3230,384060.2378292379,UA
-3236,222300.2405161372,UA
-3241,278774.74923407834,UA
-4301,460033.7610668022,UA
-4305,777860.8706513179,UA
-4306,328298.17886102083,UA
-4315,952594.3443272721,UA
-4317,591335.3981133301,UA
-4318,4183589.552207593,UA
-4319,453459.41855206445,UA
-4321,514742.61839797936,UA
-4347,471467.4468032385,UA
-4357,406381.62214779935,UA
-4360,790504.0809554614,UA
-4361,307017.0281947847,UA
-4362,548853.9097539315,UA
-4363,223750.45684247348,UA
-4365,365552.4725029275,UA
-4366,769864.0166443412,UA
-4367,250689.59332008695,UA
-4370,826055.62323876,UA
-4371,21553498.561805386,UA
-4373,5156286.658862991,UA
-4374,1955130.9140082272,UA
-4377,710342.8088970713,UA
-4382,1317287.7863766842,UA
-4383,457413.23406169366,UA
-4384,992094.2980222296,UA
-4385,764851.3885718279,UA
-4387,293288.32008110516,UA
-4388,966386.7291055198,UA
-4389,477998.36752951634,UA
-4391,1070501.2872402,UA
-4401,703365.7138187529,UA
-4403,666351.2112413044,UA
-4405,258472.17047271246,UA
-4408,525173.5445454168,UA
-4409,422540.45613590744,UA
-4410,637435.7115912458,UA
-4412,811536.114127663,UA
-4413,577616.2349367477,UA
-4414,3059109.4087543595,UA
-4416,804974.7452062997,UA
-4418,313449.07977085834,UA
-4420,394810.3965127809,UA
-4424,533347.8140527328,UA
-4425,478602.6118333876,UA
-4431,368712.4787144766,UA
-4435,861893.237728863,UA
-4436,291767.3368239835,UA
-4438,482986.9769243877,UA
-4439,337802.68526181544,UA
-4440,552615.7347921608,UA
-4441,190281.90582023183,UA
-7031,275821.6175240971,UA
-7059,938564.9901396416,UA
-7063,295384.8910905448,UA
+1924,162285.16792916053,UA
+1970,751970.6071848695,UA
+2974,368873.75840156944,UA
+2977,294847.85539198935,UA
+2979,197988.13680768458,UA
+2980,301371.2491126519,UA
+3031,56925.21878805953,UA
+3032,139395.18279351242,UA
+3033,145377.8061037629,UA
+3035,52282.83655208812,UA
+3036,497950.25890516065,UA
+3037,1183293.1987702171,UA
+3038,255005.98207636533,UA
+3039,224711.50098325178,UA
+3040,342959.943226467,UA
+3044,69119.31486955672,UA
+3045,246273.65986119965,UA
+3047,146742.08407299497,UA
+3049,107265.7028733467,UA
+3050,1126147.985259493,UA
+3051,69833.56303043803,UA
+3052,67230.88206577855,UA
+3053,27019.224685201345,UA
+3054,260571.47337292184,UA
+3055,88760.94152915622,UA
+3056,101368.26196568517,UA
+3058,55752.92329667119,UA
+3059,89024.37880630122,UA
+3062,358411.291265149,UA
+3064,75081.64142862396,UA
+3065,158101.42949135564,UA
+3066,83763.89576442329,UA
+3068,173474.51218344545,UA
+3069,60327.01572375589,UA
+3070,18073.687271955278,UA
+3071,249069.43314695224,UA
+3072,220707.35700825177,UA
+3073,61342.30137462664,UA
+3074,254235.98867635374,UA
+3077,769558.9832370486,UA
+3078,132674.2315809836,UA
+3079,1388517.1478032232,UA
+3080,1861003.8718246964,UA
+3082,140123.73854745473,UA
+3083,834887.5595419679,UA
+3084,1910795.5590558557,UA
+3086,93828.36549170096,UA
+3088,347197.65113392205,UA
+3089,3754718.141734592,UA
+3090,521912.69768585655,UA
+3093,232818.05269714879,UA
+3095,435376.20361377904,UA
+3099,345596.5288937008,UA
+3100,175689.10947424968,UA
+3105,538438.9311459162,UA
+3107,88096.86032871014,UA
+3108,79847.68447063807,UA
+3109,348504.73449373,UA
+3144,71657.0165675802,UA
+3146,80342.05037424155,UA
+3158,74465.12922576343,UA
+3164,3102112.2672631275,UA
+3165,65215.04081671433,UA
+3166,413924.2225725632,UA
+3167,135060.0056434935,UA
+3168,54980.442979330146,UA
+3170,29584.879122227037,UA
+3171,142780.68163047134,UA
+3172,40436.63814695243,UA
+3173,1253342.1790126422,UA
+3174,173842.03139155387,UA
+3176,65699.76352408895,UA
+3177,143591.75419817626,UA
+3178,56434.04525832523,UA
+3179,389996.1670051216,UA
+3180,138452.84503524794,UA
+3181,67402.59500436619,UA
+3184,51204.293695376415,UA
+3185,46867.82356528432,UA
+3186,103892.35612417295,UA
+3187,193668.91476930346,UA
+3189,54584.176457692694,UA
+3190,219077.64942830536,UA
+3197,88516.52699983507,UA
+3198,298166.8272673622,UA
+3199,61334.952541812374,UA
+3229,175692.61136747137,UA
+3230,106722.62773321665,UA
+3236,61542.06264321315,UA
+3241,83752.90489164277,UA
+4301,48419.52825967164,UA
+4305,147759.74280349456,UA
+4306,53156.905740992224,UA
+4315,218025.78516351627,UA
+4317,155240.40554731718,UA
+4318,1342144.2459407183,UA
+4319,91669.1449633853,UA
+4321,85852.49282415409,UA
+4347,67938.7698430624,UA
+4357,20064.979012172935,UA
+4360,47840.51245168512,UA
+4361,55580.924388032574,UA
+4362,165753.82588729708,UA
+4363,46390.2448142152,UA
+4365,96265.47592938849,UA
+4366,272003.25510057947,UA
+4367,80878.50229245829,UA
+4370,330072.35444044066,UA
+4371,7707066.181975477,UA
+4373,2019766.7891575783,UA
+4374,985354.331818515,UA
+4377,230805.08833664874,UA
+4382,125670.67125287943,UA
+4383,46914.065511740075,UA
+4384,48020.804310510954,UA
+4385,55612.34707641123,UA
+4387,74558.3475791577,UA
+4388,245243.33449409154,UA
+4389,95696.56767732685,UA
+4391,251085.7523045193,UA
+4401,66375.82996856027,UA
+4403,111954.41038437477,UA
+4405,46911.68560148837,UA
+4408,150782.51691456966,UA
+4409,112776.7399582134,UA
+4410,153076.56860965435,UA
+4412,192629.31238456024,UA
+4413,181295.3120834606,UA
+4414,995694.9413199169,UA
+4416,157640.7868989174,UA
+4418,77580.20674809469,UA
+4420,122320.99275223716,UA
+4424,184891.10924920067,UA
+4425,84486.75974340564,UA
+4431,50485.84380961137,UA
+4435,231040.45446464577,UA
+4436,81222.18707585508,UA
+4438,114819.76472988473,UA
+4439,76839.1052178896,UA
+4440,135337.0313562152,UA
+4441,49159.485269198034,UA
+7031,42001.73757065917,UA
+7059,159790.48382874,UA
+7063,39599.10564971086,UA