diff --git a/public/gazetteer/countries.json b/public/gazetteer/countries.json
index 654baca571d..46317bcdf00 100644
--- a/public/gazetteer/countries.json
+++ b/public/gazetteer/countries.json
@@ -1,30 +1,30 @@
 [
   {
-    "keys": ["AD"],
+    "keys": ["AD", "AND"],
     "latitude": 42.546245,
     "longitude": 1.601554,
     "name": "Andorra"
   },
   {
-    "key": "AE",
+    "keys": ["AE", "ARE"],
     "latitude": 23.424076,
     "longitude": 53.847818,
     "name": "United Arab Emirates"
   },
   {
-    "key": "AF",
+    "keys": ["AF", "AFG"],
     "latitude": 33.93911,
     "longitude": 67.709953,
     "name": "Afghanistan"
   },
   {
-    "key": "AG",
+    "keys": ["AG", "ATG"],
     "latitude": 17.060816,
     "longitude": -61.796428,
     "name": "Antigua and Barbuda"
   },
   {
-    "key": "AI",
+    "keys": ["AI", "AIA"],
     "latitude": 18.220554,
     "longitude": -63.068615,
     "name": "Anguilla"
@@ -36,55 +36,55 @@
     "name": "Albania"
   },
   {
-    "key": "AM",
+    "keys": ["AM", "ARM"],
     "latitude": 40.069099,
     "longitude": 45.038189,
     "name": "Armenia"
   },
   {
-    "key": "AN",
+    "keys": ["AN", "ANT"],
     "latitude": 12.226079,
     "longitude": -69.060087,
     "name": "Netherlands Antilles"
   },
   {
-    "key": "AO",
+    "keys": ["AO", "AGO"],
     "latitude": -11.202692,
     "longitude": 17.873887,
     "name": "Angola"
   },
   {
-    "key": "AQ",
+    "keys": ["AQ", "ATA"],
     "latitude": -75.250973,
     "longitude": -0.071389,
     "name": "Antarctica"
   },
   {
-    "key": "AR",
+    "keys": ["AR", "ARG"],
     "latitude": -38.416097,
     "longitude": -63.616672,
     "name": "Argentina"
   },
   {
-    "key": "AS",
+    "keys": ["AS", "ASM"],
     "latitude": -14.270972,
     "longitude": -170.132217,
     "name": "American Samoa"
   },
   {
-    "key": "AT",
+    "keys": ["AT", "AUT"],
     "latitude": 47.516231,
     "longitude": 14.550072,
     "name": "Austria"
   },
   {
-    "key": "AU",
+    "keys": ["AU", "AUS"],
     "latitude": -25.274398,
     "longitude": 133.775136,
     "name": "Australia"
   },
   {
-    "key": "AW",
+    "keys": ["AW", "ABW"],
     "latitude": 12.52111,
     "longitude": -69.968338,
     "name": "Aruba"
@@ -96,61 +96,61 @@
     "name": "Åland"
   },
   {
-    "key": "AZ",
+    "keys": ["AZ", "AZE"],
     "latitude": 40.143105,
     "longitude": 47.576927,
     "name": "Azerbaijan"
   },
   {
-    "key": "BA",
+    "keys": ["BA", "BIH"],
     "latitude": 43.915886,
     "longitude": 17.679076,
     "name": "Bosnia and Herzegovina"
   },
   {
-    "key": "BB",
+    "keys": ["BB", "BRB"],
     "latitude": 13.193887,
     "longitude": -59.543198,
     "name": "Barbados"
   },
   {
-    "key": "BD",
+    "keys": ["BD", "BGD"],
     "latitude": 23.684994,
     "longitude": 90.356331,
     "name": "Bangladesh"
   },
   {
-    "key": "BE",
+    "keys": ["BE", "BEL"],
     "latitude": 50.503887,
     "longitude": 4.469936,
     "name": "Belgium"
   },
   {
-    "key": "BF",
+    "keys": ["BF", "BFA"],
     "latitude": 12.238333,
     "longitude": -1.561593,
     "name": "Burkina Faso"
   },
   {
-    "key": "BG",
+    "keys": ["BG", "BGR"],
     "latitude": 42.733883,
     "longitude": 25.48583,
     "name": "Bulgaria"
   },
   {
-    "key": "BH",
+    "keys": ["BH", "BHR"],
     "latitude": 25.930414,
     "longitude": 50.637772,
     "name": "Bahrain"
   },
   {
-    "key": "BI",
+    "keys": ["BI", "BDI"],
     "latitude": -3.373056,
     "longitude": 29.918886,
     "name": "Burundi"
   },
   {
-    "key": "BJ",
+    "keys": ["BJ", "BEN"],
     "latitude": 9.30769,
     "longitude": 2.315834,
     "name": "Benin"
@@ -162,19 +162,19 @@
     "name": "Saint-Barthélemy"
   },
   {
-    "key": "BM",
+    "keys": ["BM", "BMU"],
     "latitude": 32.321384,
     "longitude": -64.75737,
     "name": "Bermuda"
   },
   {
-    "key": "BN",
+    "keys": ["BN", "BRN"],
     "latitude": 4.535277,
     "longitude": 114.727669,
     "name": "Brunei"
   },
   {
-    "key": "BO",
+    "keys": ["BO", "BOL"],
     "latitude": -16.290154,
     "longitude": -63.588653,
     "name": "Bolivia"
@@ -186,133 +186,133 @@
     "name": "Bonaire, Sint Eustatius, and Saba"
   },
   {
-    "key": "BR",
+    "keys": ["BR", "BRA"],
     "latitude": -14.235004,
     "longitude": -51.92528,
     "name": "Brazil"
   },
   {
-    "key": "BS",
+    "keys": ["BS", "BHS"],
     "latitude": 25.03428,
     "longitude": -77.39628,
     "name": "Bahamas"
   },
   {
-    "key": "BT",
+    "keys": ["BT", "BTN"],
     "latitude": 27.514162,
     "longitude": 90.433601,
     "name": "Bhutan"
   },
   {
-    "key": "BV",
+    "keys": ["BV", "BVT"],
     "latitude": -54.423199,
     "longitude": 3.413194,
     "name": "Bouvet Island"
   },
   {
-    "key": "BW",
+    "keys": ["BW", "BWA"],
     "latitude": -22.328474,
     "longitude": 24.684866,
     "name": "Botswana"
   },
   {
-    "key": "BY",
+    "keys": ["BY", "BLR"],
     "latitude": 53.709807,
     "longitude": 27.953389,
     "name": "Belarus"
   },
   {
-    "key": "BZ",
+    "keys": ["BZ", "BLZ"],
     "latitude": 17.189877,
     "longitude": -88.49765,
     "name": "Belize"
   },
   {
-    "key": "CA",
+    "keys": ["CA", "CAN"],
     "latitude": 56.130366,
     "longitude": -106.346771,
     "name": "Canada"
   },
   {
-    "key": "CC",
+    "keys": ["CC", "CCK"],
     "latitude": -12.164165,
     "longitude": 96.870956,
     "name": "Cocos [Keeling] Islands"
   },
   {
-    "key": "CD",
+    "keys": ["CD", "COD"],
     "latitude": -4.038333,
     "longitude": 21.758664,
     "name": "Congo [DRC]"
   },
   {
-    "key": "CF",
+    "keys": ["CF", "CAF"],
     "latitude": 6.611111,
     "longitude": 20.939444,
     "name": "Central African Republic"
   },
   {
-    "key": "CG",
+    "keys": ["CG", "COG"],
     "latitude": -0.228021,
     "longitude": 15.827659,
     "name": "Congo [Republic]"
   },
   {
-    "key": "CH",
+    "keys": ["CH", "CHE"],
     "latitude": 46.818188,
     "longitude": 8.227512,
     "name": "Switzerland"
   },
   {
-    "key": "CI",
+    "keys": ["CI", "CIV"],
     "latitude": 7.539989,
     "longitude": -5.54708,
     "name": "Côte d'Ivoire"
   },
   {
-    "key": "CK",
+    "keys": ["CK", "COK"],
     "latitude": -21.236736,
     "longitude": -159.777671,
     "name": "Cook Islands"
   },
   {
-    "key": "CL",
+    "keys": ["CL", "CHL"],
     "latitude": -35.675147,
     "longitude": -71.542969,
     "name": "Chile"
   },
   {
-    "key": "CM",
+    "keys": ["CM", "CMR"],
     "latitude": 7.369722,
     "longitude": 12.354722,
     "name": "Cameroon"
   },
   {
-    "key": "CN",
+    "keys": ["CN", "CHN"],
     "latitude": 35.86166,
     "longitude": 104.195397,
     "name": "China"
   },
   {
-    "key": "CO",
+    "keys": ["CO", "COL"],
     "latitude": 4.570868,
     "longitude": -74.297333,
     "name": "Colombia"
   },
   {
-    "key": "CR",
+    "keys": ["CR", "CRI"],
     "latitude": 9.748917,
     "longitude": -83.753428,
     "name": "Costa Rica"
   },
   {
-    "key": "CU",
+    "keys": ["CU", "CUB"],
     "latitude": 21.521757,
     "longitude": -77.781167,
     "name": "Cuba"
   },
   {
-    "key": "CV",
+    "keys": ["CV", "CPV"],
     "latitude": 16.002082,
     "longitude": -24.013197,
     "name": "Cape Verde"
@@ -324,49 +324,49 @@
     "name": "Curaçao"
   },
   {
-    "key": "CX",
+    "keys": ["CX", "CXR"],
     "latitude": -10.447525,
     "longitude": 105.690449,
     "name": "Christmas Island"
   },
   {
-    "key": "CY",
+    "keys": ["CY", "CYP"],
     "latitude": 35.126413,
     "longitude": 33.429859,
     "name": "Cyprus"
   },
   {
-    "key": "CZ",
+    "keys": ["CZ", "CZE"],
     "latitude": 49.817492,
     "longitude": 15.472962,
     "name": "Czech Republic"
   },
   {
-    "key": "DE",
+    "keys": ["DE", "DEU"],
     "latitude": 51.165691,
     "longitude": 10.451526,
     "name": "Germany"
   },
   {
-    "key": "DJ",
+    "keys": ["DJ", "DJI"],
     "latitude": 11.825138,
     "longitude": 42.590275,
     "name": "Djibouti"
   },
   {
-    "key": "DK",
+    "keys": ["DK", "DNK"],
     "latitude": 56.26392,
     "longitude": 9.501785,
     "name": "Denmark"
   },
   {
-    "key": "DM",
+    "keys": ["DM", "DMA"],
     "latitude": 15.414999,
     "longitude": -61.370976,
     "name": "Dominica"
   },
   {
-    "key": "DO",
+    "keys": ["DO", "DOM"],
     "latitude": 18.735693,
     "longitude": -70.162651,
     "name": "Dominican Republic"
@@ -378,193 +378,193 @@
     "name": "Algeria"
   },
   {
-    "key": "EC",
+    "keys": ["EC", "ECU"],
     "latitude": -1.831239,
     "longitude": -78.183406,
     "name": "Ecuador"
   },
   {
-    "key": "EE",
+    "keys": ["EE", "EST"],
     "latitude": 58.595272,
     "longitude": 25.013607,
     "name": "Estonia"
   },
   {
-    "key": "EG",
+    "keys": ["EG", "EGY"],
     "latitude": 26.820553,
     "longitude": 30.802498,
     "name": "Egypt"
   },
   {
-    "key": "EH",
+    "keys": ["EH", "ESH"],
     "latitude": 24.215527,
     "longitude": -12.885834,
     "name": "Western Sahara"
   },
   {
-    "key": "ER",
+    "keys": ["ER", "ERI"],
     "latitude": 15.179384,
     "longitude": 39.782334,
     "name": "Eritrea"
   },
   {
-    "key": "ES",
+    "keys": ["ES", "ESP"],
     "latitude": 40.463667,
     "longitude": -3.74922,
     "name": "Spain"
   },
   {
-    "key": "ET",
+    "keys": ["ET", "ETH"],
     "latitude": 9.145,
     "longitude": 40.489673,
     "name": "Ethiopia"
   },
   {
-    "key": "FI",
+    "keys": ["FI", "FIN"],
     "latitude": 61.92411,
     "longitude": 25.748151,
     "name": "Finland"
   },
   {
-    "key": "FJ",
+    "keys": ["FJ", "FJI"],
     "latitude": -16.578193,
     "longitude": 179.414413,
     "name": "Fiji"
   },
   {
-    "key": "FK",
+    "keys": ["FK", "FLK"],
     "latitude": -51.796253,
     "longitude": -59.523613,
     "name": "Falkland Islands [Islas Malvinas]"
   },
   {
-    "key": "FM",
+    "keys": ["FM", "FSM"],
     "latitude": 7.425554,
     "longitude": 150.550812,
     "name": "Micronesia"
   },
   {
-    "key": "FO",
+    "keys": ["FO", "FRO"],
     "latitude": 61.892635,
     "longitude": -6.911806,
     "name": "Faroe Islands"
   },
   {
-    "key": "FR",
+    "keys": ["FR", "FRA"],
     "latitude": 46.227638,
     "longitude": 2.213749,
     "name": "France"
   },
   {
-    "key": "GA",
+    "keys": ["GA", "GAB"],
     "latitude": -0.803689,
     "longitude": 11.609444,
     "name": "Gabon"
   },
   {
-    "key": "GB",
+    "keys": ["GB", "GBR"],
     "latitude": 55.378051,
     "longitude": -3.435973,
     "name": "United Kingdom"
   },
   {
-    "key": "GD",
+    "keys": ["GD", "GRD"],
     "latitude": 12.262776,
     "longitude": -61.604171,
     "name": "Grenada"
   },
   {
-    "key": "GE",
+    "keys": ["GE", "GEO"],
     "latitude": 42.315407,
     "longitude": 43.356892,
     "name": "Georgia"
   },
   {
-    "key": "GF",
+    "keys": ["GF", "GUF"],
     "latitude": 3.933889,
     "longitude": -53.125782,
     "name": "French Guiana"
   },
   {
-    "key": "GG",
+    "keys": ["GG", "GGY"],
     "latitude": 49.465691,
     "longitude": -2.585278,
     "name": "Guernsey"
   },
   {
-    "key": "GH",
+    "keys": ["GH", "GHA"],
     "latitude": 7.946527,
     "longitude": -1.023194,
     "name": "Ghana"
   },
   {
-    "key": "GI",
+    "keys": ["GI", "GIB"],
     "latitude": 36.137741,
     "longitude": -5.345374,
     "name": "Gibraltar"
   },
   {
-    "key": "GL",
+    "keys": ["GL", "GRL"],
     "latitude": 71.706936,
     "longitude": -42.604303,
     "name": "Greenland"
   },
   {
-    "key": "GM",
+    "keys": ["GM", "GMB"],
     "latitude": 13.443182,
     "longitude": -15.310139,
     "name": "Gambia"
   },
   {
-    "key": "GN",
+    "keys": ["GN", "GIN"],
     "latitude": 9.945587,
     "longitude": -9.696645,
     "name": "Guinea"
   },
   {
-    "key": "GP",
+    "keys": ["GP", "GLP"],
     "latitude": 16.995971,
     "longitude": -62.067641,
     "name": "Guadeloupe"
   },
   {
-    "key": "GQ",
+    "keys": ["GQ", "GNQ"],
     "latitude": 1.650801,
     "longitude": 10.267895,
     "name": "Equatorial Guinea"
   },
   {
-    "key": "GR",
+    "keys": ["GR", "GRC"],
     "latitude": 39.074208,
     "longitude": 21.824312,
     "name": "Greece"
   },
   {
-    "key": "GS",
+    "keys": ["GS", "SGS"],
     "latitude": -54.429579,
     "longitude": -36.587909,
     "name": "South Georgia and the South Sandwich Islands"
   },
   {
-    "key": "GT",
+    "keys": ["GT", "GTM"],
     "latitude": 15.783471,
     "longitude": -90.230759,
     "name": "Guatemala"
   },
   {
-    "key": "GU",
+    "keys": ["GU", "GUM"],
     "latitude": 13.444304,
     "longitude": 144.793731,
     "name": "Guam"
   },
   {
-    "key": "GW",
+    "keys": ["GW", "GNB"],
     "latitude": 11.803749,
     "longitude": -15.180413,
     "name": "Guinea-Bissau"
   },
   {
-    "key": "GY",
+    "keys": ["GY", "GUY"],
     "latitude": 4.860416,
     "longitude": -58.93018,
     "name": "Guyana"
@@ -576,277 +576,277 @@
     "name": "Gaza Strip"
   },
   {
-    "key": "HK",
+    "keys": ["HK", "HKG"],
     "latitude": 22.396428,
     "longitude": 114.109497,
     "name": "Hong Kong"
   },
   {
-    "key": "HM",
+    "keys": ["HM", "HMD"],
     "latitude": -53.08181,
     "longitude": 73.504158,
     "name": "Heard Island and McDonald Islands"
   },
   {
-    "key": "HN",
+    "keys": ["HN", "HND"],
     "latitude": 15.199999,
     "longitude": -86.241905,
     "name": "Honduras"
   },
   {
-    "key": "HR",
+    "keys": ["HR", "HRV"],
     "latitude": 45.1,
     "longitude": 15.2,
     "name": "Croatia"
   },
   {
-    "key": "HT",
+    "keys": ["HT", "HTI"],
     "latitude": 18.971187,
     "longitude": -72.285215,
     "name": "Haiti"
   },
   {
-    "key": "HU",
+    "keys": ["HU", "HUN"],
     "latitude": 47.162494,
     "longitude": 19.503304,
     "name": "Hungary"
   },
   {
-    "key": "ID",
+    "keys": ["ID", "IDN"],
     "latitude": -0.789275,
     "longitude": 113.921327,
     "name": "Indonesia"
   },
   {
-    "key": "IE",
+    "keys": ["IE", "IRL"],
     "latitude": 53.41291,
     "longitude": -8.24389,
     "name": "Ireland"
   },
   {
-    "key": "IL",
+    "keys": ["IL", "ISR"],
     "latitude": 31.046051,
     "longitude": 34.851612,
     "name": "Israel"
   },
   {
-    "key": "IM",
+    "keys": ["IM", "IMN"],
     "latitude": 54.236107,
     "longitude": -4.548056,
     "name": "Isle of Man"
   },
   {
-    "key": "IN",
+    "keys": ["IN", "IND"],
     "latitude": 20.593684,
     "longitude": 78.96288,
     "name": "India"
   },
   {
-    "key": "IO",
+    "keys": ["IO", "IOT"],
     "latitude": -6.343194,
     "longitude": 71.876519,
     "name": "British Indian Ocean Territory"
   },
   {
-    "key": "IQ",
+    "keys": ["IQ", "IRQ"],
     "latitude": 33.223191,
     "longitude": 43.679291,
     "name": "Iraq"
   },
   {
-    "key": "IR",
+    "keys": ["IR", "IRN"],
     "latitude": 32.427908,
     "longitude": 53.688046,
     "name": "Iran"
   },
   {
-    "key": "IS",
+    "keys": ["IS", "ISL"],
     "latitude": 64.963051,
     "longitude": -19.020835,
     "name": "Iceland"
   },
   {
-    "key": "IT",
+    "keys": ["IT", "ITA"],
     "latitude": 41.87194,
     "longitude": 12.56738,
     "name": "Italy"
   },
   {
-    "key": "JE",
+    "keys": ["JE", "JEY"],
     "latitude": 49.214439,
     "longitude": -2.13125,
     "name": "Jersey"
   },
   {
-    "key": "JM",
+    "keys": ["JM", "JAM"],
     "latitude": 18.109581,
     "longitude": -77.297508,
     "name": "Jamaica"
   },
   {
-    "key": "JO",
+    "keys": ["JO", "JOR"],
     "latitude": 30.585164,
     "longitude": 36.238414,
     "name": "Jordan"
   },
   {
-    "key": "JP",
+    "keys": ["JP", "JPN"],
     "latitude": 36.204824,
     "longitude": 138.252924,
     "name": "Japan"
   },
   {
-    "key": "KE",
+    "keys": ["KE", "KEN"],
     "latitude": -0.023559,
     "longitude": 37.906193,
     "name": "Kenya"
   },
   {
-    "key": "KG",
+    "keys": ["KG", "KGZ"],
     "latitude": 41.20438,
     "longitude": 74.766098,
     "name": "Kyrgyzstan"
   },
   {
-    "key": "KH",
+    "keys": ["KH", "KHM"],
     "latitude": 12.565679,
     "longitude": 104.990963,
     "name": "Cambodia"
   },
   {
-    "key": "KI",
+    "keys": ["KI", "KIR"],
     "latitude": -3.370417,
     "longitude": -168.734039,
     "name": "Kiribati"
   },
   {
-    "key": "KM",
+    "keys": ["KM", "COM"],
     "latitude": -11.875001,
     "longitude": 43.872219,
     "name": "Comoros"
   },
   {
-    "key": "KN",
+    "keys": ["KN", "KNA"],
     "latitude": 17.357822,
     "longitude": -62.782998,
     "name": "Saint Kitts and Nevis"
   },
   {
-    "key": "KP",
+    "keys": ["KP", "PRK"],
     "latitude": 40.339852,
     "longitude": 127.510093,
     "name": "North Korea"
   },
   {
-    "key": "KR",
-    "latitude": 35.907757,
-    "longitude": 127.766922,
+    "keys": ["KR", "KOR"],
+    "latitude": 37,
+    "longitude": 127.5,
     "name": "South Korea"
   },
   {
-    "key": "KW",
+    "keys": ["KW", "KWT"],
     "latitude": 29.31166,
     "longitude": 47.481766,
     "name": "Kuwait"
   },
   {
-    "key": "KY",
+    "keys": ["KY", "CYM"],
     "latitude": 19.513469,
     "longitude": -80.566956,
     "name": "Cayman Islands"
   },
   {
-    "key": "KZ",
+    "keys": ["KZ", "KAZ"],
     "latitude": 48.019573,
     "longitude": 66.923684,
     "name": "Kazakhstan"
   },
   {
-    "key": "LA",
+    "keys": ["LA", "LAO"],
     "latitude": 19.85627,
     "longitude": 102.495496,
     "name": "Laos"
   },
   {
-    "key": "LB",
+    "keys": ["LB", "LBN"],
     "latitude": 33.854721,
     "longitude": 35.862285,
     "name": "Lebanon"
   },
   {
-    "key": "LC",
+    "keys": ["LC", "LCA"],
     "latitude": 13.909444,
     "longitude": -60.978893,
     "name": "Saint Lucia"
   },
   {
-    "key": "LI",
+    "keys": ["LI", "LIE"],
     "latitude": 47.166,
     "longitude": 9.555373,
     "name": "Liechtenstein"
   },
   {
-    "key": "LK",
+    "keys": ["LK", "LKA"],
     "latitude": 7.873054,
     "longitude": 80.771797,
     "name": "Sri Lanka"
   },
   {
-    "key": "LR",
+    "keys": ["LR", "LBR"],
     "latitude": 6.428055,
     "longitude": -9.429499,
     "name": "Liberia"
   },
   {
-    "key": "LS",
+    "keys": ["LS", "LSO"],
     "latitude": -29.609988,
     "longitude": 28.233608,
     "name": "Lesotho"
   },
   {
-    "key": "LT",
+    "keys": ["LT", "LTU"],
     "latitude": 55.169438,
     "longitude": 23.881275,
     "name": "Lithuania"
   },
   {
-    "key": "LU",
+    "keys": ["LU", "LUX"],
     "latitude": 49.815273,
     "longitude": 6.129583,
     "name": "Luxembourg"
   },
   {
-    "key": "LV",
+    "keys": ["LV", "LVA"],
     "latitude": 56.879635,
     "longitude": 24.603189,
     "name": "Latvia"
   },
   {
-    "key": "LY",
-    "latitude": 26.3351,
-    "longitude": 17.228331,
+    "keys": ["LY", "LBY"],
+    "latitude": 25,
+    "longitude": 17,
     "name": "Libya"
   },
   {
-    "key": "MA",
+    "keys": ["MA", "MAR"],
     "latitude": 31.791702,
     "longitude": -7.09262,
     "name": "Morocco"
   },
   {
-    "key": "MC",
+    "keys": ["MC", "MCO"],
     "latitude": 43.750298,
     "longitude": 7.412841,
     "name": "Monaco"
   },
   {
-    "key": "MD",
+    "keys": ["MD", "MDA"],
     "latitude": 47.411631,
     "longitude": 28.369885,
     "name": "Moldova"
   },
   {
-    "key": "ME",
+    "keys": ["ME", "MNE"],
     "latitude": 42.708678,
     "longitude": 19.37439,
     "name": "Montenegro"
@@ -858,409 +858,409 @@
     "name": "Saint Martin"
   },
   {
-    "key": "MG",
+    "keys": ["MG", "MDG"],
     "latitude": -18.766947,
     "longitude": 46.869107,
     "name": "Madagascar"
   },
   {
-    "key": "MH",
+    "keys": ["MH", "MHL"],
     "latitude": 7.131474,
     "longitude": 171.184478,
     "name": "Marshall Islands"
   },
   {
-    "key": "MK",
+    "keys": ["MK", "MKD"],
     "latitude": 41.608635,
     "longitude": 21.745275,
     "name": "Macedonia [FYROM]"
   },
   {
-    "key": "ML",
+    "keys": ["ML", "MLI"],
     "latitude": 17.570692,
     "longitude": -3.996166,
     "name": "Mali"
   },
   {
-    "key": "MM",
+    "keys": ["MM", "MMR"],
     "latitude": 21.913965,
     "longitude": 95.956223,
     "name": "Myanmar [Burma]"
   },
   {
-    "key": "MN",
+    "keys": ["MN", "MNG"],
     "latitude": 46.862496,
     "longitude": 103.846656,
     "name": "Mongolia"
   },
   {
-    "key": "MO",
-    "latitude": 22.198745,
-    "longitude": 113.543873,
-    "name": "Macau"
+    "keys": ["MO", "MAC"],
+    "latitude": 22.1667,
+    "longitude": 113.55,
+    "name": "Macao"
   },
   {
-    "key": "MP",
+    "keys": ["MP", "MNP"],
     "latitude": 17.33083,
     "longitude": 145.38469,
     "name": "Northern Mariana Islands"
   },
   {
-    "key": "MQ",
+    "keys": ["MQ", "MTQ"],
     "latitude": 14.641528,
     "longitude": -61.024174,
     "name": "Martinique"
   },
   {
-    "key": "MR",
+    "keys": ["MR", "MRT"],
     "latitude": 21.00789,
     "longitude": -10.940835,
     "name": "Mauritania"
   },
   {
-    "key": "MS",
+    "keys": ["MS", "MSR"],
     "latitude": 16.742498,
     "longitude": -62.187366,
     "name": "Montserrat"
   },
   {
-    "key": "MT",
+    "keys": ["MT", "MLT"],
     "latitude": 35.937496,
     "longitude": 14.375416,
     "name": "Malta"
   },
   {
-    "key": "MU",
+    "keys": ["MU", "MUS"],
     "latitude": -20.348404,
     "longitude": 57.552152,
     "name": "Mauritius"
   },
   {
-    "key": "MV",
+    "keys": ["MV", "MDV"],
     "latitude": 3.202778,
     "longitude": 73.22068,
     "name": "Maldives"
   },
   {
-    "key": "MW",
+    "keys": ["MW", "MWI"],
     "latitude": -13.254308,
     "longitude": 34.301525,
     "name": "Malawi"
   },
   {
-    "key": "MX",
+    "keys": ["MX", "MEX"],
     "latitude": 23.634501,
     "longitude": -102.552784,
     "name": "Mexico"
   },
   {
-    "key": "MY",
+    "keys": ["MY", "MYS"],
     "latitude": 4.210484,
     "longitude": 101.975766,
     "name": "Malaysia"
   },
   {
-    "key": "MZ",
+    "keys": ["MZ", "MOZ"],
     "latitude": -18.665695,
     "longitude": 35.529562,
     "name": "Mozambique"
   },
   {
-    "key": "NA",
+    "keys": ["NA", "NAM"],
     "latitude": -22.95764,
     "longitude": 18.49041,
     "name": "Namibia"
   },
   {
-    "key": "NC",
+    "keys": ["NC", "NCL"],
     "latitude": -20.904305,
     "longitude": 165.618042,
     "name": "New Caledonia"
   },
   {
-    "key": "NE",
+    "keys": ["NE", "NER"],
     "latitude": 17.607789,
     "longitude": 8.081666,
     "name": "Niger"
   },
   {
-    "key": "NF",
+    "keys": ["NF", "NFK"],
     "latitude": -29.040835,
     "longitude": 167.954712,
     "name": "Norfolk Island"
   },
   {
-    "key": "NG",
+    "keys": ["NG", "NGA"],
     "latitude": 9.081999,
     "longitude": 8.675277,
     "name": "Nigeria"
   },
   {
-    "key": "NI",
+    "keys": ["NI", "NIC"],
     "latitude": 12.865416,
     "longitude": -85.207229,
     "name": "Nicaragua"
   },
   {
-    "key": "NL",
+    "keys": ["NL", "NLD"],
     "latitude": 52.132633,
     "longitude": 5.291266,
     "name": "Netherlands"
   },
   {
-    "key": "NO",
+    "keys": ["NO", "NOR"],
     "latitude": 60.472024,
     "longitude": 8.468946,
     "name": "Norway"
   },
   {
-    "key": "NP",
+    "keys": ["NP", "NPL"],
     "latitude": 28.394857,
     "longitude": 84.124008,
     "name": "Nepal"
   },
   {
-    "key": "NR",
+    "keys": ["NR", "NRU"],
     "latitude": -0.522778,
     "longitude": 166.931503,
     "name": "Nauru"
   },
   {
-    "key": "NU",
+    "keys": ["NU", "NIU"],
     "latitude": -19.054445,
     "longitude": -169.867233,
     "name": "Niue"
   },
   {
-    "key": "NZ",
+    "keys": ["NZ", "NZL"],
     "latitude": -40.900557,
     "longitude": 174.885971,
     "name": "New Zealand"
   },
   {
-    "key": "OM",
+    "keys": ["OM", "OMN"],
     "latitude": 21.512583,
     "longitude": 55.923255,
     "name": "Oman"
   },
   {
-    "key": "PA",
+    "keys": ["PA", "PAN"],
     "latitude": 8.537981,
     "longitude": -80.782127,
     "name": "Panama"
   },
   {
-    "key": "PE",
+    "keys": ["PE", "PER"],
     "latitude": -9.189967,
     "longitude": -75.015152,
     "name": "Peru"
   },
   {
-    "key": "PF",
+    "keys": ["PF", "PYF"],
     "latitude": -17.679742,
     "longitude": -149.406843,
     "name": "French Polynesia"
   },
   {
-    "key": "PG",
+    "keys": ["PG", "PNG"],
     "latitude": -6.314993,
     "longitude": 143.95555,
     "name": "Papua New Guinea"
   },
   {
-    "key": "PH",
+    "keys": ["PH", "PHL"],
     "latitude": 12.879721,
     "longitude": 121.774017,
     "name": "Philippines"
   },
   {
-    "key": "PK",
+    "keys": ["PK", "PAK"],
     "latitude": 30.375321,
     "longitude": 69.345116,
     "name": "Pakistan"
   },
   {
-    "key": "PL",
+    "keys": ["PL", "POL"],
     "latitude": 51.919438,
     "longitude": 19.145136,
     "name": "Poland"
   },
   {
-    "key": "PM",
+    "keys": ["PM", "SPM"],
     "latitude": 46.941936,
     "longitude": -56.27111,
     "name": "Saint Pierre and Miquelon"
   },
   {
-    "key": "PN",
+    "keys": ["PN", "PCN"],
     "latitude": -24.703615,
     "longitude": -127.439308,
     "name": "Pitcairn Islands"
   },
   {
-    "key": "PR",
+    "keys": ["PR", "PRI"],
     "latitude": 18.220833,
     "longitude": -66.590149,
     "name": "Puerto Rico"
   },
   {
-    "key": "PS",
+    "keys": ["PS", "PSE"],
     "latitude": 31.952162,
     "longitude": 35.233154,
     "name": "Palestinian Territories"
   },
   {
-    "key": "PT",
+    "keys": ["PT", "PRT"],
     "latitude": 39.399872,
     "longitude": -8.224454,
     "name": "Portugal"
   },
   {
-    "key": "PW",
+    "keys": ["PW", "PLW"],
     "latitude": 7.51498,
     "longitude": 134.58252,
     "name": "Palau"
   },
   {
-    "key": "PY",
+    "keys": ["PY", "PRY"],
     "latitude": -23.442503,
     "longitude": -58.443832,
     "name": "Paraguay"
   },
   {
-    "key": "QA",
+    "keys": ["QA", "QAT"],
     "latitude": 25.354826,
     "longitude": 51.183884,
     "name": "Qatar"
   },
   {
-    "key": "RE",
+    "keys": ["RE", "REU"],
     "latitude": -21.115141,
     "longitude": 55.536384,
     "name": "Réunion"
   },
   {
-    "key": "RO",
+    "keys": ["RO", "ROU"],
     "latitude": 45.943161,
     "longitude": 24.96676,
     "name": "Romania"
   },
   {
-    "key": "RS",
+    "keys": ["RS", "SRB"],
     "latitude": 44.016521,
     "longitude": 21.005859,
     "name": "Serbia"
   },
   {
-    "key": "RU",
+    "keys": ["RU", "RUS"],
     "latitude": 61.52401,
     "longitude": 105.318756,
     "name": "Russia"
   },
   {
-    "key": "RW",
+    "keys": ["RW", "RWA"],
     "latitude": -1.940278,
     "longitude": 29.873888,
     "name": "Rwanda"
   },
   {
-    "key": "SA",
+    "keys": ["SA", "SAU"],
     "latitude": 23.885942,
     "longitude": 45.079162,
     "name": "Saudi Arabia"
   },
   {
-    "key": "SB",
+    "keys": ["SB", "SLB"],
     "latitude": -9.64571,
     "longitude": 160.156194,
     "name": "Solomon Islands"
   },
   {
-    "key": "SC",
+    "keys": ["SC", "SYC"],
     "latitude": -4.679574,
     "longitude": 55.491977,
     "name": "Seychelles"
   },
   {
-    "key": "SD",
+    "keys": ["SD", "SDN"],
     "latitude": 12.862807,
     "longitude": 30.217636,
     "name": "Sudan"
   },
   {
-    "key": "SE",
+    "keys": ["SE", "SWE"],
     "latitude": 60.128161,
     "longitude": 18.643501,
     "name": "Sweden"
   },
   {
-    "key": "SG",
+    "keys": ["SG", "SGP"],
     "latitude": 1.352083,
     "longitude": 103.819836,
     "name": "Singapore"
   },
   {
-    "key": "SH",
+    "keys": ["SH", "SHN"],
     "latitude": -24.143474,
     "longitude": -10.030696,
     "name": "Saint Helena"
   },
   {
-    "key": "SI",
+    "keys": ["SI", "SVN"],
     "latitude": 46.151241,
     "longitude": 14.995463,
     "name": "Slovenia"
   },
   {
-    "key": "SJ",
+    "keys": ["SJ", "SJM"],
     "latitude": 77.553604,
     "longitude": 23.670272,
     "name": "Svalbard and Jan Mayen"
   },
   {
-    "key": "SK",
+    "keys": ["SK", "SVK"],
     "latitude": 48.669026,
     "longitude": 19.699024,
     "name": "Slovakia"
   },
   {
-    "key": "SL",
+    "keys": ["SL", "SLE"],
     "latitude": 8.460555,
     "longitude": -11.779889,
     "name": "Sierra Leone"
   },
   {
-    "key": "SM",
+    "keys": ["SM", "SMR"],
     "latitude": 43.94236,
     "longitude": 12.457777,
     "name": "San Marino"
   },
   {
-    "key": "SN",
+    "keys": ["SN", "SEN"],
     "latitude": 14.497401,
     "longitude": -14.452362,
     "name": "Senegal"
   },
   {
-    "key": "SO",
+    "keys": ["SO", "SOM"],
     "latitude": 5.152149,
     "longitude": 46.199616,
     "name": "Somalia"
   },
   {
-    "key": "SR",
+    "keys": ["SR", "SUR"],
     "latitude": 3.919305,
     "longitude": -56.027783,
     "name": "Suriname"
   },
   {
-    "key": "ST",
+    "keys": ["ST", "STP"],
     "latitude": 0.18636,
     "longitude": 6.613081,
     "name": "São Tomé and Príncipe"
   },
   {
-    "key": "SV",
+    "keys": ["SV", "SLV"],
     "latitude": 13.794185,
     "longitude": -88.89653,
     "name": "El Salvador"
@@ -1272,127 +1272,127 @@
     "name": "Sint Maarten"
   },
   {
-    "key": "SY",
+    "keys": ["SY", "SYR"],
     "latitude": 34.802075,
     "longitude": 38.996815,
     "name": "Syria"
   },
   {
-    "key": "SZ",
+    "keys": ["SZ", "SWZ"],
     "latitude": -26.522503,
     "longitude": 31.465866,
     "name": "Swaziland"
   },
   {
-    "key": "TC",
+    "keys": ["TC", "TCA"],
     "latitude": 21.694025,
     "longitude": -71.797928,
     "name": "Turks and Caicos Islands"
   },
   {
-    "key": "TD",
+    "keys": ["TD", "TCD"],
     "latitude": 15.454166,
     "longitude": 18.732207,
     "name": "Chad"
   },
   {
-    "key": "TF",
+    "keys": ["TF", "ATF"],
     "latitude": -49.280366,
     "longitude": 69.348557,
     "name": "French Southern Territories"
   },
   {
-    "key": "TG",
+    "keys": ["TG", "TGO"],
     "latitude": 8.619543,
     "longitude": 0.824782,
     "name": "Togo"
   },
   {
-    "key": "TH",
+    "keys": ["TH", "THA"],
     "latitude": 15.870032,
     "longitude": 100.992541,
     "name": "Thailand"
   },
   {
-    "key": "TJ",
+    "keys": ["TJ", "TJK"],
     "latitude": 38.861034,
     "longitude": 71.276093,
     "name": "Tajikistan"
   },
   {
-    "key": "TK",
+    "keys": ["TK", "TKL"],
     "latitude": -8.967363,
     "longitude": -171.855881,
     "name": "Tokelau"
   },
   {
-    "key": "TL",
+    "keys": ["TL", "TLS"],
     "latitude": -8.874217,
     "longitude": 125.727539,
     "name": "Timor-Leste"
   },
   {
-    "key": "TM",
+    "keys": ["TM", "TKM"],
     "latitude": 38.969719,
     "longitude": 59.556278,
     "name": "Turkmenistan"
   },
   {
-    "key": "TN",
+    "keys": ["TN", "TUN"],
     "latitude": 33.886917,
     "longitude": 9.537499,
     "name": "Tunisia"
   },
   {
-    "key": "TO",
+    "keys": ["TO", "TON"],
     "latitude": -21.178986,
     "longitude": -175.198242,
     "name": "Tonga"
   },
   {
-    "key": "TR",
+    "keys": ["TR", "TUR"],
     "latitude": 38.963745,
     "longitude": 35.243322,
     "name": "Turkey"
   },
   {
-    "key": "TT",
+    "keys": ["TT", "TTO"],
     "latitude": 10.691803,
     "longitude": -61.222503,
     "name": "Trinidad and Tobago"
   },
   {
-    "key": "TV",
+    "keys": ["TV", "TUV"],
     "latitude": -7.109535,
     "longitude": 177.64933,
     "name": "Tuvalu"
   },
   {
-    "key": "TW",
+    "keys": ["TW", "TWN"],
     "latitude": 23.69781,
     "longitude": 120.960515,
     "name": "Taiwan"
   },
   {
-    "key": "TZ",
+    "keys": ["TZ", "TZA"],
     "latitude": -6.369028,
     "longitude": 34.888822,
     "name": "Tanzania"
   },
   {
-    "key": "UA",
+    "keys": ["UA", "UKR"],
     "latitude": 48.379433,
     "longitude": 31.16558,
     "name": "Ukraine"
   },
   {
-    "key": "UG",
+    "keys": ["UG", "UGA"],
     "latitude": 1.373333,
     "longitude": 32.290275,
     "name": "Uganda"
   },
   {
-    "key": "UM",
+    "keys": ["UM", "UMI"],
     "latitude": 0,
     "longitude": 0,
     "name": "U.S. Minor Outlying Islands"
@@ -1404,67 +1404,67 @@
     "name": "United States"
   },
   {
-    "key": "UY",
+    "keys": ["UY", "URY"],
     "latitude": -32.522779,
     "longitude": -55.765835,
     "name": "Uruguay"
   },
   {
-    "key": "UZ",
+    "keys": ["UZ", "UZB"],
     "latitude": 41.377491,
     "longitude": 64.585262,
     "name": "Uzbekistan"
   },
   {
-    "key": "VA",
+    "keys": ["VA", "VAT"],
     "latitude": 41.902916,
     "longitude": 12.453389,
     "name": "Vatican City"
   },
   {
-    "key": "VC",
+    "keys": ["VC", "VCT"],
     "latitude": 12.984305,
     "longitude": -61.287228,
     "name": "Saint Vincent and the Grenadines"
   },
   {
-    "key": "VE",
+    "keys": ["VE", "VEN"],
     "latitude": 6.42375,
     "longitude": -66.58973,
     "name": "Venezuela"
   },
   {
-    "key": "VG",
+    "keys": ["VG", "VGB"],
     "latitude": 18.420695,
     "longitude": -64.639968,
     "name": "British Virgin Islands"
   },
   {
-    "key": "VI",
+    "keys": ["VI", "VIR"],
     "latitude": 18.335765,
     "longitude": -64.896335,
     "name": "U.S. Virgin Islands"
   },
   {
-    "key": "VN",
+    "keys": ["VN", "VNM"],
     "latitude": 14.058324,
     "longitude": 108.277199,
     "name": "Vietnam"
   },
   {
-    "key": "VU",
+    "keys": ["VU", "VUT"],
     "latitude": -15.376706,
     "longitude": 166.959158,
     "name": "Vanuatu"
   },
   {
-    "key": "WF",
+    "keys": ["WF", "WLF"],
     "latitude": -13.768752,
     "longitude": -177.156097,
     "name": "Wallis and Futuna"
   },
   {
-    "key": "WS",
+    "keys": ["WS", "WSM"],
     "latitude": -13.759029,
     "longitude": -172.104629,
     "name": "Samoa"
@@ -1476,31 +1476,31 @@
     "name": "Kosovo"
   },
   {
-    "key": "YE",
+    "keys": ["YE", "YEM"],
     "latitude": 15.552727,
     "longitude": 48.516388,
     "name": "Yemen"
   },
   {
-    "key": "YT",
+    "keys": ["YT", "MYT"],
     "latitude": -12.8275,
     "longitude": 45.166244,
     "name": "Mayotte"
   },
   {
-    "key": "ZA",
+    "keys": ["ZA", "ZAF"],
     "latitude": -30.559482,
     "longitude": 22.937506,
     "name": "South Africa"
   },
   {
-    "key": "ZM",
+    "keys": ["ZM", "ZMB"],
     "latitude": -13.133897,
     "longitude": 27.849332,
     "name": "Zambia"
   },
   {
-    "key": "ZW",
+    "keys": ["ZW", "ZWE"],
     "latitude": -19.015438,
     "longitude": 29.154857,
     "name": "Zimbabwe"