diff --git a/databases/_private.db.sql b/databases/_private.db.sql
index 6db6afd..0324481 100644
--- a/databases/_private.db.sql
+++ b/databases/_private.db.sql
@@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS "categoryVotes" (
 	"userID"	TEXT NOT NULL,
 	"hashedIP"	TEXT NOT NULL,
 	"category"	TEXT NOT NULL,
-	"timeSubmitted"	INTEGER NOT NULL,
+	"timeSubmitted"	INTEGER NOT NULL
 );
 
 CREATE TABLE IF NOT EXISTS "sponsorTimes" (
diff --git a/databases/_sponsorTimes.db.sql b/databases/_sponsorTimes.db.sql
index 3924c6e..a7d5e4d 100644
--- a/databases/_sponsorTimes.db.sql
+++ b/databases/_sponsorTimes.db.sql
@@ -20,9 +20,9 @@ CREATE TABLE IF NOT EXISTS "userNames" (
 	"userName"	TEXT NOT NULL
 );
 CREATE TABLE IF NOT EXISTS "categoryVotes" (
-	"UUID" TEXT NOT NULL UNIQUE,
-	"category" TEXT NOT NULL,
-	"votes" INTEGER NOT NULL default '0'
+	"UUID"	TEXT NOT NULL UNIQUE,
+	"category"	TEXT NOT NULL,
+	"votes"	INTEGER NOT NULL default '0'
 );
 
 CREATE TABLE IF NOT EXISTS "version" (
diff --git a/src/routes/postSkipSegments.js b/src/routes/postSkipSegments.js
index d410568..3c33a83 100644
--- a/src/routes/postSkipSegments.js
+++ b/src/routes/postSkipSegments.js
@@ -239,7 +239,9 @@ module.exports = async function postSkipSegments(req, res) {
                 segmentInfo.segment[1]  + segmentInfo.category + userID, 1);
 
             try {
-                db.prepare("INSERT INTO sponsorTimes VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)").run(videoID, segmentInfo.segment[0], 
+                db.prepare("INSERT INTO sponsorTimes " + 
+                    "(videoID, startTime, endTime, votes, UUID, userID, timeSubmitted, views, category, shadowHidden)" +
+                    "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)").run(videoID, segmentInfo.segment[0], 
                     segmentInfo.segment[1], startingVotes, UUID, userID, timeSubmitted, 0, segmentInfo.category, shadowBanned);
             
                 //add to private db as well
diff --git a/src/routes/voteOnSponsorTime.js b/src/routes/voteOnSponsorTime.js
index 94ac13f..992512a 100644
--- a/src/routes/voteOnSponsorTime.js
+++ b/src/routes/voteOnSponsorTime.js
@@ -44,9 +44,12 @@ function categoryVote(UUID, userID, isVIP, category, hashedIP, res) {
 
     // See if the submissions categort is ready to change
     let currentCategory = db.prepare("select category from sponsorTimes where UUID = ?").get(UUID);
+    let currentCategoryCount = db.prepare("select votes from categoryVotes where UUID = ? and category = ?").get(UUID, currentCategory).votes;
     // Change this value from 1 in the future to make it harder to change categories
-    let currentCategoryCount = db.prepare("select votes from categoryVotes where UUID = ? and category = ?").get(UUID, currentCategory).votes ?? 1;
-    let nextCategoryCount = previousVoteInfo.votes ?? 1;
+    // Done this way without ORs incase the value is zero
+    if (currentCategoryCount === undefined || currentCategoryCount === null) currentCategoryCount = 1;
+
+    let nextCategoryCount = (previousVoteInfo.votes || 0) + 1;
 
     //TODO: In the future, raise this number from zero to make it harder to change categories
     if (nextCategoryCount - currentCategoryCount >= 0) {
diff --git a/test/cases/getSavedTimeForUser.js b/test/cases/getSavedTimeForUser.js
index e3976c1..5df8a48 100644
--- a/test/cases/getSavedTimeForUser.js
+++ b/test/cases/getSavedTimeForUser.js
@@ -5,7 +5,8 @@ var getHash = require('../../src/utils/getHash.js');
 
 describe('getSavedTimeForUser', () => {
   before(() => {
-    db.exec("INSERT INTO sponsorTimes VALUES ('getSavedTimeForUser', 1, 11, 2, 'abc1239999', '" + getHash("testman") + "', 0, 50, 'sponsor', 0)");
+    let startOfQuery = "INSERT INTO sponsorTimes (videoID, startTime, endTime, votes, UUID, userID, timeSubmitted, views, category, shadowHidden) VALUES";
+    db.exec(startOfQuery + "('getSavedTimeForUser', 1, 11, 2, 'abc1239999', '" + getHash("testman") + "', 0, 50, 'sponsor', 0)");
   }); 
 
   it('Should be able to get a 200', (done) => {
diff --git a/test/cases/getSkipSegments.js b/test/cases/getSkipSegments.js
index 21c9f91..5c15c63 100644
--- a/test/cases/getSkipSegments.js
+++ b/test/cases/getSkipSegments.js
@@ -18,13 +18,14 @@ var utils = require('../utils.js');
 
 describe('getSkipSegments', () => {
   before(() => {
-    db.exec("INSERT INTO sponsorTimes VALUES ('testtesttest', 1, 11, 2, '1-uuid-0', 'testman', 0, 50, 'sponsor', 0)");
-    db.exec("INSERT INTO sponsorTimes VALUES ('testtesttest', 20, 33, 2, '1-uuid-2', 'testman', 0, 50, 'intro', 0)");
-    db.exec("INSERT INTO sponsorTimes VALUES ('testtesttest,test', 1, 11, 2, '1-uuid-1', 'testman', 0, 50, 'sponsor', 0)");
-    db.exec("INSERT INTO sponsorTimes VALUES ('test3', 1, 11, 2, '1-uuid-4', 'testman', 0, 50, 'sponsor', 0)");
-    db.exec("INSERT INTO sponsorTimes VALUES ('test3', 7, 22, -3, '1-uuid-5', 'testman', 0, 50, 'sponsor', 0)");
-    db.exec("INSERT INTO sponsorTimes VALUES ('multiple', 1, 11, 2, '1-uuid-6', 'testman', 0, 50, 'intro', 0)");
-    db.exec("INSERT INTO sponsorTimes VALUES ('multiple', 20, 33, 2, '1-uuid-7', 'testman', 0, 50, 'intro', 0)");
+    let startOfQuery = "INSERT INTO sponsorTimes (videoID, startTime, endTime, votes, UUID, userID, timeSubmitted, views, category, shadowHidden) VALUES";
+    db.exec(startOfQuery + "('testtesttest', 1, 11, 2, '1-uuid-0', 'testman', 0, 50, 'sponsor', 0)");
+    db.exec(startOfQuery + "('testtesttest', 20, 33, 2, '1-uuid-2', 'testman', 0, 50, 'intro', 0)");
+    db.exec(startOfQuery + "('testtesttest,test', 1, 11, 2, '1-uuid-1', 'testman', 0, 50, 'sponsor', 0)");
+    db.exec(startOfQuery + "('test3', 1, 11, 2, '1-uuid-4', 'testman', 0, 50, 'sponsor', 0)");
+    db.exec(startOfQuery + "('test3', 7, 22, -3, '1-uuid-5', 'testman', 0, 50, 'sponsor', 0)");
+    db.exec(startOfQuery + "('multiple', 1, 11, 2, '1-uuid-6', 'testman', 0, 50, 'intro', 0)");
+    db.exec(startOfQuery + "('multiple', 20, 33, 2, '1-uuid-7', 'testman', 0, 50, 'intro', 0)");
   }); 
   
 
diff --git a/test/cases/oldGetSponsorTime.js b/test/cases/oldGetSponsorTime.js
index ffb1264..569b109 100644
--- a/test/cases/oldGetSponsorTime.js
+++ b/test/cases/oldGetSponsorTime.js
@@ -19,8 +19,9 @@ var utils = require('../utils.js');
 
 describe('getVideoSponsorTime (Old get method)', () => {
   before(() => {
-    db.exec("INSERT INTO sponsorTimes VALUES ('old-testtesttest', 1, 11, 2, 'uuid-0', 'testman', 0, 50, 'sponsor', 0)");
-    db.exec("INSERT INTO sponsorTimes VALUES ('old-testtesttest,test', 1, 11, 2, 'uuid-1', 'testman', 0, 50, 'sponsor', 0)");
+    let startOfQuery = "INSERT INTO sponsorTimes (videoID, startTime, endTime, votes, UUID, userID, timeSubmitted, views, category, shadowHidden) VALUES";
+    db.exec(startOfQuery + "('old-testtesttest', 1, 11, 2, 'uuid-0', 'testman', 0, 50, 'sponsor', 0)");
+    db.exec(startOfQuery + "('old-testtesttest,test', 1, 11, 2, 'uuid-1', 'testman', 0, 50, 'sponsor', 0)");
   }); 
 
   it('Should be able to get a time', (done) => {