diff --git a/app/src/main/assets/aeqd01.svg b/app/src/main/assets/aeqd01.svg
index 4694818..139d9ef 100644
--- a/app/src/main/assets/aeqd01.svg
+++ b/app/src/main/assets/aeqd01.svg
@@ -1980,7 +1980,6 @@
 <path d="M 414.22 494.39 414.21 494.37 414.15 494.39 414.15 494.39 414.1 494.38 414.1 494.37 414.1 494.35 414.05 494.35 414.04 494.36 414.03 494.36 414.02 494.33 414.02 494.32 414 494.33 414 494.34 413.98 494.35 413.95 494.31 413.95 494.3 413.89 494.14 413.9 494.1 413.9 494.08 413.93 494.11 413.93 494.12 413.98 494.12 414.16 494.09 414.19 494.1 414.21 494.11 414.23 494.12 414.41 494.19 414.42 494.22 414.41 494.22 414.4 494.24 414.4 494.25 414.38 494.29 414.37 494.3 414.28 494.37 414.26 494.37 414.23 494.4 414.22 494.4 414.22 494.39 Z" id="CHE_ZG" data-gid_0="CHE" data-country="Switzerland" data-gid="CHE_ZG" data-name="Zug"></path>
 <path d="M 414.16 494.09 413.98 494.12 413.93 494.12 413.93 494.11 413.89 494.06 413.94 493.91 413.95 493.88 413.76 493.6 413.77 493.57 413.74 493.53 413.75 493.5 413.76 493.51 413.78 493.46 413.82 493.42 413.82 493.38 413.84 493.38 413.85 493.38 413.88 493.36 413.95 493.23 413.95 493.21 413.96 493.21 414 493.22 414.04 493.24 414.04 493.27 414.05 493.28 414.08 493.27 414.09 493.25 414.09 493.25 414.09 493.21 414.08 493.17 414.1 493.18 414.11 493.18 414.13 493.17 414.13 493.15 414.13 493.13 414.12 493.04 414.17 493.05 414.17 493.05 414.18 493.06 414.18 493.06 414.19 493.06 414.18 493.07 414.23 493.12 414.32 493.13 414.7 493.62 414.73 493.65 414.74 493.66 414.75 493.66 414.81 493.75 414.81 493.8 414.56 493.97 414.57 494.03 414.55 494.03 414.38 494.15 414.4 494.18 414.41 494.19 414.23 494.12 414.21 494.11 414.19 494.1 414.16 494.09 Z" id="CHE_ZH" data-gid_0="CHE" data-country="Switzerland" data-gid="CHE_ZH" data-name="Zürich"></path>
 </g><g id="UKR1">
-<path d="M 444.98 475.59 444.99 475.61 444.93 475.95 444.94 475.95 444.88 475.94 444.86 475.9 444.83 475.84 444.98 475.59 Z" id="UKR_?" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_?" data-name="?"></path>
 <path d="M 446.13 479.99 446.13 479.98 444.98 478.74 445.27 478.51 445.24 478.45 446.49 477.56 447.09 474.97 447.11 474.97 449.24 476.2 447.6 478.43 446.81 478.91 446.65 479.59 446.39 479.81 446.37 479.93 446.26 479.94 446.23 479.93 446.19 479.97 446.17 479.97 446.13 479.99 Z" id="UKR_CK" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_CK" data-name="Cherkasy"></path>
 <path d="M 445.79 474.98 443.78 474.23 443.79 474.23 443.39 472.37 444.39 471.67 444.41 471.68 444.42 471.67 446.15 469.94 446.15 469.95 447.98 473.64 447 474.72 445.85 474.99 445.79 474.98 Z" id="UKR_CH" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_CH" data-name="Chernihiv"></path>
 <path d="M 439.64 485.28 439.63 485.27 439.63 485.23 439.75 482.9 441.07 482.62 441.06 482.6 442.31 481.73 442.47 481.75 442.57 481.9 442.64 481.94 442.67 481.93 442.71 481.94 442.68 481.97 442.43 482.29 442.38 482.34 441.83 482.5 441.62 482.67 441.82 482.71 441.86 482.81 441.62 482.78 441.63 482.88 441.59 482.98 441.6 483.02 441.62 483.02 441.61 483.03 441.62 483.05 441.59 483.08 441.56 483.08 441.56 483.11 441.57 483.12 441.53 483.14 441.53 483.17 441.51 483.18 441.34 483.33 441.3 483.35 441.14 483.93 441.06 483.96 440.78 484.14 440.73 484.18 439.93 484.97 439.91 485 439.8 485.19 439.78 485.21 439.71 485.24 439.64 485.28 439.64 485.28 Z" id="UKR_CV" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_CV" data-name="Chernivtsi"></path>
@@ -1992,7 +1991,7 @@
 <path d="M 451.7 482.64 451.71 482.64 451.69 482.64 451.7 482.64 Z M 450.79 482.79 450.87 482.89 450.78 482.83 450.73 482.74 450.79 482.79 Z M 452.18 482.51 450.5 482.37 450.51 482.37 451.52 481.93 451.51 481.94 451.6 481.9 451.62 481.89 451.65 481.88 451.67 481.87 451.71 481.86 451.72 481.86 451.77 481.84 451.8 481.82 451.85 481.77 451.89 481.7 451.89 481.69 451.82 481.75 451.8 481.76 451.77 481.82 451.76 481.83 451.76 481.82 451.69 481.83 451.74 481.8 451.69 481.79 451.69 481.78 451.7 481.76 451.67 481.77 451.67 481.76 451.65 481.76 451.64 481.75 451.64 481.74 451.65 481.73 451.63 481.72 451.64 481.68 451.61 481.66 451.6 481.66 451.58 481.67 451.58 481.66 451.51 481.67 451.14 481.81 451.1 481.8 451.13 481.74 451.21 481.65 451.17 481.56 451.32 481.23 451.94 480.83 452.22 480.15 451.54 479.1 452.71 478.52 452.75 478.5 453.13 478.34 455.86 479.54 455.86 479.56 455.87 479.63 455.75 479.77 455.68 479.84 455.64 479.93 455.63 479.97 455.64 480 455.71 480.1 455.73 480.12 455.75 480.14 455.81 480.21 455.82 480.25 454.78 481.07 454.05 481.29 453.96 481.24 454 481.42 453.94 481.44 453.91 481.5 453.91 481.5 453.93 481.53 453.98 481.55 454 481.54 454 481.55 453.98 481.56 453.96 481.57 453.94 481.57 453.91 481.56 453.87 481.63 453.83 481.63 453.62 481.68 453.6 481.67 453.47 481.69 453.44 481.69 453.36 481.49 453.35 481.49 452.55 482.35 452.53 482.4 452.52 482.4 452.18 482.51 Z M 451.45 482.22 451.45 482.22 451.45 482.21 451.45 482.22 Z M 451.16 482.62 451.15 482.62 451.16 482.61 451.16 482.62 Z M 451.68 481.83 451.67 481.83 451.65 481.82 451.68 481.83 Z M 452.57 482.38 452.6 482.36 452.73 482.31 452.85 482.27 452.99 482.2 453.03 482.1 453.35 482.03 453.1 482.17 452.88 482.27 452.6 482.36 452.57 482.38 452.57 482.38 Z" fill-rule="evenodd" id="UKR_KS" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_KS" data-name="Kherson"></path>
 <path d="M 441.06 482.6 441.06 482.59 439.14 479.49 440.1 478.04 441.19 478.52 441.23 478.97 441.51 479.24 441.63 479.22 441.71 479.24 441.73 479.28 441.78 479.27 441.8 479.25 441.81 479.23 441.83 479.24 442.31 481.73 441.06 482.6 Z" id="UKR_KM" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_KM" data-name="Khmel'nyts'kyy"></path>
 <path d="M 445.24 478.45 445.27 478.51 444.98 478.74 444.24 478.12 444.19 478.11 442.11 474.87 443.77 474.24 443.78 474.23 445.79 474.98 445.85 474.99 447 474.72 447.03 474.96 447.09 474.97 446.49 477.56 445.24 478.45 Z M 445.1 476.03 445.06 476.02 444.95 475.98 444.93 475.95 444.99 475.61 444.98 475.59 444.31 475.65 444.28 475.87 445.1 476.03 Z" fill-rule="evenodd" id="UKR_KV" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_KV" data-name="Kiev"></path>
-<path d="M 444.86 475.9 444.88 475.94 444.94 475.95 444.95 475.98 445.06 476.02 445.1 476.03 444.28 475.87 444.31 475.65 444.98 475.59 444.98 475.59 444.83 475.84 444.86 475.9 Z" id="UKR_KC" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_KC" data-name="KievCity"></path>
+<path d="M 444.86 475.9 444.88 475.94 444.94 475.95 444.95 475.98 445.06 476.02 445.1 476.03 444.28 475.87 444.31 475.65 444.98 475.59 444.98 475.59 444.83 475.84 444.86 475.9 Z M 444.98 475.59 444.99 475.61 444.93 475.95 444.94 475.95 444.88 475.94 444.86 475.9 444.83 475.84 444.98 475.59 Z" id="UKR_KC" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_KC" data-name="KievCity"></path>
 <path d="M 450.54 478.67 449.53 479.69 447 480.38 446.16 480.65 446.12 480.6 446.16 480.02 446.13 479.99 446.17 479.97 446.19 479.97 446.23 479.93 446.26 479.94 446.37 479.93 446.39 479.81 446.65 479.59 446.81 478.91 447.6 478.43 449.24 476.2 451.07 475.92 450.96 478.38 450.61 478.62 450.54 478.67 Z" id="UKR_KH" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_KH" data-name="Kirovohrad"></path>
 <path d="M 436.67 484.18 435.48 484.01 435.46 484 435.41 483.94 435.4 483.94 435.4 483.93 435.39 483.92 435.38 483.92 435.38 483.91 435.38 483.9 435.39 483.88 435.39 483.85 435.39 483.84 435.38 483.84 435.31 481.11 435.33 481.07 435.33 481.07 435.74 480.5 435.77 480.49 435.83 480.19 435.8 480.12 435.75 479.96 435.74 479.95 437.47 479.97 437.82 480.31 437.9 480.36 438.07 480.43 437.65 481.84 437.66 481.87 437.66 481.88 437.63 481.9 437.54 481.92 437.28 481.91 437.19 482.06 437.47 482.7 436.61 483.24 436.67 484.18 Z M 435.79 480.47 435.78 480.47 435.8 480.46 435.79 480.47 Z" fill-rule="evenodd" id="UKR_LV" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_LV" data-name="L'viv"></path>
 <path d="M 459.26 472.62 459.07 472.79 459.06 472.79 459.02 472.77 458.96 472.63 458.83 472.56 457.66 472.75 456.87 472.04 456.08 471.58 455.85 471.68 455.78 471.64 455.79 471.58 455.71 471.59 455.68 471.57 455.64 471.56 455.63 471.55 454.93 470.24 455.56 469.59 456.19 469.56 456.5 469.22 456.52 469.25 456.55 469.27 458.02 468.71 458.1 468.74 459.69 471.11 459.29 472.59 459.26 472.62 Z" id="UKR_LH" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_LH" data-name="Luhans'k"></path>
diff --git a/app/src/main/assets/geoloc_state.txt b/app/src/main/assets/geoloc_state.txt
index 43947f9..b1df350 100644
--- a/app/src/main/assets/geoloc_state.txt
+++ b/app/src/main/assets/geoloc_state.txt
@@ -1356,7 +1356,7 @@ ITA_19|ITA|Sicily|25787
 ITA_52|ITA|Toscana|23025
 ITA_32|ITA|Trentino-Alto Adige|13591
 ITA_55|ITA|Umbria|8456
-ITA_23|ITA|Valled'Aosta|3248
+ITA_23|ITA|Valle d'Aosta|3248
 ITA_34|ITA|Veneto|17893
 JAM_CL|JAM|Clarendon|1210
 JAM_HA|JAM|Hanover|457
@@ -3340,7 +3340,6 @@ UGA_SR|UGA|Soroti|3401
 UGA_TR|UGA|Tororo|1863
 UGA_WA|UGA|Wakiso|1944
 UGA_YU|UGA|Yumbe|2337
-UKR_?|UKR|?|136
 UKR_CK|UKR|Cherkasy|20922
 UKR_CH|UKR|Chernihiv|32416
 UKR_CV|UKR|Chernivtsi|8202
diff --git a/app/src/main/assets/loxim01.svg b/app/src/main/assets/loxim01.svg
index 40e410b..2a9bfb8 100644
--- a/app/src/main/assets/loxim01.svg
+++ b/app/src/main/assets/loxim01.svg
@@ -1980,7 +1980,6 @@
 <path d="M 415.36 82.69 415.35 82.68 415.28 82.68 415.28 82.69 415.22 82.67 415.22 82.65 415.22 82.63 415.17 82.63 415.15 82.63 415.14 82.64 415.14 82.61 415.13 82.6 415.11 82.6 415.1 82.61 415.08 82.62 415.05 82.57 415.05 82.56 415.01 82.39 415.03 82.36 415.03 82.34 415.05 82.37 415.05 82.38 415.11 82.39 415.33 82.39 415.37 82.4 415.38 82.42 415.41 82.43 415.6 82.52 415.62 82.55 415.61 82.55 415.59 82.57 415.59 82.58 415.56 82.62 415.54 82.63 415.43 82.68 415.42 82.69 415.37 82.71 415.36 82.71 415.36 82.69 Z" id="CHE_ZG" data-gid_0="CHE" data-country="Switzerland" data-gid="CHE_ZG" data-name="Zug"></path>
 <path d="M 415.33 82.39 415.11 82.39 415.05 82.38 415.05 82.37 415.02 82.32 415.09 82.17 415.11 82.14 414.92 81.84 414.93 81.81 414.9 81.76 414.92 81.74 414.93 81.75 414.96 81.7 415.01 81.67 415.01 81.63 415.04 81.63 415.05 81.63 415.09 81.62 415.19 81.5 415.2 81.48 415.21 81.48 415.25 81.5 415.29 81.52 415.29 81.55 415.3 81.56 415.34 81.56 415.35 81.54 415.36 81.54 415.36 81.5 415.35 81.46 415.38 81.47 415.39 81.47 415.41 81.46 415.42 81.45 415.42 81.43 415.42 81.34 415.47 81.35 415.47 81.36 415.48 81.36 415.48 81.36 415.49 81.37 415.49 81.37 415.54 81.44 415.64 81.45 416.02 82 416.06 82.04 416.07 82.04 416.08 82.05 416.14 82.15 416.14 82.2 415.81 82.33 415.82 82.39 415.79 82.39 415.58 82.48 415.6 82.51 415.6 82.52 415.41 82.43 415.38 82.42 415.37 82.4 415.33 82.39 Z" id="CHE_ZH" data-gid_0="CHE" data-country="Switzerland" data-gid="CHE_ZH" data-name="Zürich"></path>
 </g><g id="UKR1">
-<path d="M 457.71 75.15 457.71 75.17 457.48 75.43 457.48 75.44 457.43 75.4 457.42 75.36 457.42 75.29 457.71 75.15 Z" id="UKR_?" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_?" data-name="?"></path>
 <path d="M 456.98 79.56 456.98 79.55 456.24 77.89 456.68 77.83 456.66 77.77 458.52 77.63 458.89 76.62 460.48 75.73 460.5 75.74 462.33 77.94 458.24 78.97 458.13 79.38 457.75 79.48 457.36 79.53 457.27 79.62 457.14 79.58 457.12 79.56 457.05 79.57 457.03 79.56 456.98 79.56 Z" id="UKR_CK" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_CK" data-name="Cherkasy"></path>
 <path d="M 458.96 75.05 456.94 73.36 456.96 73.36 457.39 71.55 458.95 71.47 458.97 71.48 458.99 71.48 461.98 70.96 461.97 70.96 461.72 73.74 462.18 75.08 460.5 75.46 459.02 75.09 458.96 75.05 Z" id="UKR_CH" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_CH" data-name="Chernihiv"></path>
 <path d="M 447.37 81.27 447.37 81.27 447.38 81.22 448.43 79.15 450.06 79.48 450.05 79.47 451.85 79.25 452.02 79.34 452.08 79.52 452.14 79.59 452.18 79.6 452.22 79.62 452.18 79.63 451.76 79.8 451.68 79.83 450.97 79.72 450.8 80.04 450.63 79.88 450.59 79.97 450.51 80.04 450.51 80.08 450.53 80.09 450.51 80.1 450.52 80.12 450.47 80.13 450.44 80.12 450.42 80.14 450.43 80.16 450.38 80.16 450.36 80.18 450.34 80.18 450.08 80.24 450.02 80.25 449.62 80.7 449.5 80.69 449.12 80.73 449.05 80.74 447.82 81.12 447.79 81.13 447.59 81.26 447.57 81.27 447.48 81.27 447.38 81.27 447.37 81.27 Z" id="UKR_CV" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_CV" data-name="Chernivtsi"></path>
@@ -1992,7 +1991,7 @@
 <path d="M 461.9 84.74 461.91 84.75 461.89 84.74 461.9 84.74 Z M 460.86 84.38 460.89 84.51 460.82 84.41 460.81 84.31 460.86 84.38 Z M 462.49 84.88 460.74 83.87 460.75 83.88 462.05 84.04 462.04 84.04 462.15 84.06 462.18 84.06 462.22 84.06 462.24 84.06 462.28 84.08 462.3 84.08 462.36 84.09 462.41 84.1 462.48 84.08 462.56 84.04 462.56 84.03 462.46 84.04 462.44 84.04 462.37 84.08 462.36 84.08 462.36 84.06 462.28 84.04 462.35 84.04 462.3 84.01 462.31 84 462.32 83.98 462.29 83.98 462.28 83.97 462.27 83.96 462.27 83.95 462.27 83.93 462.28 83.93 462.27 83.91 462.29 83.89 462.27 83.86 462.26 83.85 462.24 83.84 462.24 83.84 462.15 83.81 461.7 83.73 461.66 83.7 461.71 83.67 461.84 83.63 461.85 83.53 462.17 83.33 463.49 83.28 463.44 81.64 465.02 81.81 465.07 81.81 465.56 81.9 467.89 84.45 467.88 84.47 467.85 84.53 467.65 84.57 467.54 84.6 467.45 84.65 467.43 84.68 467.42 84.71 467.44 84.82 467.45 84.85 467.46 84.89 467.49 84.98 467.48 85.01 465.97 85.1 465.08 84.88 465.01 84.79 464.96 84.96 464.88 84.95 464.83 84.98 464.83 84.98 464.84 85.01 464.88 85.06 464.89 85.06 464.89 85.06 464.87 85.07 464.85 85.06 464.82 85.05 464.8 85.03 464.73 85.06 464.68 85.04 464.43 84.97 464.41 84.95 464.26 84.9 464.23 84.88 464.24 84.67 464.23 84.66 462.95 84.95 462.92 84.98 462.9 84.98 462.49 84.88 Z M 461.83 84.25 461.83 84.25 461.84 84.24 461.83 84.25 Z M 461.33 84.43 461.32 84.43 461.33 84.43 461.33 84.43 Z M 462.27 84.03 462.25 84.03 462.24 84.01 462.27 84.03 Z M 462.97 84.98 463 84.98 463.17 85.01 463.32 85.05 463.5 85.06 463.59 85 463.63 85.1 463.35 85.06 463.01 84.99 462.96 84.99 462.97 84.98 Z" fill-rule="evenodd" id="UKR_KS" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_KS" data-name="Kherson"></path>
 <path d="M 450.05 79.47 450.05 79.45 449.62 79.15 449.07 75.8 450.81 74.93 451.87 75.78 451.76 76.28 451.97 76.66 452.15 76.64 452.14 76.73 452.22 76.79 452.28 76.8 452.31 76.8 452.33 76.79 452.35 76.8 452.62 77.96 451.85 79.25 450.05 79.47 Z" id="UKR_KM" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_KM" data-name="Khmel'nyts'kyy"></path>
 <path d="M 456.66 77.77 456.68 77.83 456.24 77.89 455.66 76.98 455.6 76.94 455.86 76.18 454.65 73.07 456.93 73.36 456.94 73.36 458.96 75.05 459.02 75.09 460.5 75.46 460.42 75.69 460.48 75.73 458.89 76.62 458.52 77.63 456.66 77.77 Z M 457.64 75.59 457.6 75.57 457.49 75.47 457.48 75.43 457.71 75.17 457.71 75.15 456.89 74.86 456.76 75.04 457.4 75.62 457.64 75.59 Z" fill-rule="evenodd" id="UKR_KV" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_KV" data-name="Kiev"></path>
-<path d="M 457.42 75.36 457.43 75.4 457.48 75.44 457.49 75.47 457.6 75.57 457.64 75.59 457.4 75.62 456.76 75.04 456.89 74.86 457.71 75.15 457.71 75.15 457.42 75.29 457.42 75.36 Z" id="UKR_KC" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_KC" data-name="KievCity"></path>
+<path d="M 457.42 75.36 457.43 75.4 457.48 75.44 457.49 75.47 457.6 75.57 457.64 75.59 457.4 75.62 456.76 75.04 456.89 74.86 457.71 75.15 457.71 75.15 457.42 75.29 457.42 75.36 Z M 457.71 75.15 457.71 75.17 457.48 75.43 457.48 75.44 457.43 75.4 457.42 75.36 457.42 75.29 457.71 75.15 Z" id="UKR_KC" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_KC" data-name="KievCity"></path>
 <path d="M 462.55 80.73 460.93 81.06 459.4 80.18 457.78 80.34 456.7 80.15 456.69 80.08 456.99 79.6 456.98 79.56 457.03 79.56 457.05 79.57 457.12 79.56 457.14 79.58 457.27 79.62 457.36 79.53 457.75 79.48 458.13 79.38 458.24 78.97 462.33 77.94 464.53 78.71 463.15 80.72 462.65 80.74 462.55 80.73 Z" id="UKR_KH" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_KH" data-name="Kirovohrad"></path>
 <path d="M 444.36 79.04 443.01 78.4 443 78.39 442.95 78.31 442.95 78.31 442.95 78.3 442.94 78.29 442.94 78.28 442.94 78.28 442.94 78.27 442.96 78.25 442.97 78.22 442.97 78.21 442.96 78.21 442.36 77.24 443.85 75.65 443.9 75.63 443.9 75.63 444.6 75.26 444.64 75.27 444.83 75.01 444.82 74.94 444.82 74.77 444.81 74.75 446.89 75.5 447.17 75.97 447.24 76.04 447.42 76.18 446.37 77.29 446.38 77.32 446.36 77.33 446.33 77.33 446.22 77.31 445.91 77.2 445.56 78.09 444.62 78.15 444.36 79.04 Z M 444.67 75.26 444.67 75.26 444.69 75.25 444.67 75.26 Z" fill-rule="evenodd" id="UKR_LV" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_LV" data-name="L'viv"></path>
 <path d="M 475.33 80.96 475.02 80.97 475 80.97 474.98 80.92 474.99 80.78 474.89 80.65 473.52 80.05 473.01 78.83 472.54 78.39 472.48 78.14 472.23 78.1 472.16 77.96 472.07 77.92 472.05 77.89 472.01 77.85 472 77.84 471.99 76.37 473.08 76.24 473.79 76.62 474.34 76.55 474.35 76.59 474.37 76.62 476.33 77.13 476.4 77.21 475.78 78.44 476.67 80.07 475.38 80.96 475.33 80.96 Z" id="UKR_LH" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_LH" data-name="Luhans'k"></path>
diff --git a/app/src/main/assets/webmercator01.svg b/app/src/main/assets/webmercator01.svg
index 570189c..763aad3 100644
--- a/app/src/main/assets/webmercator01.svg
+++ b/app/src/main/assets/webmercator01.svg
@@ -1980,7 +1980,6 @@
 <path d="M 418.99 249.9 418.99 249.88 418.91 249.88 418.9 249.89 418.84 249.86 418.84 249.84 418.84 249.81 418.78 249.8 418.76 249.81 418.75 249.82 418.75 249.78 418.74 249.76 418.72 249.77 418.71 249.78 418.69 249.79 418.65 249.73 418.65 249.71 418.61 249.46 418.64 249.41 418.64 249.39 418.66 249.42 418.66 249.44 418.73 249.46 418.97 249.46 419.02 249.47 419.03 249.5 419.06 249.52 419.28 249.65 419.29 249.69 419.28 249.69 419.26 249.72 419.26 249.74 419.23 249.79 419.21 249.81 419.08 249.88 419.06 249.89 419.01 249.92 418.99 249.92 418.99 249.9 Z" id="CHE_ZG" data-gid_0="CHE" data-country="Switzerland" data-gid="CHE_ZG" data-name="Zug"></path>
 <path d="M 418.97 249.46 418.73 249.46 418.66 249.44 418.66 249.42 418.63 249.35 418.72 249.14 418.74 249.1 418.55 248.66 418.56 248.61 418.53 248.54 418.55 248.51 418.56 248.51 418.59 248.45 418.66 248.4 418.66 248.34 418.69 248.34 418.7 248.34 418.74 248.32 418.87 248.15 418.88 248.12 418.89 248.12 418.94 248.15 418.98 248.18 418.98 248.23 418.99 248.24 419.03 248.24 419.05 248.21 419.05 248.22 419.06 248.15 419.05 248.09 419.08 248.11 419.1 248.11 419.12 248.1 419.13 248.07 419.13 248.04 419.14 247.92 419.19 247.93 419.2 247.94 419.2 247.94 419.2 247.95 419.22 247.95 419.21 247.96 419.27 248.06 419.38 248.08 419.78 248.88 419.82 248.94 419.82 248.95 419.84 248.97 419.9 249.11 419.9 249.18 419.52 249.37 419.53 249.46 419.5 249.46 419.25 249.58 419.28 249.63 419.28 249.65 419.06 249.52 419.03 249.5 419.02 249.47 418.97 249.46 Z" id="CHE_ZH" data-gid_0="CHE" data-country="Switzerland" data-gid="CHE_ZH" data-name="Zürich"></path>
 </g><g id="UKR1">
-<path d="M 468.18 238.53 468.18 238.57 467.87 238.98 467.87 238.99 467.81 238.92 467.81 238.86 467.82 238.75 468.18 238.53 Z" id="UKR_?" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_?" data-name="?"></path>
 <path d="M 466.46 245.27 466.46 245.25 465.94 242.75 466.45 242.66 466.45 242.56 468.59 242.35 471.25 239.43 471.27 239.45 472.88 242.82 471.29 243.73 468.01 244.38 467.35 245.14 466.89 245.22 466.77 245.36 466.64 245.31 466.61 245.27 466.54 245.29 466.52 245.27 466.46 245.27 Z" id="UKR_CK" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_CK" data-name="Cherkasy"></path>
 <path d="M 469.65 238.37 467.69 235.71 467.71 235.71 468.61 232.82 470.45 232.69 470.47 232.71 470.49 232.71 474.1 231.86 474.09 231.87 473.13 236.32 473.36 238.43 471.33 239.02 469.71 238.43 469.65 238.37 Z" id="UKR_CH" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_CH" data-name="Chernihiv"></path>
 <path d="M 455.27 247.81 455.27 247.81 455.28 247.74 456.8 244.66 458.6 245.15 458.6 245.13 460.68 244.81 460.86 244.94 460.89 245.21 460.95 245.31 460.99 245.33 461.03 245.37 460.98 245.38 460.48 245.64 460.39 245.67 459.6 245.51 459.24 245.6 459.47 245.78 459.45 245.94 459.16 245.76 459.13 245.89 459.02 245.99 459.01 246.05 459.03 246.06 459.01 246.08 459.01 246.11 458.96 246.12 458.93 246.1 458.9 246.14 458.91 246.17 458.86 246.17 458.83 246.2 458.8 246.2 458.49 246.29 458.44 246.3 457.9 246.97 457.77 246.95 457.33 247.01 457.25 247.03 455.8 247.59 455.76 247.61 455.51 247.8 455.49 247.81 455.38 247.81 455.27 247.81 455.27 247.81 Z" id="UKR_CV" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_CV" data-name="Chernivtsi"></path>
@@ -1991,8 +1990,8 @@
 <path d="M 477.72 243.11 478.54 241.29 477.35 240.24 477.55 239.94 477.5 239.81 477.5 239.65 477.54 239.65 479.04 238.9 483.11 238.67 484.31 240.42 483.95 242.67 483.95 242.71 481.43 244.83 481.43 244.85 481.39 244.85 481.37 244.87 481.33 244.85 481.25 244.93 481.11 244.94 480.85 244.73 480.64 245.07 479.45 243.78 477.72 243.11 Z" id="UKR_KK" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_KK" data-name="Kharkiv"></path>
 <path d="M 471.01 252.85 471.02 252.87 471 252.85 471.01 252.85 Z M 469.91 252.34 469.92 252.52 469.85 252.39 469.87 252.24 469.91 252.34 Z M 471.64 253.06 469.87 251.61 469.88 251.62 471.31 251.85 471.3 251.85 471.42 251.88 471.45 251.88 471.49 251.89 471.52 251.89 471.56 251.91 471.58 251.91 471.65 251.93 471.7 251.94 471.79 251.91 471.88 251.85 471.88 251.84 471.77 251.86 471.74 251.86 471.66 251.91 471.65 251.91 471.65 251.89 471.57 251.85 471.65 251.85 471.6 251.8 471.61 251.8 471.63 251.77 471.59 251.76 471.59 251.75 471.57 251.74 471.57 251.72 471.57 251.7 471.59 251.7 471.58 251.67 471.61 251.63 471.6 251.59 471.59 251.58 471.56 251.57 471.56 251.56 471.47 251.52 470.97 251.4 470.94 251.36 471.01 251.31 471.16 251.26 471.18 251.11 471.58 250.82 472.55 250.82 473.35 250.21 473.36 248.36 475.1 248.61 475.16 248.61 475.69 248.73 477.78 252.45 477.76 252.47 477.71 252.56 477.48 252.62 477.35 252.65 477.25 252.73 477.21 252.77 477.19 252.81 477.19 252.98 477.2 253.02 477.21 253.07 477.22 253.2 477.2 253.25 475.49 253.38 474.54 253.06 474.48 252.92 474.39 253.18 474.31 253.16 474.24 253.2 474.24 253.2 474.24 253.25 474.28 253.32 474.3 253.32 474.3 253.32 474.27 253.33 474.24 253.32 474.21 253.3 474.19 253.27 474.11 253.32 474.06 253.29 473.8 253.18 473.77 253.16 473.62 253.08 473.59 253.06 473.64 252.75 473.64 252.74 472.14 253.16 472.1 253.2 472.08 253.19 471.64 253.06 Z M 471.03 252.15 471.02 252.15 471.04 252.14 471.03 252.15 Z M 470.43 252.41 470.42 252.42 470.43 252.41 470.43 252.41 Z M 471.55 251.84 471.54 251.84 471.52 251.82 471.55 251.84 Z M 472.15 253.21 472.2 253.21 472.38 253.24 472.53 253.3 472.73 253.32 472.85 253.22 473.03 253.28 472.88 253.37 472.57 253.31 472.2 253.21 472.15 253.21 472.15 253.21 Z" fill-rule="evenodd" id="UKR_KS" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_KS" data-name="Kherson"></path>
 <path d="M 458.6 245.13 458.6 245.11 458.13 239.54 460.29 238.19 461.37 239.63 461.12 240.28 461.3 240.87 461.46 240.92 461.55 241.01 461.56 241.07 461.62 241.09 461.66 241.09 461.68 241.07 461.7 241.08 460.68 244.81 458.6 245.13 Z" id="UKR_KM" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_KM" data-name="Khmel'nyts'kyy"></path>
-<path d="M 466.45 242.56 466.45 242.66 465.94 242.75 465.46 241.36 465.4 241.3 465.84 240.13 465.09 235.26 467.67 235.71 467.69 235.71 469.65 238.37 469.71 238.43 471.33 239.02 471.18 239.37 471.25 239.43 468.59 242.35 466.45 242.56 Z M 468.02 239.22 467.97 239.18 467.87 239.04 467.87 238.98 468.18 238.57 468.18 238.53 467.31 238.07 467.11 238.36 468.02 239.22 Z" fill-rule="evenodd" id="UKR_KV" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_KV" data-name="Kiev"></path>
-<path d="M 467.81 238.86 467.81 238.92 467.87 238.99 467.87 239.04 467.97 239.18 468.02 239.22 467.11 238.36 467.31 238.07 468.18 238.53 468.18 238.53 467.82 238.75 467.81 238.86 Z" id="UKR_KC" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_KC" data-name="KievCity"></path>
+<path d="M 466.45 242.56 466.45 242.66 465.94 242.75 465.46 241.36 465.4 241.3 465.84 240.13 465.09 235.26 467.67 235.71 467.69 235.71 469.65 238.37 469.71 238.43 471.33 239.02 471.18 239.37 471.25 239.43 468.59 242.35 466.45 242.56 Z M 468.02 239.22 467.97 239.18 467.87 239.04 467.87 238.98 468.18 238.57 468.18 238.53 467.31 238.07 467.11 238.36 468.02 239.22 Z " fill-rule="evenodd" id="UKR_KV" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_KV" data-name="Kiev"></path>
+<path d="M 467.81 238.86 467.81 238.92 467.87 238.99 467.87 239.04 467.97 239.18 468.02 239.22 467.11 238.36 467.31 238.07 468.18 238.53 468.18 238.53 467.82 238.75 467.81 238.86 Z M 468.18 238.53 468.18 238.57 467.87 238.98 467.87 238.99 467.81 238.92 467.81 238.86 467.82 238.75 468.18 238.53 Z" id="UKR_KC" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_KC" data-name="KievCity"></path>
 <path d="M 472.54 247.02 470.64 247.51 467.21 246.43 466.03 246.15 466.03 246.05 466.46 245.33 466.46 245.27 466.52 245.27 466.54 245.29 466.61 245.27 466.64 245.31 466.77 245.36 466.89 245.22 467.35 245.14 468.01 244.38 471.29 243.73 472.88 242.82 475.22 243.99 473.23 247 472.66 247.02 472.54 247.02 Z" id="UKR_KH" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_KH" data-name="Kirovohrad"></path>
 <path d="M 452.19 244.49 450.76 243.53 450.75 243.51 450.7 243.39 450.7 243.38 450.7 243.37 450.69 243.36 450.69 243.35 450.69 243.34 450.7 243.32 450.73 243.29 450.74 243.26 450.74 243.24 450.73 243.23 450.19 241.77 452.15 239.32 452.2 239.28 452.2 239.27 453.07 238.71 453.12 238.71 453.37 238.32 453.38 238.21 453.41 237.95 453.4 237.91 455.67 239.08 455.91 239.8 455.98 239.92 456.16 240.13 454.77 241.83 454.77 241.87 454.75 241.9 454.71 241.9 454.59 241.87 454.26 241.7 454.06 241.86 454.04 242.92 452.63 243.14 452.19 244.49 Z M 453.15 238.7 453.15 238.7 453.18 238.68 453.15 238.7 Z" fill-rule="evenodd" id="UKR_LV" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_LV" data-name="L'viv"></path>
 <path d="M 486.95 247.36 486.6 247.37 486.58 247.37 486.56 247.3 486.61 247.09 486.54 246.89 485.13 246.01 484.85 244.17 484.42 243.13 484.03 243 484.1 242.86 484 242.8 483.99 242.75 483.95 242.69 483.95 242.67 484.31 240.42 485.59 240.23 486.31 240.8 486.96 240.71 486.96 240.76 486.97 240.8 489.08 241.59 489.14 241.71 488.11 243.59 488.7 246.03 487.01 247.35 486.95 247.36 Z" id="UKR_LH" data-gid_0="UKR" data-country="Ukraine" data-gid="UKR_LH" data-name="Luhans'k"></path>
diff --git a/genenum.js b/genenum.js
index 0d8e993..f3db34e 100644
--- a/genenum.js
+++ b/genenum.js
@@ -63,8 +63,8 @@ const formatStr = (str)=> str.replace(/(?<!\b\w\u00E0-\u00FC)\B[A-Z\u00C0-\u00DC
       return ', ';
   } else {
       return ' ' + match;
-  }}).replace("ofthe "," of the ").replace("dela ", " de la ").replace("delos ", " de los ").replace("áD","á D")
-  .replace("Côted'","Côte d'").replace("leof ","le of ").replace("dde ","d de ").replace("iode ","io de ").replace("àde ","à de ")
+  }}).replace("ofthe "," of the ").replace("dela ", " de la ").replace("delos ", " de los ").replace("áD","á D").replace("eÁ","e Á")
+  .replace("ed'","e d'").replace("leof ","le of ").replace("dde ","d de ").replace("iode ","io de ").replace("àde ","à de ")
   .replace("yof ","y of ").replace("Andrésy ","Andrés y")
   .replace("aand ","a and ").replace("iand ", "i and ").replace("tsand ","ts and ").replace("onand ","on and ").replace("reand ", "re and ")
   .replace("odel ","o del ").replace("adel ", "a del ").replace("ndel ","n del ").replace("zdel ","z del ").replace("falde ", "fal de ").replace("casdel ","cas del ")