diff --git a/sql/basedata.sql b/sql/basedata.sql
index 79f347e..3aed134 100644
--- a/sql/basedata.sql
+++ b/sql/basedata.sql
@@ -9,29 +9,30 @@ INSERT OR IGNORE INTO "families" VALUES (2, "Motion");
 INSERT OR IGNORE INTO "models" VALUES ( 1, 1, "BBB100-1");
 INSERT OR IGNORE INTO "models" VALUES ( 2, 1, "BBB100-2");
 INSERT OR IGNORE INTO "models" VALUES ( 3, 1, "BBB100-3");
-INSERT OR IGNORE INTO "models" VALUES ( 4, 1, "BBB100-4/-5");
-INSERT OR IGNORE INTO "models" VALUES ( 5, 1, "BBB100-6");
-INSERT OR IGNORE INTO "models" VALUES ( 6, 1, "BBB100-7");
-INSERT OR IGNORE INTO "models" VALUES ( 7, 2, "BBD100-1");
-INSERT OR IGNORE INTO "models" VALUES ( 8, 2, "BBD100-2");
-INSERT OR IGNORE INTO "models" VALUES ( 9, 2, "BBD100-6");
+INSERT OR IGNORE INTO "models" VALUES ( 4, 1, "BBB100-4");
+INSERT OR IGNORE INTO "models" VALUES ( 5, 1, "BBB100-5");
+INSERT OR IGNORE INTO "models" VALUES ( 6, 1, "BBB100-6");
+INSERT OR IGNORE INTO "models" VALUES ( 7, 1, "BBB100-7");
+INSERT OR IGNORE INTO "models" VALUES ( 8, 2, "BBD100-1");
+INSERT OR IGNORE INTO "models" VALUES ( 9, 2, "BBD100-2");
+INSERT OR IGNORE INTO "models" VALUES (10, 2, "BBD100-6");
 
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-001", 1, "Unlocked USA");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-003", 1, "Bell");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-005", 1, "Rogers");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-007", 1, "Telus");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-009", 1, "Hong Kong");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-010", 1, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-013", 1, "");
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-010", 1, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-013", 1, NULL);
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-017", 1, "Caribbean");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-020", 1, "");
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-020", 1, NULL);
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-021", 1, "Hong Kong?");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-023", 1, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-024", 1, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-026", 1, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-027", 1, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-029", 1, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-033", 1, "");
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-023", 1, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-024", 1, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-026", 1, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-027", 1, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-029", 1, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-033", 1, NULL);
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-036", 1, "AT&T");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-039", 1, "Black KEYone Canada");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-040", 1, "Black KEYone Malaysia");
@@ -40,36 +41,36 @@ INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-042", 1, "Black KEYone");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-043", 1, "Black KEYone");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-044", 1, "Black KEYone Hong Kong");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-047", 1, "Black KEYone");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-050", 1, "");
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-050", 1, NULL);
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-051", 1, "Black KEYone");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-055", 1, "Black KEYone Korea");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63116-700", 1, "Prerelease");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-003", 2, "Unlocked UK");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-011", 2, "Unlocked EMEA");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-015", 2, "NL, Belgium");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-017", 2, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-019", 2, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-021", 2, "");
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-017", 2, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-019", 2, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-021", 2, NULL);
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-023", 2, "AZERTY Belgium");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-025", 2, "");
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-025", 2, NULL);
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-027", 2, "QWERTY UAE");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-028", 2, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-029", 2, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-030", 2, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-031", 2, "");
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-028", 2, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-029", 2, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-030", 2, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-031", 2, NULL);
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-034", 2, "UAE?");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-035", 2, "Black KEYone UK");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-036", 2, "");
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-036", 2, NULL);
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-037", 2, "Black KEYone Middle East");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-039", 2, "Black KEYone Europe");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-040", 2, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-041", 2, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-042", 2, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-043", 2, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-044", 2, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-045", 2, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-046", 2, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-047", 2, "");
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-040", 2, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-041", 2, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-042", 2, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-043", 2, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-044", 2, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-045", 2, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-046", 2, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-047", 2, NULL);
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-703", 2, "Prerelease");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-704", 2, "Prerelease");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63117-717", 2, "Prerelease Black KEYone");
@@ -79,17 +80,19 @@ INSERT OR IGNORE INTO "devices" VALUES ("PRD-63734-001", 4, "Unlocked -4");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63734-002", 4, "Unlocked -4");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63734-003", 4, "Unlocked -5");
 INSERT OR IGNORE INTO "devices" VALUES ("PRD-63734-004", 4, "Unlocked -5");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63763-001", 5, "Unlocked");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63763-002", 5, "Unlocked Black KEYone");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63764-001", 6, "Unlocked");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63737-003", 7, "UK");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63737-007", 7, "Europe");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63737-009", 7, "Europe");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63737-010", 7, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63739-009", 8, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63739-010", 8, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63753-002", 9, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63753-003", 9, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63753-011", 9, "");
-INSERT OR IGNORE INTO "devices" VALUES ("PRD-63753-017", 9, "");
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63736-002", 5, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63737-003", 8, "UK");
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63737-007", 8, "Europe");
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63737-009", 8, "Europe");
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63737-010", 8, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63739-009", 9, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63739-010", 9, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63753-002", 10, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63753-003", 10, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63753-011", 10, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63753-017", 10, NULL);
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63763-001", 6, "Unlocked");
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63763-002", 6, "Unlocked Black KEYone");
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63764-001", 7, "Unlocked");
+INSERT OR IGNORE INTO "devices" VALUES ("PRD-63764-002", 7, "Unlocked Black KEYone Indonesia");
 COMMIT;