diff --git a/dashboard/pgs/country.csv b/dashboard/pgs/country.csv
index 06f3425..ffbae24 100755
--- a/dashboard/pgs/country.csv
+++ b/dashboard/pgs/country.csv
@@ -82,7 +82,7 @@ Djibouti;DJ;J2
 Dodecanese;GR;SV5-J45
 Dominica;DM;J7
 Dominican Republic;DO;HI
-East Malaysia;MY;9M6-9M8
+East Malaysia;MY;9M6-9M8-9W6-9W8
 Easter Island;CL;CE0
 Eastern Kiribati (Line Island);KI;T32
 Ecuador;EC;HC-HD
@@ -117,7 +117,7 @@ Guadeloupe;GP;FG
 Guam;GU;KH2
 Guantanamo Bay;US;KG4
 Guatemala;GT;TG-TD
-Guernsey;GG;GU-GP
+Guernsey;GG;2U-MU-MP-GU-GP
 Guinea;GN;3X
 Guinea-Bissau;GW;J5
 Guyana;GY;8R
@@ -134,13 +134,13 @@ Indonesia;ID;YB-YC-YD-YE-YF-YG-YH
 Iran Islamic Republic of;IR;EP-EQ
 Iraq;IQ;YI
 Ireland;IE;EI-EJ
-Isle of Man;IM;GD-GT
+Isle of Man;IM;2D-MD-MT-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-8J-8N
-Jersey;JE;GJ-GH
+Jersey;JE;2J-MJ-MH-GJ-GH
 Johnston Island;US;KH3
 Jordan;JO;JY
 Kaliningrad;RU;UA2-RA2
@@ -203,7 +203,7 @@ Niger;NE;5U
 Nigeria;NG;5N
 Niue;NU;ZK2
 Norfolk Island;NF;VK9N
-Northern Ireland;NIE;MI-GI-GN-2I
+Northern Ireland;NIE;2I-MI-MN-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;A4-YP-YQ-YR
@@ -242,7 +242,7 @@ Sao Tome and Principe;ST;S9
 Sardinia;IT;IS0-IM0
 Saudi Arabia;SA;HZ
 Scarborough Reef;;BS7
-Scotland;SH;GM-GS-MM-2M0
+Scotland;SH;2M-MM-MS-GM-GS
 Senegal;SN;6V-6W
 Serbia;RS;YT-YU
 Seychelles;SC;S7
@@ -297,9 +297,9 @@ Viet Nam;VN;3W-XV
 Virgin Islands British;VG;VP2V
 Virgin Islands U.S.;VI;KP2
 Wake Island;US;KH9
-Wales;WL;2W-GC-GW-MW
+Wales;WL;2W-MW-MC-GW-GC
 Wallis and Futuna;WF;FW
-West Malaysia;MY;9M2-9M4-9W2
+West Malaysia;MY;9M2-9M4-9W2-9W4
 Western Kiribati (Gilbert Island);KI;T30
 Western Sahara;EH;S0
 Willis Island;AU;VK9W
diff --git a/dashboard2/pgs/country.csv b/dashboard2/pgs/country.csv
index 9847c24..ffbae24 100755
--- a/dashboard2/pgs/country.csv
+++ b/dashboard2/pgs/country.csv
@@ -16,7 +16,7 @@ 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
+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-R8-R9
 Australia;AU;VK-AX
 Austria;AT;OE
 Azerbaijan;AZ;4J-4K
@@ -93,7 +93,7 @@ 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
+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-R1-R2-R3-R4-R5-R6-R7
 Falkland Islands (Malvinas);FK;VP8
 Faroe Islands;FO;OY
 Fiji;FJ;3D2
@@ -117,7 +117,7 @@ Guadeloupe;GP;FG
 Guam;GU;KH2
 Guantanamo Bay;US;KG4
 Guatemala;GT;TG-TD
-Guernsey;GG;GU-GP
+Guernsey;GG;2U-MU-MP-GU-GP
 Guinea;GN;3X
 Guinea-Bissau;GW;J5
 Guyana;GY;8R
@@ -134,13 +134,13 @@ Indonesia;ID;YB-YC-YD-YE-YF-YG-YH
 Iran Islamic Republic of;IR;EP-EQ
 Iraq;IQ;YI
 Ireland;IE;EI-EJ
-Isle of Man;IM;GD-GT
+Isle of Man;IM;2D-MD-MT-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-8J-8N
-Jersey;JE;GJ-GH
+Jersey;JE;2J-MJ-MH-GJ-GH
 Johnston Island;US;KH3
 Jordan;JO;JY
 Kaliningrad;RU;UA2-RA2
@@ -203,7 +203,7 @@ Niger;NE;5U
 Nigeria;NG;5N
 Niue;NU;ZK2
 Norfolk Island;NF;VK9N
-Northern Ireland;NIE;MI-GI-GN-2I
+Northern Ireland;NIE;2I-MI-MN-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;A4-YP-YQ-YR
@@ -242,7 +242,7 @@ Sao Tome and Principe;ST;S9
 Sardinia;IT;IS0-IM0
 Saudi Arabia;SA;HZ
 Scarborough Reef;;BS7
-Scotland;SH;GM-GS-MM-2M0
+Scotland;SH;2M-MM-MS-GM-GS
 Senegal;SN;6V-6W
 Serbia;RS;YT-YU
 Seychelles;SC;S7
@@ -297,7 +297,7 @@ Viet Nam;VN;3W-XV
 Virgin Islands British;VG;VP2V
 Virgin Islands U.S.;VI;KP2
 Wake Island;US;KH9
-Wales;WL;2W-GC-GW-MW
+Wales;WL;2W-MW-MC-GW-GC
 Wallis and Futuna;WF;FW
 West Malaysia;MY;9M2-9M4-9W2-9W4
 Western Kiribati (Gilbert Island);KI;T30