diff --git a/storage/db/db.go b/storage/db/db.go
index 6794847..5c03b4f 100644
--- a/storage/db/db.go
+++ b/storage/db/db.go
@@ -86,21 +86,22 @@
 CREATE INDEX IF NOT EXISTS UploadDaySeq ON Uploads(Day, Seq);
 {{end}}
 CREATE TABLE IF NOT EXISTS Records (
-	UploadID VARCHAR(20),
-	RecordID BIGINT UNSIGNED,
-	Content BLOB,
+	UploadID VARCHAR(20) NOT NULL,
+	RecordID BIGINT UNSIGNED NOT NULL,
+	Content BLOB NOT NULL,
 	PRIMARY KEY (UploadID, RecordID),
 	FOREIGN KEY (UploadID) REFERENCES Uploads(UploadID) ON UPDATE CASCADE ON DELETE CASCADE
 );
 CREATE TABLE IF NOT EXISTS RecordLabels (
-	UploadID VARCHAR(20),
-	RecordID BIGINT UNSIGNED,
-	Name VARCHAR(255),
-	Value VARCHAR(8192),
+	UploadID VARCHAR(20) NOT NULL,
+	RecordID BIGINT UNSIGNED NOT NULL,
+	Name VARCHAR(255) NOT NULL,
+	Value VARCHAR(8192) NOT NULL,
 {{if not .sqlite3}}
 	Index (Name(100), Value(100)),
 {{end}}
-       FOREIGN KEY (UploadID, RecordID) REFERENCES Records(UploadID, RecordID) ON UPDATE CASCADE ON DELETE CASCADE
+	PRIMARY KEY (UploadID, RecordID, Name),
+	FOREIGN KEY (UploadID, RecordID) REFERENCES Records(UploadID, RecordID) ON UPDATE CASCADE ON DELETE CASCADE
 );
 {{if .sqlite3}}
 CREATE INDEX IF NOT EXISTS RecordLabelsNameValue ON RecordLabels(Name, Value);