diff --git a/dashboard2/img/flags/ai.png b/dashboard2/img/flags/ai.png
new file mode 100644
index 0000000..5f3805b
Binary files /dev/null and b/dashboard2/img/flags/ai.png differ
diff --git a/dashboard2/img/flags/as.png b/dashboard2/img/flags/as.png
new file mode 100644
index 0000000..642fb42
Binary files /dev/null and b/dashboard2/img/flags/as.png differ
diff --git a/dashboard2/img/flags/aw.png b/dashboard2/img/flags/aw.png
new file mode 100644
index 0000000..129032c
Binary files /dev/null and b/dashboard2/img/flags/aw.png differ
diff --git a/dashboard2/img/flags/bl.png b/dashboard2/img/flags/bl.png
new file mode 100755
index 0000000..a768476
Binary files /dev/null and b/dashboard2/img/flags/bl.png differ
diff --git a/dashboard2/img/flags/bm.png b/dashboard2/img/flags/bm.png
index 9cc975a..292f97b 100644
Binary files a/dashboard2/img/flags/bm.png and b/dashboard2/img/flags/bm.png differ
diff --git a/dashboard2/img/flags/bv.png b/dashboard2/img/flags/bv.png
new file mode 100755
index 0000000..e14f90f
Binary files /dev/null and b/dashboard2/img/flags/bv.png differ
diff --git a/dashboard2/img/flags/cc.png b/dashboard2/img/flags/cc.png
new file mode 100644
index 0000000..ff140fc
Binary files /dev/null and b/dashboard2/img/flags/cc.png differ
diff --git a/dashboard2/img/flags/ck.png b/dashboard2/img/flags/ck.png
new file mode 100644
index 0000000..8756cc1
Binary files /dev/null and b/dashboard2/img/flags/ck.png differ
diff --git a/dashboard2/img/flags/cs.png b/dashboard2/img/flags/cs.png
new file mode 100644
index 0000000..79f7c81
Binary files /dev/null and b/dashboard2/img/flags/cs.png differ
diff --git a/dashboard2/img/flags/cw.png b/dashboard2/img/flags/cw.png
index 9d431c8..dbbc656 100644
Binary files a/dashboard2/img/flags/cw.png and b/dashboard2/img/flags/cw.png differ
diff --git a/dashboard2/img/flags/cx.png b/dashboard2/img/flags/cx.png
new file mode 100644
index 0000000..bc39174
Binary files /dev/null and b/dashboard2/img/flags/cx.png differ
diff --git a/dashboard2/img/flags/fk.png b/dashboard2/img/flags/fk.png
new file mode 100644
index 0000000..e8e761b
Binary files /dev/null and b/dashboard2/img/flags/fk.png differ
diff --git a/dashboard2/img/flags/fo.png b/dashboard2/img/flags/fo.png
new file mode 100644
index 0000000..d101593
Binary files /dev/null and b/dashboard2/img/flags/fo.png differ
diff --git a/dashboard2/img/flags/gf.png b/dashboard2/img/flags/gf.png
new file mode 100755
index 0000000..a768476
Binary files /dev/null and b/dashboard2/img/flags/gf.png differ
diff --git a/dashboard2/img/flags/gg.png b/dashboard2/img/flags/gg.png
new file mode 100644
index 0000000..f6264d2
Binary files /dev/null and b/dashboard2/img/flags/gg.png differ
diff --git a/dashboard2/img/flags/gi.png b/dashboard2/img/flags/gi.png
new file mode 100644
index 0000000..3209126
Binary files /dev/null and b/dashboard2/img/flags/gi.png differ
diff --git a/dashboard2/img/flags/gl.png b/dashboard2/img/flags/gl.png
new file mode 100644
index 0000000..9aaa281
Binary files /dev/null and b/dashboard2/img/flags/gl.png differ
diff --git a/dashboard2/img/flags/gp.png b/dashboard2/img/flags/gp.png
new file mode 100755
index 0000000..a768476
Binary files /dev/null and b/dashboard2/img/flags/gp.png differ
diff --git a/dashboard2/img/flags/gs.png b/dashboard2/img/flags/gs.png
new file mode 100644
index 0000000..c24edc6
Binary files /dev/null and b/dashboard2/img/flags/gs.png differ
diff --git a/dashboard2/img/flags/gu.png b/dashboard2/img/flags/gu.png
new file mode 100644
index 0000000..cda85a5
Binary files /dev/null and b/dashboard2/img/flags/gu.png differ
diff --git a/dashboard2/img/flags/hm.png b/dashboard2/img/flags/hm.png
new file mode 100755
index 0000000..ef20b66
Binary files /dev/null and b/dashboard2/img/flags/hm.png differ
diff --git a/dashboard2/img/flags/im.png b/dashboard2/img/flags/im.png
new file mode 100755
index 0000000..eed19d5
Binary files /dev/null and b/dashboard2/img/flags/im.png differ
diff --git a/dashboard2/img/flags/io.png b/dashboard2/img/flags/io.png
new file mode 100644
index 0000000..24d6767
Binary files /dev/null and b/dashboard2/img/flags/io.png differ
diff --git a/dashboard2/img/flags/je.png b/dashboard2/img/flags/je.png
new file mode 100644
index 0000000..80dcf75
Binary files /dev/null and b/dashboard2/img/flags/je.png differ
diff --git a/dashboard2/img/flags/ky.png b/dashboard2/img/flags/ky.png
new file mode 100644
index 0000000..298a5d1
Binary files /dev/null and b/dashboard2/img/flags/ky.png differ
diff --git a/dashboard2/img/flags/mf.png b/dashboard2/img/flags/mf.png
new file mode 100644
index 0000000..2e203d1
Binary files /dev/null and b/dashboard2/img/flags/mf.png differ
diff --git a/dashboard2/img/flags/mo.png b/dashboard2/img/flags/mo.png
new file mode 100755
index 0000000..4cda107
Binary files /dev/null and b/dashboard2/img/flags/mo.png differ
diff --git a/dashboard2/img/flags/mp.png b/dashboard2/img/flags/mp.png
new file mode 100644
index 0000000..d6733d6
Binary files /dev/null and b/dashboard2/img/flags/mp.png differ
diff --git a/dashboard2/img/flags/mq.png b/dashboard2/img/flags/mq.png
new file mode 100755
index 0000000..a768476
Binary files /dev/null and b/dashboard2/img/flags/mq.png differ
diff --git a/dashboard2/img/flags/ms.png b/dashboard2/img/flags/ms.png
new file mode 100644
index 0000000..516430e
Binary files /dev/null and b/dashboard2/img/flags/ms.png differ
diff --git a/dashboard2/img/flags/nc.png b/dashboard2/img/flags/nc.png
new file mode 100755
index 0000000..a768476
Binary files /dev/null and b/dashboard2/img/flags/nc.png differ
diff --git a/dashboard2/img/flags/nf.png b/dashboard2/img/flags/nf.png
new file mode 100644
index 0000000..8e5a705
Binary files /dev/null and b/dashboard2/img/flags/nf.png differ
diff --git a/dashboard2/img/flags/nu.png b/dashboard2/img/flags/nu.png
new file mode 100644
index 0000000..f3e621c
Binary files /dev/null and b/dashboard2/img/flags/nu.png differ
diff --git a/dashboard2/img/flags/pf.png b/dashboard2/img/flags/pf.png
new file mode 100644
index 0000000..13618ce
Binary files /dev/null and b/dashboard2/img/flags/pf.png differ
diff --git a/dashboard2/img/flags/pm.png b/dashboard2/img/flags/pm.png
new file mode 100755
index 0000000..a768476
Binary files /dev/null and b/dashboard2/img/flags/pm.png differ
diff --git a/dashboard2/img/flags/pn.png b/dashboard2/img/flags/pn.png
new file mode 100644
index 0000000..566166f
Binary files /dev/null and b/dashboard2/img/flags/pn.png differ
diff --git a/dashboard2/img/flags/ps.png b/dashboard2/img/flags/ps.png
new file mode 100644
index 0000000..6232014
Binary files /dev/null and b/dashboard2/img/flags/ps.png differ
diff --git a/dashboard2/img/flags/re.png b/dashboard2/img/flags/re.png
new file mode 100755
index 0000000..a768476
Binary files /dev/null and b/dashboard2/img/flags/re.png differ
diff --git a/dashboard2/img/flags/ss.png b/dashboard2/img/flags/ss.png
new file mode 100644
index 0000000..d60fe1a
Binary files /dev/null and b/dashboard2/img/flags/ss.png differ
diff --git a/dashboard2/img/flags/sx.png b/dashboard2/img/flags/sx.png
new file mode 100644
index 0000000..c3f90d4
Binary files /dev/null and b/dashboard2/img/flags/sx.png differ
diff --git a/dashboard2/img/flags/tc.png b/dashboard2/img/flags/tc.png
new file mode 100644
index 0000000..0f91d4d
Binary files /dev/null and b/dashboard2/img/flags/tc.png differ
diff --git a/dashboard2/img/flags/tk.png b/dashboard2/img/flags/tk.png
new file mode 100644
index 0000000..e48e1f4
Binary files /dev/null and b/dashboard2/img/flags/tk.png differ
diff --git a/dashboard2/img/flags/um.png b/dashboard2/img/flags/um.png
new file mode 100755
index 0000000..07ddf4e
Binary files /dev/null and b/dashboard2/img/flags/um.png differ
diff --git a/dashboard2/img/flags/vg.png b/dashboard2/img/flags/vg.png
new file mode 100644
index 0000000..d4ba827
Binary files /dev/null and b/dashboard2/img/flags/vg.png differ
diff --git a/dashboard2/img/flags/vi.png b/dashboard2/img/flags/vi.png
new file mode 100644
index 0000000..2e53061
Binary files /dev/null and b/dashboard2/img/flags/vi.png differ
diff --git a/dashboard2/img/flags/wf.png b/dashboard2/img/flags/wf.png
new file mode 100755
index 0000000..a768476
Binary files /dev/null and b/dashboard2/img/flags/wf.png differ
diff --git a/dashboard2/img/flags/yt.png b/dashboard2/img/flags/yt.png
new file mode 100644
index 0000000..17e788b
Binary files /dev/null and b/dashboard2/img/flags/yt.png differ
diff --git a/dashboard2/pgs/country.csv b/dashboard2/pgs/country.csv
old mode 100644
new mode 100755
index 84a791f..5094980
--- a/dashboard2/pgs/country.csv
+++ b/dashboard2/pgs/country.csv
@@ -1,32 +1,41 @@
-
 Afghanistan;AF;YA-T6
+Agalega & St. Brandon Island;MU;3B6-3B7
 Aland Islands;AX;OH0
+Alaska;US;AL-KL-NL-WL
 Albania;AL;ZA
 Algeria;DZ;7T-7U-7V-7W-7X-7Y
 American Samoa;AS;KH8
+Andaman & Nicobar Islands;IN;VU4
 Andorra;AD;C3
 Angola;AO;D2-D3
 Anguilla;AI;VP2E
-Antarctica;AQ;CE9
+Annobon Island;GQ;3C0
+Antarctica;AQ;CE9-KC4
 Antigua and Barbuda;AG;V2
 Argentina;AR;LO-LP-LQ-LR-LS-LT-LU-LV-LW
 Armenia;AM;EK
 Aruba;AW;P4
+Ascension Island;SH;ZD8
+Asiatic Russia;RU;UA0-UA8-UA9-UB0-UB8-UB9-UC0-UC8-UC9-UD0-UD8-UD9-UE0-UE8-UE9-UF0-UF8-UF9-UG0-UG8-UG9-UH0-UH8-UH9-UI0-UI8-UI9-RA0-RA8-RA9-RB0-RB8-RB9-RC0-RC8-RC9-RD0-RD8-RD9-RE0-RE8-RE9-RF0-RF8-RF9-RG0-RG8-RG9-RH0-RH8-RH9-RI0-RI8-RI9-RJ0-RJ8-RJ9-RK0-RK8-RK9-RL0-RL8-RL9-RM0-RM8-RM9-RN0-RN8-RN9-RO0-RO8-RO9-RP0-RP8-RP9-RQ0-RQ8-RQ9-RR0-RR8-RR9-RS0-RS8-RS9-RT0-RT8-RT9-RU0-RU8-RU9-RV0-RV8-RV9-RW0-RW8-RW9-RX0-RX8-RX9-RY0-RY8-RY9-RZ0-RZ8-RZ9
 Australia;AU;VK-AX
 Austria;AT;OE
 Azerbaijan;AZ;4J-4K
+Azores;PT;CU
 Bahamas;BS;C6
 Bahrain;BH;A9
+Baker & Howland Islands;US;KH1
+Balearic Islands;ES;EA6-EB6-EC6-ED6-EE6-EF6-EG6-EH6
+Banaba Island (Ocean Island);KI;T33
 Bangladesh;BD;S2
 Barbados;BB;8P
 Belarus;BY;EU-EV-EW
-Belgium;BE;ON-OS
+Belgium;BE;ON-OO-OP-OQ-OR-OS-OT
 Belize;BZ;V3
 Benin;BJ;TY
 Bermuda;BM;VP9
 Bhutan;BT;A5
 Bolivia Plurinational State of;BO;CP
-Bonaire Sint Eustatius and Saba;BQ;PJ4
+Bonaire;NL;PJ4
 Bosnia and Herzegovina;BA;E7
 Botswana;BW;A2
 Bouvet Island;BV;3Y
@@ -38,47 +47,64 @@ Burkina Faso;BF;XT
 Burundi;BI;9U
 Cambodia;KH;XU
 Cameroon;CM;TJ
-Canada;CA;VA-VB-VC-VD-VE-VF-VG-VY
+Canada;CA;VA-VB-VC-VD-VE-VF-VG-VO-VY
+Canary Islands;ES;EA8-EB8-EC8-ED8-EE8-EF8-EG8-EH8
 Cape Verde;CV;D4
 Cayman Islands;KY;ZF
 Central African Republic;CF;TL
+Central Kiribati (British Phoenix Island);KI;T31
+Ceuta & Melilla;ES;EA9-EB9-EC9-ED9-EE9-EF9-EG9-EH9
 Chad;TD;TT
+Chagos Islands;;VQ9
+Chatham Islands;NZ;ZL7
 Chile;CL;CA-CB-CC-CD-CE
 China;CN;BA-BB-BC-BD-BE-BF-BG-BH-BI-BJ-BK-BL-BN-BP-BQ-BR-BS-BT-BY-BZ
 Christmas Island;CX;VK9X
+Cocos Island;;TI9
 Cocos (Keeling) Islands;CC;VK9C
 Colombia;CO;HJ-HK-5J-5K
 Comoros;KM;D6
 Congo;CG;TN
 Congo the Democratic Republic of the;CD;9Q-9R-9S-9T
 Cook Islands;CK;E5
+Corsica;FR;TK
 Costa Rica;CR;TI-TE
 Cote d'Ivoire;CI;TU
+Crete;GR;SV9-J49
 Croatia;HR;9A
 Cuba;CU;CO-CM
 Curacao;CW;PJ2
 Cyprus;CY;5B-C4-P3
 Czech Republic;CZ;OK-OL
 Denmark;DK;OU-OV-OW-OZ
+Desecheo Island;US;KP5
 Djibouti;DJ;J2
+Dodecanese;GR;SV5-J45
 Dominica;DM;J7
 Dominican Republic;DO;HI
+East Malaysia;MY;9M6-9M8
+Easter Island;CL;CE0
+Eastern Kiribati (Line Island);KI;T32
 Ecuador;EC;HC-HD
 Egypt;EG;SU
 El Salvador;SV;YS-HU
+England;GB;2E-M0-M1-M2-M3-M4-M5-M6-M7-M8-M9-MB-MM-G0-G1-G2-G3-G4-G5-G6-G7-G8-G9-GX
 Equatorial Guinea;GQ;3C
 Eritrea;ER;E3
 Estonia;EE;ES
 Ethiopia;ET;ET
+European Russia;RU;UA1-UA3-UA4-UA5-UA6-UA7-UB1-UB2-UB3-UB4-UB5-UB6-UB7-UC1-UC2-UC3-UC4-UC5-UC6-UC7-UD1-UD2-UD3-UD4-UD5-UD6-UD7-UE1-UE2-UE3-UE4-UE5-UE6-UE7-UF1-UF2-UF3-UF4-UF5-UF6-UF7-UG1-UG2-UG3-UG4-UG5-UG6-UG7-UH1-UH2-UH3-UH4-UH5-UH6-UH7-UI1-UI2-UI3-UI4-UI5-UI6-UI7-RA1-RA3-RA4-RA5-RA6-RA7-RB1-RB2-RB3-RB4-RB5-RB6-RB7-RC1-RC2-RC3-RC4-RC5-RC6-RC7-RD1-RD2-RD3-RD4-RD5-RD6-RD7-RE1-RE2-RE3-RE4-RE5-RE6-RE7-RF1-RF2-RF3-RF4-RF5-RF6-RF7-RG1-RG2-RG3-RG4-RG5-RG6-RG7-RH1-RH2-RH3-RH4-RH5-RH6-RH7-RI1-RI2-RI3-RI4-RI5-RI6-RI7-RJ1-RJ2-RJ3-RJ4-RJ5-RJ6-RJ7-RK1-RK2-RK3-RK4-RK5-RK6-RK7-RL1-RL2-RL3-RL4-RL5-RL6-RL7-RM1-RM2-RM3-RM4-RM5-RM6-RM7-RN1-RN2-RN3-RN4-RN5-RN6-RN7-RO1-RO2-RO3-RO4-RO5-RO6-RO7-RP1-RP2-RP3-RP4-RP5-RP6-RP7-RQ1-RQ2-RQ3-RQ4-RQ5-RQ6-RQ7-RR1-RR2-RR3-RR4-RR5-RR6-RR7-RS1-RS2-RS3-RS4-RS5-RS6-RS7-RT1-RT2-RT3-RT4-RT5-RT6-RT7-RU1-RU2-RU3-RU4-RU5-RU6-RU7-RV1-RV2-RV3-RV4-RV5-RV6-RV7-RW1-RW2-RW3-RW4-RW5-RW6-RW7-RX1-RX2-RX3-RX4-RX5-RX6-RX7-RY1-RY2-RY3-RY4-RY5-RY6-RY7-RZ1-RZ2-RZ3-RZ4-RZ5-RZ6-RZ7
 Falkland Islands (Malvinas);FK;VP8
 Faroe Islands;FO;OY
 Fiji;FJ;3D2
 Finland;FI;OF-OG-OH-OI
-France;FR;F0-F1-F2-F3-F4-F5-F6-F7-F8-F9-TK
+France;FR;F0-F1-F2-F3-F4-F5-F6-F7-F8-F9
+Franz Josef Land;RU;R1
 French Guiana;GF;FY
+French Southern and Antarctic Lands;FR;FT
 French Polynesia;PF;FO-TX
-French Southern Territories;TF;
 Gabon;GA;TR
+Galapagos Islands;EC;HC8-HD8
 Gambia;GM;C5
 Georgia;GE;4L
 Germany;DE;DA-DB-DC-DD-DE-DF-DG-DH-DI-DJ-DK-DL-DM-DN-DO-DP-DQ-DR
@@ -87,14 +113,16 @@ Gibraltar;GI;ZB2
 Greece;GR;SV-SW-SX-SY-SZ-J4
 Greenland;GL;OX
 Grenada;GD;J3
-Guadeloupe;GP;FG-TO
+Guadeloupe;GP;FG
 Guam;GU;KH2
+Guantanamo Bay;US;KG4
 Guatemala;GT;TG-TD
 Guernsey;GG;GU-GP
 Guinea;GN;3X
 Guinea-Bissau;GW;J5
 Guyana;GY;8R
 Haiti;HT;HH
+Hawaii;US;KH6-KH7
 Heard Island and McDonald Islands;HM;VK0
 Holy See (Vatican City State);VA;HV
 Honduras;HN;HQ-HR
@@ -110,16 +138,21 @@ Isle of Man;IM;GD-GT
 Israel;IL;4X-4Z
 Italy;IT;I0-I1-I2-I3-I4-I5-I6-I7-I8-I9-IK-IN-IQ-IR-IS-IT-IU-IV-IW-IZ
 Jamaica;JM;6Y
+Jan Mayen;NO;JX
 Japan;JP;JA-JB-JC-JD-JE-JF-JG-JH-JI-JJ-JK-JL-JM-JN-JO-JP-JQ-JR-JS-7J-7K-7L-7M-7N
 Jersey;JE;GJ-GH
+Johnston Island;US;KH3
 Jordan;JO;JY
+Kaliningrad;RU;UA2-RA2
 Kazakhstan;KZ;UN-UO-UP-UQ
 Kenya;KE;5Y-5Z
-Kiribati;KI;T30
+Kermadec Islands;NZ;ZL8
 Korea Democratic People's Republic of;KP;P5
-Korea Republic of;KR;DS-HL-6K-6L-6M-6N
+Korea Republic of;KR;HL-6K-6L-6M-6N
+Kure Island;US;KH7K
 Kuwait;KW;9K
 Kyrgyzstan;KG;EX
+Lakshadweep Islands;IN;VU7
 Lao People's Democratic Republic;LA;XW
 Latvia;LV;YL
 Lebanon;LB;OD
@@ -128,22 +161,27 @@ Liberia;LR;EL
 Libya;LY;5A
 Liechtenstein;LI;HB0
 Lithuania;LT;LY
+Lord Howe Island;AU;VK9L
 Luxembourg;LU;LX
 Macao;MO;XX9
-Macedonia the Former Yugoslav Republic of;MK;Z3
+Macedonia;MK;Z3
 Madagascar;MG;5R
+Madeira Island;PT;CT3
 Malawi;MW;7Q
-Malaysia;MY;9M
 Maldives;MV;8Q
 Mali;ML;TZ
 Malta;MT;9H
+Mariana Islands;US;KH0
+Market Reef;;OJ0
 Marshall Islands;MH;V7
-Martinique;MQ;FM-TO
+Martinique;MQ;FM
 Mauritania;MR;5T
 Mauritius;MU;3B8
 Mayotte;YT;FH-FO
+Mellish Reef;AU;VK9M
 Mexico;MX;XA-XB-XC-XD-XE-XF-XG-XH-XI
 Micronesia Federated States of;FM;V6
+Midway Island;US;KH4
 Moldova Republic of;MD;ER
 Monaco;MC;3A
 Mongolia;MN;JT-JU-JV
@@ -154,38 +192,45 @@ Mozambique;MZ;C8-C9
 Myanmar;MM;XY-XZ
 Namibia;NA;V5
 Nauru;NR;C2
+Navassa Island;;KP1
 Nepal;NP;9N
 Netherlands;NL;PA-PB-PC-PD-PE-PF-PG-PH-PI
-New Caledonia;NC;FK-TX
+New Caledonia;NC;FK
 New Zealand;NZ;ZL-ZM
+New Zealand Subantarctic Islands;NZ;ZL9
 Nicaragua;NI;YN-H6-H7-HT
 Niger;NE;5U
 Nigeria;NG;5N
 Niue;NU;ZK2
 Norfolk Island;NF;VK9N
-Northern Ireland;NIE;GI-MI
+Northern Ireland;NIE;GI-GN
 Northern Mariana Islands;MP;KH0
 Norway;NO;LA-LB-LC-LD-LE-LF-LG-LH-LI-LJ-LK-LL-LM-LN
-Oman;OM;YP-YQ-YR
+Oman;OM;A4-YP-YQ-YR
 Pakistan;PK;AP
 Palau;PW;T8
 Palestine State of;PS;E4
+Palmyra & Jarvis Island;UM;KH5
 Panama;PA;HO-HP
 Papua New Guinea;PG;P2
 Paraguay;PY;ZP
 Peru;PE;OA-OB-OC
-Philippines;PH;DU-DV-DW-DX-DY-DZ-4D-4E-4F-4G-4H-4I
+Philippines;PH;DU-DV-DW-DX-DY-DZ
 Pitcairn;PN;VP6
 Poland;PL;3Z6-SN-SO-SP-SQ-SR
-Portugal;PT;CT-CU3
+Portugal;PT;CT
+Pratas Islands;;BV9P
+Prince Edward & Marion Islands;ZA;ZS8
 Puerto Rico;PR;KP3-KP4
 Qatar;QA;A7
-Reunion;RE;FR-TO
+Reunion;RE;FR
+Revillagigedo Islands;MX;XA4-XB4-XC4-XD4-XE4-XF4-XG4-XH4-XI4
+Rodriguez Island;MU;3B9
 Romania;RO;YO-YP-YQ-YR
-Russian Federation;RU;UA-UB-UC-UD-UE-UF-UG-UH-UI-RA-RB-RC-RD-RE-RF-RG-RH-RI-RJ-RK-RL-RM-RN-RO-RP-RQ-RR-RS-RT-RT-RU-RV-RW-RX-RY-RZ
 Rwanda;RW;9X
-Saint Barthelemy;BL;FJ-TO
-Saint Helena Ascension and Tristan da Cunha;SH;ZD9
+Sable Island;CA;CY0
+Saint Barthelemy;BL;FJ
+Saint Helena;SH;ZD7
 Saint Kitts and Nevis;KN;V4
 Saint Lucia;LC;J6
 Saint Martin (French part);MF;FS
@@ -194,26 +239,30 @@ Saint Vincent and the Grenadines;VC;J8
 Samoa;WS;5W
 San Marino;SM;T7
 Sao Tome and Principe;ST;S9
+Sardinia;IT;IS0-IM0
 Saudi Arabia;SA;HZ
-Scotland;SH;GM-2M0
+Scarborough Reef;;BS7
+Scotland;SH;GM-GS-2M0
 Senegal;SN;6V-6W
 Serbia;RS;YT-YU
 Seychelles;SC;S7
 Sierra Leone;SL;9L
 Singapore;SG;9V
+Sint Eustatius and Saba;NL;PJ5-PJ6
 Sint Maarten (Dutch part);SX;PJ7
 Slovakia;SK;OM
 Slovenia;SI;S5
 Solomon Islands;SB;H4
 Somalia;SO;T5-6O
-South Africa;ZA;ZS
+South Africa;ZA;ZR-ZS-ZT-ZU
 South Georgia and the South Sandwich Islands;GS;VP8S
-South Sudan;SS;ZR-ZS-ZT-ZU
+South Sudan;SS;Z8
 Spain;ES;EA-EB-EC-ED-EE-EF-EG-EH
 Sri Lanka;LK;4S
+St. Paul Island;US;CY9
 Sudan;SD;ST
 Suriname;SR;PZ
-Svalbard and Jan Mayen;SJ;JW
+Svalbard;NO;JW
 Swaziland;SZ;3DA
 Sweden;SE;SA-SB-SC-SD-SE-SF-SG-SH-SI-SJ-SK-SL-SM-7S-8S
 Switzerland;CH;HB
@@ -221,33 +270,39 @@ Syrian Arab Republic;SY;YK
 Taiwan Province of China;TW;BM-BO-BU-BV-BW-BX
 Tajikistan;TJ;EY
 Tanzania United Republic of;TZ;5H-5I
+Temotu Province;SB;H40
 Thailand;TH;HS-E2
 Timor-Leste;TL;4W
 Togo;TG;5V
 Tokelau;TK;ZK3
 Tonga;TO;A3
 Trinidad and Tobago;TT;9Y-9Z
+Tristan da Cunha & Gough Island;SH;ZD9
 Tunisia;TN;3V
 Turkey;TR;TA-TB-TC
 Turkmenistan;TM;EZ
 Turks and Caicos Islands;TC;VP5
 Tuvalu;TV;T2
 Uganda;UG;5X
-Ukraine;UA;UR-US-UT-UU-UV-UW-UX-UY-UZ
+UK Sov. Base Areas on Cyprus;CY;ZC4
+Ukraine;UA;UR-US-UT-UU-UV-UW-UX-UY-UZ-EM-EN-EO
 United Arab Emirates;AE;A6
-United Kingdom;GB;2E-M0-M1-M2-M3-M4-M5-M6-M7-M8-M9-MB-MM-G0-G1-G2-G3-G4-G5-G6-G7-G8-G9-GX
-United States;US;AA-AB-AC-AD-AE-AF-AG-AH-AI-AJ-AK-AL-K0-K1-K2-K3-K4-K5-K6-K7-K8-K9-KA-KB-KC-KD-KE-KF-KG-KH-KI-KJ-KK-KL-KM-KN-KO-KP-KQ-KR-KS-KT-KU-KV-KW-KX-KY-KZ-N0-N1-N2-N3-N4-N5-N6-N7-N8-N9-NA-NB-NC-ND-NE-NF-NG-NH-NI-NJ-NK-NL-NM-NN-NO-NP-NQ-NR-NS-NT-NU-NV-NW-NX-NY-NZ-W0-W1-W2-W3-W4-W5-W6-W7-W8-W9-WA-WB-WC-WD-WE-WF-WG-WH-WI-WJ-WK-WL-WM-WN-WO-WP-WQ-WR-WS-WT-WU-WV-WW-WX-WY-WZ
-United States Minor Outlying Islands;UM;
+United States;US;AA-AB-AC-AD-AE-AF-AG-AH-AI-AJ-AK-K0-K1-K2-K3-K4-K5-K6-K7-K8-K9-KA-KB-KC-KD-KE-KF-KG-KH-KI-KJ-KK-KM-KN-KO-KP-KQ-KR-KS-KT-KU-KV-KW-KX-KY-KZ-N0-N1-N2-N3-N4-N5-N6-N7-N8-N9-NA-NB-NC-ND-NE-NF-NG-NH-NI-NJ-NK-NM-NN-NO-NP-NQ-NR-NS-NT-NU-NV-NW-NX-NY-NZ-W0-W1-W2-W3-W4-W5-W6-W7-W8-W9-WA-WB-WC-WD-WE-WF-WG-WH-WI-WJ-WK-WM-WN-WO-WP-WQ-WR-WS-WT-WU-WV-WW-WX-WY-WZ
 Uruguay;UY;CV-CW-CX
 Uzbekistan;UZ;UJ-UK-UL-UM
 Vanuatu;VU;YJ
 Venezuela Bolivarian Republic of;VE;YV-YW-YX-YY-4M
+Aves Island;VE;YV0
 Viet Nam;VN;3W-XV
 Virgin Islands British;VG;VP2V
 Virgin Islands U.S.;VI;KP2
-Wales;WL;2W-GW-MW
+Wake Island;US;KH9
+Wales;WL;2W-GC-GW-MW
 Wallis and Futuna;WF;FW
+West Malaysia;MY;9M2-9M4
+Western Kiribati (Gilbert Island);KI;T30
 Western Sahara;EH;S0
+Willis Island;AU;VK9W
 Yemen;YE;7O
 Zambia;ZM;9I-9J
 Zimbabwe;ZW;Z2