diff --git a/src/databases/Postgres.ts b/src/databases/Postgres.ts
index 8e004ac..e5e31d3 100644
--- a/src/databases/Postgres.ts
+++ b/src/databases/Postgres.ts
@@ -38,10 +38,35 @@ export class Postgres implements IDatabase {
 
         switch (type) {
             case 'get': {
-                return queryResult.rows[0];
+                const value = queryResult.rows[0];
+                Logger.debug(`result (postgres): ${JSON.stringify(value)}`);
+                if (value) {
+                    for (const [key, v] of Object.entries(value)) {
+                        if (!isNaN(v as any)) {
+                            value[key] = parseFloat(v as string)
+                        }
+                    }
+                }
+
+                Logger.debug(`result (postgres): ${value}`);
+                return value;
             }
             case 'all': {
-                return queryResult.rows;
+                let values = queryResult.rows;
+                if (values) {
+                    values = values.map((row) => {
+                        for (const [key, v] of Object.entries(row)) {
+                            if (!isNaN(v as any)) {
+                                row[key] = parseFloat(v as string)
+                            }
+                        }
+
+                        return row;
+                    });
+                }
+
+                Logger.debug(`result (postgres): ${values}`);
+                return values;
             }
             case 'run': {
                 break;
diff --git a/src/routes/addUserAsVIP.ts b/src/routes/addUserAsVIP.ts
index 8b7c957..71ab186 100644
--- a/src/routes/addUserAsVIP.ts
+++ b/src/routes/addUserAsVIP.ts
@@ -27,7 +27,7 @@ export async function addUserAsVIP(req: Request, res: Response) {
     }
 
     //check to see if this user is already a vip
-    const row = await db.prepare('get', 'SELECT count(*) as "userCount" FROM vipUsers WHERE userID = ?', [userID]);
+    const row = await db.prepare('get', 'SELECT count(*) as "userCount" FROM "vipUsers" WHERE "userID" = ?', [userID]);
 
     if (enabled && row.userCount == 0) {
         //add them to the vip list
diff --git a/src/routes/getTopUsers.ts b/src/routes/getTopUsers.ts
index 47cd95b..15ff3ae 100644
--- a/src/routes/getTopUsers.ts
+++ b/src/routes/getTopUsers.ts
@@ -23,9 +23,9 @@ async function generateTopUsersStats(sortBy: string, categoryStatsEnabled: boole
             "SUM(CASE WHEN category = 'music_offtopic' THEN 1 ELSE 0 END) as categoryMusicOfftopic, ";
     }
 
-    const rows = await db.prepare('all', `SELECT COUNT(*) as totalSubmissions, SUM(views) as viewCount,
-        SUM(("sponsorTimes.endTime" - "sponsorTimes.startTime") / 60 * "sponsorTimes.views") as minutesSaved,
-        SUM("votes") as userVotes, ` +
+    const rows = await db.prepare('all', `SELECT COUNT(*) as "totalSubmissions", SUM(views) as "viewCount",
+        SUM(("sponsorTimes.endTime" - "sponsorTimes.startTime") / 60 * "sponsorTimes.views") as "minutesSaved",
+        SUM("votes") as "userVotes", ` +
         additionalFields +
         `IFNULL("userNames.userName", "sponsorTimes.userID") as "userName" FROM "sponsorTimes" LEFT JOIN "userNames" ON "sponsorTimes.userID"="userNames.userID"
         LEFT JOIN "privateDB.shadowBannedUsers" ON "sponsorTimes.userID"="privateDB.shadowBannedUsers.userID"
diff --git a/src/routes/getTotalStats.ts b/src/routes/getTotalStats.ts
index dcc94e6..b851df2 100644
--- a/src/routes/getTotalStats.ts
+++ b/src/routes/getTotalStats.ts
@@ -14,8 +14,8 @@ let apiUsersCache = 0;
 let lastUserCountCheck = 0;
 
 export async function getTotalStats(req: Request, res: Response) {
-    let row = await db.prepare('get', "SELECT COUNT(DISTINCT userID) as userCount, COUNT(*) as totalSubmissions, " +
-        "SUM(views) as viewCount, SUM((endTime - startTime) / 60 * views) as minutesSaved FROM sponsorTimes WHERE shadowHidden != 1 AND votes >= 0", []);
+    let row = await db.prepare('get', `SELECT COUNT(DISTINCT "userID") as "userCount", COUNT(*) as "totalSubmissions",
+        SUM("views") as "viewCount", SUM(("endTime" - "startTime") / 60 * "views") as "minutesSaved" FROM "sponsorTimes" WHERE "shadowHidden" != 1 AND "votes" >= 0`, []);
 
     if (row !== undefined) {
         let extensionUsers = chromeUsersCache + firefoxUsersCache;
diff --git a/src/routes/getUserInfo.ts b/src/routes/getUserInfo.ts
index a8d92c7..ca1066c 100644
--- a/src/routes/getUserInfo.ts
+++ b/src/routes/getUserInfo.ts
@@ -5,7 +5,7 @@ import {Logger} from '../utils/logger'
 
 async function dbGetSubmittedSegmentSummary(userID: string): Promise<{ minutesSaved: number, segmentCount: number }> {
     try {
-        let row = await db.prepare("get", "SELECT SUM(((endTime - startTime) / 60) * views) as minutesSaved, count(*) as segmentCount FROM sponsorTimes WHERE userID = ? AND votes > -2 AND shadowHidden != 1", [userID]);
+        let row = await db.prepare("get", `SELECT SUM((("endTime" - "startTime") / 60) * "views") as "minutesSaved", count(*) as "segmentCount" FROM "sponsorTimes" WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" != 1`, [userID]);
         if (row.minutesSaved != null) {
             return {
                 minutesSaved: row.minutesSaved,
@@ -24,7 +24,7 @@ async function dbGetSubmittedSegmentSummary(userID: string): Promise<{ minutesSa
 
 async function dbGetUsername(userID: string) {
     try {
-        let row = await db.prepare('get', "SELECT userName FROM userNames WHERE userID = ?", [userID]);
+        let row = await db.prepare('get', `SELECT "userName" FROM "userNames" WHERE "userID" = ?`, [userID]);
         if (row !== undefined) {
             return row.userName;
         } else {
@@ -38,7 +38,7 @@ async function dbGetUsername(userID: string) {
 
 async function dbGetViewsForUser(userID: string) {
     try {
-        let row = await db.prepare('get', "SELECT SUM(views) as viewCount FROM sponsorTimes WHERE userID = ? AND votes > -2 AND shadowHidden != 1", [userID]);
+        let row = await db.prepare('get', `SELECT SUM("views") as "viewCount" FROM "sponsorTimes" WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" != 1`, [userID]);
         //increase the view count by one
         if (row.viewCount != null) {
             return row.viewCount;
@@ -52,7 +52,7 @@ async function dbGetViewsForUser(userID: string) {
 
 async function dbGetWarningsForUser(userID: string): Promise<number> {
     try {
-        let rows = await db.prepare('all', "SELECT * FROM warnings WHERE userID = ?", [userID]);
+        let rows = await db.prepare('all', `SELECT * FROM "warnings" WHERE "userID" = ?`, [userID]);
         return rows.length;
     } catch (err) {
         Logger.error('Couldn\'t get warnings for user ' + userID + '. returning 0');
diff --git a/src/routes/getUsername.ts b/src/routes/getUsername.ts
index ef8966a..f8f7e1a 100644
--- a/src/routes/getUsername.ts
+++ b/src/routes/getUsername.ts
@@ -16,7 +16,7 @@ export async function getUsername(req: Request, res: Response) {
     userID = getHash(userID);
 
     try {
-        let row = await db.prepare('get', "SELECT userName FROM userNames WHERE userID = ?", [userID]);
+        let row = await db.prepare('get', `SELECT "userName" FROM "userNames" WHERE "userID" = ?`, [userID]);
 
         if (row !== undefined) {
             res.send({
diff --git a/src/routes/getViewsForUser.ts b/src/routes/getViewsForUser.ts
index 2daba71..ccc0344 100644
--- a/src/routes/getViewsForUser.ts
+++ b/src/routes/getViewsForUser.ts
@@ -16,7 +16,7 @@ export async function getViewsForUser(req: Request, res: Response) {
     userID = getHash(userID);
 
     try {
-        let row = await db.prepare('get', "SELECT SUM(views) as viewCount FROM sponsorTimes WHERE userID = ?", [userID]);
+        let row = await db.prepare('get', `SELECT SUM("views") as "viewCount" FROM "sponsorTimes" WHERE "userID" = ?`, [userID]);
 
         //increase the view count by one
         if (row.viewCount != null) {
diff --git a/src/routes/postNoSegments.ts b/src/routes/postNoSegments.ts
index c92a19b..6ab49a7 100644
--- a/src/routes/postNoSegments.ts
+++ b/src/routes/postNoSegments.ts
@@ -35,7 +35,7 @@ export async function postNoSegments(req: Request, res: Response) {
     }
 
     // Get existing no segment markers
-    let noSegmentList = await db.prepare('all', 'SELECT category from noSegments where videoID = ?', [videoID]);
+    let noSegmentList = await db.prepare('all', 'SELECT "category" from "noSegments" where "videoID" = ?', [videoID]);
     if (!noSegmentList || noSegmentList.length === 0) {
         noSegmentList = [];
     } else {
@@ -59,7 +59,7 @@ export async function postNoSegments(req: Request, res: Response) {
     // create database entry
     for (const category of categoriesToMark) {
         try {
-            await db.prepare('run', "INSERT INTO noSegments (videoID, userID, category) VALUES(?, ?, ?)", [videoID, userID, category]);
+            await db.prepare('run', `INSERT INTO "noSegments" ("videoID", "userID", "category") VALUES(?, ?, ?)`, [videoID, userID, category]);
         } catch (err) {
             Logger.error("Error submitting 'noSegment' marker for category '" + category + "' for video '" + videoID + "'");
             Logger.error(err);
diff --git a/src/routes/postSegmentShift.ts b/src/routes/postSegmentShift.ts
index 47e0f85..0b7f9ab 100644
--- a/src/routes/postSegmentShift.ts
+++ b/src/routes/postSegmentShift.ts
@@ -76,7 +76,7 @@ export async function postSegmentShift(req: Request, res: Response): Promise<Res
     }
 
     try {
-        const segments = await db.prepare('all', 'SELECT startTime, endTime, UUID FROM sponsorTimes WHERE videoID = ?', [videoID]);
+        const segments = await db.prepare('all', 'SELECT "startTime", "endTime", "UUID" FROM "sponsorTimes" WHERE "videoID" = ?', [videoID]);
         const shift = {
             startTime,
             endTime,
@@ -86,10 +86,10 @@ export async function postSegmentShift(req: Request, res: Response): Promise<Res
             const result = shiftSegment(segment, shift);
             switch (result.action) {
                 case ACTION_UPDATE:
-                    await db.prepare('run', 'UPDATE sponsorTimes SET startTime = ?, endTime = ? WHERE UUID = ?', [result.segment.startTime, result.segment.endTime, result.segment.UUID]);
+                    await db.prepare('run', 'UPDATE "sponsorTimes" SET "startTime" = ?, "endTime" = ? WHERE "UUID" = ?', [result.segment.startTime, result.segment.endTime, result.segment.UUID]);
                     break;
                 case ACTION_REMOVE:
-                    await db.prepare('run', 'UPDATE sponsorTimes SET startTime = ?, endTime = ?, votes = -2 WHERE UUID = ?', [result.segment.startTime, result.segment.endTime, result.segment.UUID]);
+                    await db.prepare('run', 'UPDATE "sponsorTimes" SET "startTime" = ?, "endTime" = ?, "votes" = -2 WHERE "UUID" = ?', [result.segment.startTime, result.segment.endTime, result.segment.UUID]);
                     break;
             }
         };
diff --git a/src/routes/postWarning.ts b/src/routes/postWarning.ts
index 1d3a362..a5e720c 100644
--- a/src/routes/postWarning.ts
+++ b/src/routes/postWarning.ts
@@ -22,17 +22,17 @@ export async function postWarning(req: Request, res: Response) {
     let resultStatus = "";
 
     if (enabled) {
-        let previousWarning = await db.prepare('get', 'SELECT * FROM warnings WHERE userID = ? AND issuerUserID = ?', [userID, issuerUserID]);
+        let previousWarning = await db.prepare('get', 'SELECT * FROM "warnings" WHERE "userID" = ? AND "issuerUserID" = ?', [userID, issuerUserID]);
 
         if (!previousWarning) {
-            await db.prepare('run', 'INSERT INTO warnings (userID, issueTime, issuerUserID, enabled) VALUES (?, ?, ?, 1)', [userID, issueTime, issuerUserID]);
+            await db.prepare('run', 'INSERT INTO "warnings" ("userID", "issueTime", "issuerUserID", "enabled") VALUES (?, ?, ?, 1)', [userID, issueTime, issuerUserID]);
             resultStatus = "issued to";
         } else {
             res.status(409).send();
             return;
         }
     } else {
-        await db.prepare('run', 'UPDATE warnings SET enabled = 0 WHERE userID = ? AND issuerUserID = ?', [userID, issuerUserID]);
+        await db.prepare('run', 'UPDATE "warnings" SET "enabled" = 0 WHERE "userID" = ? AND "issuerUserID" = ?', [userID, issuerUserID]);
         resultStatus = "removed from";
     }
 
diff --git a/src/routes/setUsername.ts b/src/routes/setUsername.ts
index 02ae415..d40180f 100644
--- a/src/routes/setUsername.ts
+++ b/src/routes/setUsername.ts
@@ -38,14 +38,14 @@ export async function setUsername(req: Request, res: Response) {
 
     try {
         //check if username is already set
-        let row = await db.prepare('get', "SELECT count(*) as count FROM userNames WHERE userID = ?", [userID]);
+        let row = await db.prepare('get', `SELECT count(*) as count FROM "userNames" WHERE "userID" = ?`, [userID]);
 
         if (row.count > 0) {
             //already exists, update this row
-            await db.prepare('run', "UPDATE userNames SET userName = ? WHERE userID = ?", [userName, userID]);
+            await db.prepare('run', `UPDATE "userNames" SET "userName" = ? WHERE "userID" = ?`, [userName, userID]);
         } else {
             //add to the db
-            await db.prepare('run', "INSERT INTO userNames VALUES(?, ?)", [userID, userName]);
+            await db.prepare('run', `INSERT INTO "userNames" VALUES(?, ?)`, [userID, userName]);
         }
 
         res.sendStatus(200);
diff --git a/src/routes/shadowBanUser.ts b/src/routes/shadowBanUser.ts
index a115c7c..4007f7b 100644
--- a/src/routes/shadowBanUser.ts
+++ b/src/routes/shadowBanUser.ts
@@ -23,7 +23,7 @@ export async function shadowBanUser(req: Request, res: Response) {
     //hash the userID
     adminUserIDInput = getHash(adminUserIDInput);
 
-    const isVIP = (await db.prepare("get", "SELECT count(*) as userCount FROM vipUsers WHERE userID = ?", [adminUserIDInput])).userCount > 0;
+    const isVIP = (await db.prepare("get", `SELECT count(*) as "userCount" FROM "vipUsers" WHERE "userID" = ?`, [adminUserIDInput])).userCount > 0;
     if (!isVIP) {
         //not authorized
         res.sendStatus(403);
@@ -32,36 +32,36 @@ export async function shadowBanUser(req: Request, res: Response) {
 
     if (userID) {
         //check to see if this user is already shadowbanned
-        const row = await privateDB.prepare('get', "SELECT count(*) as userCount FROM shadowBannedUsers WHERE userID = ?", [userID]);
+        const row = await privateDB.prepare('get', `SELECT count(*) as "userCount" FROM "shadowBannedUsers" WHERE "userID" = ?`, [userID]);
 
         if (enabled && row.userCount == 0) {
             //add them to the shadow ban list
 
             //add it to the table
-            await privateDB.prepare('run', "INSERT INTO shadowBannedUsers VALUES(?)", [userID]);
+            await privateDB.prepare('run', `INSERT INTO "shadowBannedUsers" VALUES(?)`, [userID]);
 
             //find all previous submissions and hide them
             if (unHideOldSubmissions) {
-                await db.prepare('run', "UPDATE sponsorTimes SET shadowHidden = 1 WHERE userID = ?"
-                                + " AND NOT EXISTS ( SELECT videoID, category FROM noSegments WHERE"
-                                + " sponsorTimes.videoID = noSegments.videoID AND sponsorTimes.category = noSegments.category)", [userID]);
+                await db.prepare('run', `UPDATE "sponsorTimes" SET "shadowHidden" = 1 WHERE "userID" = ?
+                                AND NOT EXISTS ( SELECT "videoID", "category" FROM "noSegments" WHERE
+                                "sponsorTimes.videoID" = "noSegments.videoID" AND "sponsorTimes.category" = "noSegments.category")`, [userID]);
             }
         } else if (!enabled && row.userCount > 0) {
             //remove them from the shadow ban list
-            await privateDB.prepare('run', "DELETE FROM shadowBannedUsers WHERE userID = ?", [userID]);
+            await privateDB.prepare('run', `DELETE FROM "shadowBannedUsers" WHERE userID = ?`, [userID]);
 
             //find all previous submissions and unhide them
             if (unHideOldSubmissions) {
-                let segmentsToIgnore = (await db.prepare('all', "SELECT UUID FROM sponsorTimes st "
-                                + "JOIN noSegments ns on st.videoID = ns.videoID AND st.category = ns.category WHERE st.userID = ?"
+                let segmentsToIgnore = (await db.prepare('all', `SELECT UUID FROM "sponsorTimes" st
+                                JOIN "noSegments" ns on "st.videoID" = "ns.videoID" AND st.category = ns.category WHERE "st.userID" = ?`
                                     , [userID])).map((item: {UUID: string}) => item.UUID);
-                let allSegments = (await db.prepare('all', "SELECT UUID FROM sponsorTimes st WHERE st.userID = ?", [userID]))
+                let allSegments = (await db.prepare('all', `SELECT "UUID" FROM "sponsorTimes" st WHERE "st.userID" = ?`, [userID]))
                                         .map((item: {UUID: string}) => item.UUID);
 
                 allSegments.filter((item: {uuid: string}) => {
                     return segmentsToIgnore.indexOf(item) === -1;
                 }).forEach((UUID: string) => {
-                    db.prepare('run', "UPDATE sponsorTimes SET shadowHidden = 0 WHERE UUID = ?", [UUID]);
+                    db.prepare('run', `UPDATE "sponsorTimes" SET "shadowHidden" = 0 WHERE "UUID" = ?`, [UUID]);
                 });
             }
         }
@@ -80,9 +80,9 @@ export async function shadowBanUser(req: Request, res: Response) {
 
             //find all previous submissions and hide them
             if (unHideOldSubmissions) {
-                await db.prepare('run', "UPDATE sponsorTimes SET shadowHidden = 1 WHERE timeSubmitted IN " +
-                    "(SELECT privateDB.timeSubmitted FROM sponsorTimes LEFT JOIN privateDB.sponsorTimes as privateDB ON sponsorTimes.timeSubmitted=privateDB.timeSubmitted " +
-                    "WHERE privateDB.hashedIP = ?)", [hashedIP]);
+                await db.prepare('run', `UPDATE "sponsorTimes" SET "shadowHidden" = 1 WHERE "timeSubmitted" IN
+                    (SELECT "privateDB.timeSubmitted" FROM "sponsorTimes" LEFT JOIN "privateDB.sponsorTimes" as "privateDB" ON "sponsorTimes.timeSubmitted"="privateDB.timeSubmitted"
+                    WHERE "privateDB.hashedIP" = ?)`, [hashedIP]);
             }
         } /*else if (!enabled && row.userCount > 0) {
             // //remove them from the shadow ban list
diff --git a/src/routes/viewedVideoSponsorTime.ts b/src/routes/viewedVideoSponsorTime.ts
index 41c6484..59ae2ae 100644
--- a/src/routes/viewedVideoSponsorTime.ts
+++ b/src/routes/viewedVideoSponsorTime.ts
@@ -10,7 +10,7 @@ export async function viewedVideoSponsorTime(req: Request, res: Response): Promi
     }
 
     //up the view count by one
-    await db.prepare('run', "UPDATE sponsorTimes SET views = views + 1 WHERE UUID = ?", [UUID]);
+    await db.prepare('run', `UPDATE "sponsorTimes" SET views = views + 1 WHERE "UUID" = ?`, [UUID]);
 
     return res.sendStatus(200);
 }
diff --git a/src/routes/voteOnSponsorTime.ts b/src/routes/voteOnSponsorTime.ts
index 41ca838..8ab4354 100644
--- a/src/routes/voteOnSponsorTime.ts
+++ b/src/routes/voteOnSponsorTime.ts
@@ -36,13 +36,13 @@ interface VoteData {
 }
 
 async function sendWebhooks(voteData: VoteData) {
-    const submissionInfoRow = await db.prepare('get', "SELECT s.videoID, s.userID, s.startTime, s.endTime, s.category, u.userName, " +
-        "(select count(1) from sponsorTimes where userID = s.userID) count, " +
-        "(select count(1) from sponsorTimes where userID = s.userID and votes <= -2) disregarded " +
-        "FROM sponsorTimes s left join userNames u on s.userID = u.userID where s.UUID=?",
+    const submissionInfoRow = await db.prepare('get', `SELECT "s.videoID", "s.userID", "s.startTime", "s.endTime", "s.category", "u.userName",
+        (select count(1) from "sponsorTimes" where "userID" = "s.userID") count,
+        (select count(1) from "sponsorTimes" where "userID" = "s.userID" and votes <= -2) disregarded
+        FROM "sponsorTimes" s left join "userNames" u on "s.userID" = "u.userID" where "s.UUID"=?`,
         [voteData.UUID]);
 
-    const userSubmissionCountRow = await db.prepare('get', "SELECT count(*) as submissionCount FROM sponsorTimes WHERE userID = ?", [voteData.nonAnonUserID]);
+    const userSubmissionCountRow = await db.prepare('get', `SELECT count(*) as "submissionCount" FROM "sponsorTimes" WHERE "userID" = ?`, [voteData.nonAnonUserID]);
 
     if (submissionInfoRow !== undefined && userSubmissionCountRow != undefined) {
         let webhookURL: string = null;
@@ -143,7 +143,7 @@ async function sendWebhooks(voteData: VoteData) {
 
 async function categoryVote(UUID: string, userID: string, isVIP: boolean, isOwnSubmission: boolean, category: string, hashedIP: string, res: Response) {
     // Check if they've already made a vote
-    const usersLastVoteInfo = await privateDB.prepare('get', "select count(*) as votes, category from categoryVotes where UUID = ? and userID = ?", [UUID, userID]);
+    const usersLastVoteInfo = await privateDB.prepare('get', `select count(*) as votes, category from "categoryVotes" where "UUID" = ? and "userID" = ?`, [UUID, userID]);
 
     if (usersLastVoteInfo?.category === category) {
         // Double vote, ignore
@@ -151,7 +151,7 @@ async function categoryVote(UUID: string, userID: string, isVIP: boolean, isOwnS
         return;
     }
 
-    const currentCategory = await db.prepare('get', "select category from sponsorTimes where UUID = ?", [UUID]);
+    const currentCategory = await db.prepare('get', `select category from "sponsorTimes" where "UUID" = ?`, [UUID]);
     if (!currentCategory) {
         // Submission doesn't exist
         res.status(400).send("Submission doesn't exist.");
@@ -163,35 +163,35 @@ async function categoryVote(UUID: string, userID: string, isVIP: boolean, isOwnS
         return;
     }
 
-    const nextCategoryInfo = await db.prepare("get", "select votes from categoryVotes where UUID = ? and category = ?", [UUID, category]);
+    const nextCategoryInfo = await db.prepare("get", `select votes from "categoryVotes" where "UUID" = ? and category = ?`, [UUID, category]);
 
     const timeSubmitted = Date.now();
 
     const voteAmount = isVIP ? 500 : 1;
 
     // Add the vote
-    if ((await db.prepare('get', "select count(*) as count from categoryVotes where UUID = ? and category = ?", [UUID, category])).count > 0) {
+    if ((await db.prepare('get', `select count(*) as count from "categoryVotes" where "UUID" = ? and category = ?`, [UUID, category])).count > 0) {
         // Update the already existing db entry
-        await db.prepare('run', "update categoryVotes set votes = votes + ? where UUID = ? and category = ?", [voteAmount, UUID, category]);
+        await db.prepare('run', `update "categoryVotes" set "votes" = "votes" + ? where "UUID" = ? and "category" = ?`, [voteAmount, UUID, category]);
     } else {
         // Add a db entry
-        await db.prepare('run', "insert into categoryVotes (UUID, category, votes) values (?, ?, ?)", [UUID, category, voteAmount]);
+        await db.prepare('run', `insert into "categoryVotes" ("UUID", "category", "votes") values (?, ?, ?)`, [UUID, category, voteAmount]);
     }
 
     // Add the info into the private db
     if (usersLastVoteInfo?.votes > 0) {
         // Reverse the previous vote
-        await db.prepare('run', "update categoryVotes set votes = votes - ? where UUID = ? and category = ?", [voteAmount, UUID, usersLastVoteInfo.category]);
+        await db.prepare('run', `update "categoryVotes" set "votes" = "votes" - ? where "UUID" = ? and "category" = ?`, [voteAmount, UUID, usersLastVoteInfo.category]);
 
-        await privateDB.prepare('run', "update categoryVotes set category = ?, timeSubmitted = ?, hashedIP = ? where userID = ? and UUID = ?", [category, timeSubmitted, hashedIP, userID, UUID]);
+        await privateDB.prepare('run', `update "categoryVotes" set "category" = ?, "timeSubmitted" = ?, "hashedIP" = ? where "userID" = ? and "UUID" = ?`, [category, timeSubmitted, hashedIP, userID, UUID]);
     } else {
-        await privateDB.prepare('run', "insert into categoryVotes (UUID, userID, hashedIP, category, timeSubmitted) values (?, ?, ?, ?, ?)", [UUID, userID, hashedIP, category, timeSubmitted]);
+        await privateDB.prepare('run', `insert into "categoryVotes" ("UUID", "userID", "hashedIP", "category", "timeSubmitted") values (?, ?, ?, ?, ?)`, [UUID, userID, hashedIP, category, timeSubmitted]);
     }
 
     // See if the submissions category is ready to change
-    const currentCategoryInfo = await db.prepare("get", "select votes from categoryVotes where UUID = ? and category = ?", [UUID, currentCategory.category]);
+    const currentCategoryInfo = await db.prepare("get", `select votes from "categoryVotes" where "UUID" = ? and category = ?`, [UUID, currentCategory.category]);
 
-    const submissionInfo = await db.prepare("get", "SELECT userID, timeSubmitted, votes FROM sponsorTimes WHERE UUID = ?", [UUID]);
+    const submissionInfo = await db.prepare("get", `SELECT "userID", "timeSubmitted", "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, [UUID]);
     const isSubmissionVIP = submissionInfo && await isUserVIP(submissionInfo.userID);
     const startingVotes = isSubmissionVIP ? 10000 : 1;
 
@@ -201,9 +201,9 @@ async function categoryVote(UUID: string, userID: string, isVIP: boolean, isOwnS
 
     // Add submission as vote
     if (!currentCategoryInfo && submissionInfo) {
-        await db.prepare("run", "insert into categoryVotes (UUID, category, votes) values (?, ?, ?)", [UUID, currentCategory.category, currentCategoryCount]);
+        await db.prepare("run", `insert into "categoryVotes" ("UUID", "category", "votes") values (?, ?, ?)`, [UUID, currentCategory.category, currentCategoryCount]);
 
-        await privateDB.prepare("run", "insert into categoryVotes (UUID, userID, hashedIP, category, timeSubmitted) values (?, ?, ?, ?, ?)", [UUID, submissionInfo.userID, "unknown", currentCategory.category, submissionInfo.timeSubmitted]);
+        await privateDB.prepare("run", `insert into "categoryVotes" ("UUID", "userID", "hashedIP", "category", "timeSubmitted") values (?, ?, ?, ?, ?)`, [UUID, submissionInfo.userID, "unknown", currentCategory.category, submissionInfo.timeSubmitted]);
     }
 
     const nextCategoryCount = (nextCategoryInfo?.votes || 0) + voteAmount;
@@ -212,7 +212,7 @@ async function categoryVote(UUID: string, userID: string, isVIP: boolean, isOwnS
     // VIPs change it every time
     if (nextCategoryCount - currentCategoryCount >= Math.max(Math.ceil(submissionInfo?.votes / 2), 2) || isVIP || isOwnSubmission) {
         // Replace the category
-        await db.prepare('run', "update sponsorTimes set category = ? where UUID = ?", [category, UUID]);
+        await db.prepare('run', `update "sponsorTimes" set "category" = ? where "UUID" = ?`, [category, UUID]);
     }
 
     res.sendStatus(200);
@@ -245,18 +245,18 @@ export async function voteOnSponsorTime(req: Request, res: Response) {
     const hashedIP = getHash(ip + config.globalSalt);
 
     //check if this user is on the vip list
-    const isVIP = (await db.prepare('get', "SELECT count(*) as userCount FROM vipUsers WHERE userID = ?", [nonAnonUserID])).userCount > 0;
+    const isVIP = (await db.prepare('get', `SELECT count(*) as "userCount" FROM "vipUsers" WHERE "userID" = ?`, [nonAnonUserID])).userCount > 0;
 
     //check if user voting on own submission
-    const isOwnSubmission = (await db.prepare("get", "SELECT UUID as submissionCount FROM sponsorTimes where userID = ? AND UUID = ?", [nonAnonUserID, UUID])) !== undefined;
+    const isOwnSubmission = (await db.prepare("get", `SELECT "UUID" as "submissionCount" FROM "sponsorTimes" where "userID" = ? AND "UUID" = ?`, [nonAnonUserID, UUID])) !== undefined;
 
     
     // If not upvote
     if (!isVIP && type !== 1) {
-        const isSegmentLocked = async () => !!(await db.prepare('get', "SELECT locked FROM sponsorTimes WHERE UUID = ?", [UUID]))?.locked; 
-        const isVideoLocked = async () => !!(await db.prepare('get', 'SELECT noSegments.category from noSegments left join sponsorTimes' + 
-                                ' on (noSegments.videoID = sponsorTimes.videoID and noSegments.category = sponsorTimes.category)' + 
-                                    ' where UUID = ?', [UUID]));
+        const isSegmentLocked = async () => !!(await db.prepare('get', `SELECT "locked" FROM "sponsorTimes" WHERE "UUID" = ?`, [UUID]))?.locked; 
+        const isVideoLocked = async () => !!(await db.prepare('get', 'SELECT "noSegments.category" from "noSegments" left join "sponsorTimes"' + 
+                                ' on ("noSegments.videoID" = "sponsorTimes.videoID" and "noSegments.category" = "sponsorTimes.category")' + 
+                                    ' where "UUID" = ?', [UUID]));
 
         if (await isSegmentLocked() || await isVideoLocked()) {
             res.status(403).send("Vote rejected: A moderator has decided that this segment is correct");
@@ -270,7 +270,7 @@ export async function voteOnSponsorTime(req: Request, res: Response) {
 
     if (type == 1 && !isVIP && !isOwnSubmission) {
         // Check if upvoting hidden segment
-        const voteInfo = await db.prepare('get', "SELECT votes FROM sponsorTimes WHERE UUID = ?", [UUID]);
+        const voteInfo = await db.prepare('get', `SELECT votes FROM "sponsorTimes" WHERE "UUID" = ?`, [UUID]);
 
         if (voteInfo && voteInfo.votes <= -2) {
             res.status(403).send("Not allowed to upvote segment with too many downvotes unless you are VIP.");
@@ -280,7 +280,7 @@ export async function voteOnSponsorTime(req: Request, res: Response) {
 
     const MILLISECONDS_IN_HOUR = 3600000;
     const now = Date.now();
-    const warningsCount = (await db.prepare('get', "SELECT count(1) as count FROM warnings WHERE userID = ? AND issueTime > ? AND enabled = 1",
+    const warningsCount = (await db.prepare('get', `SELECT count(1) as count FROM warnings WHERE "userID" = ? AND "issueTime" > ? AND enabled = 1`,
         [nonAnonUserID, Math.floor(now - (config.hoursAfterWarningExpires * MILLISECONDS_IN_HOUR))],
     )).count;
 
@@ -292,7 +292,7 @@ export async function voteOnSponsorTime(req: Request, res: Response) {
 
     try {
         //check if vote has already happened
-        const votesRow = await privateDB.prepare('get', "SELECT type FROM votes WHERE userID = ? AND UUID = ?", [userID, UUID]);
+        const votesRow = await privateDB.prepare('get', `SELECT "type" FROM "votes" WHERE "userID" = ? AND "UUID" = ?`, [userID, UUID]);
 
         //-1 for downvote, 1 for upvote. Maybe more depending on reputation in the future
         let incrementAmount = 0;
@@ -338,7 +338,7 @@ export async function voteOnSponsorTime(req: Request, res: Response) {
         }
 
         //check if the increment amount should be multiplied (downvotes have more power if there have been many views)
-        const row = await db.prepare('get', "SELECT videoID, votes, views FROM sponsorTimes WHERE UUID = ?", [UUID]) as 
+        const row = await db.prepare('get', `SELECT "videoID", votes, views FROM "sponsorTimes" WHERE "UUID" = ?`, [UUID]) as 
                         {videoID: VideoID, votes: number, views: number};
 
         if (voteTypeEnum === voteTypes.normal) {
@@ -357,16 +357,16 @@ export async function voteOnSponsorTime(req: Request, res: Response) {
 
         // Only change the database if they have made a submission before and haven't voted recently
         const ableToVote = isVIP
-            || ((await db.prepare("get", "SELECT userID FROM sponsorTimes WHERE userID = ?", [nonAnonUserID])) !== undefined
-                && (await privateDB.prepare("get", "SELECT userID FROM shadowBannedUsers WHERE userID = ?", [nonAnonUserID])) === undefined
-                && (await privateDB.prepare("get", "SELECT UUID FROM votes WHERE UUID = ? AND hashedIP = ? AND userID != ?", [UUID, hashedIP, userID])) === undefined);
+            || ((await db.prepare("get", `SELECT "userID" FROM "sponsorTimes" WHERE "userID" = ?`, [nonAnonUserID])) !== undefined
+                && (await privateDB.prepare("get", `SELECT userID FROM "shadowBannedUsers" WHERE "userID" = ?`, [nonAnonUserID])) === undefined
+                && (await privateDB.prepare("get", `SELECT "UUID" FROM "votes" WHERE "UUID" = ? AND "hashedIP" = ? AND "userID" != ?`, [UUID, hashedIP, userID])) === undefined);
 
         if (ableToVote) {
             //update the votes table
             if (votesRow != undefined) {
-                await privateDB.prepare('run', "UPDATE votes SET type = ? WHERE userID = ? AND UUID = ?", [type, userID, UUID]);
+                await privateDB.prepare('run', `UPDATE "votes" SET "type" = ? WHERE "userID" = ? AND "UUID" = ?`, [type, userID, UUID]);
             } else {
-                await privateDB.prepare('run', "INSERT INTO votes VALUES(?, ?, ?, ?)", [UUID, userID, hashedIP, type]);
+                await privateDB.prepare('run', `INSERT INTO "votes" VALUES(?, ?, ?, ?)`, [UUID, userID, hashedIP, type]);
             }
 
             let columnName = "";
@@ -378,13 +378,13 @@ export async function voteOnSponsorTime(req: Request, res: Response) {
 
             //update the vote count on this sponsorTime
             //oldIncrementAmount will be zero is row is null
-            await db.prepare('run', "UPDATE sponsorTimes SET " + columnName + " = " + columnName + " + ? WHERE UUID = ?", [incrementAmount - oldIncrementAmount, UUID]);
+            await db.prepare('run', 'UPDATE "sponsorTimes" SET ' + columnName + ' = ' + columnName + ' + ? WHERE "UUID" = ?', [incrementAmount - oldIncrementAmount, UUID]);
             if (isVIP && incrementAmount > 0 && voteTypeEnum === voteTypes.normal) {
                 // Lock this submission
-                await db.prepare('run', "UPDATE sponsorTimes SET locked = 1 WHERE UUID = ?", [UUID]);
+                await db.prepare('run', 'UPDATE "sponsorTimes" SET locked = 1 WHERE "UUID" = ?', [UUID]);
             } else if (isVIP && incrementAmount < 0 && voteTypeEnum === voteTypes.normal) {
                  // Unlock if a VIP downvotes it
-                 await db.prepare('run', "UPDATE sponsorTimes SET locked = 0 WHERE UUID = ?", [UUID]);
+                 await db.prepare('run', 'UPDATE "sponsorTimes" SET locked = 0 WHERE "UUID" = ?', [UUID]);
             }
 
             // Clear redis cache for this video
@@ -393,7 +393,7 @@ export async function voteOnSponsorTime(req: Request, res: Response) {
             //for each positive vote, see if a hidden submission can be shown again
             if (incrementAmount > 0 && voteTypeEnum === voteTypes.normal) {
                 //find the UUID that submitted the submission that was voted on
-                const submissionUserIDInfo = await db.prepare('get', "SELECT userID FROM sponsorTimes WHERE UUID = ?", [UUID]);
+                const submissionUserIDInfo = await db.prepare('get', 'SELECT "userID" FROM "sponsorTimes" WHERE "UUID" = ?', [UUID]);
                 if (!submissionUserIDInfo) {
                     // They are voting on a non-existent submission
                     res.status(400).send("Voting on a non-existent submission");
@@ -403,14 +403,14 @@ export async function voteOnSponsorTime(req: Request, res: Response) {
                 const submissionUserID = submissionUserIDInfo.userID;
 
                 //check if any submissions are hidden
-                const hiddenSubmissionsRow = await db.prepare('get', "SELECT count(*) as hiddenSubmissions FROM sponsorTimes WHERE userID = ? AND shadowHidden > 0", [submissionUserID]);
+                const hiddenSubmissionsRow = await db.prepare('get', 'SELECT count(*) as "hiddenSubmissions" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" > 0', [submissionUserID]);
 
                 if (hiddenSubmissionsRow.hiddenSubmissions > 0) {
                     //see if some of this users submissions should be visible again
 
                     if (await isUserTrustworthy(submissionUserID)) {
                         //they are trustworthy again, show 2 of their submissions again, if there are two to show
-                        await db.prepare('run', "UPDATE sponsorTimes SET shadowHidden = 0 WHERE ROWID IN (SELECT ROWID FROM sponsorTimes WHERE userID = ? AND shadowHidden = 1 LIMIT 2)", [submissionUserID]);
+                        await db.prepare('run', 'UPDATE "sponsorTimes" SET "shadowHidden" = 0 WHERE ROWID IN (SELECT ROWID FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = 1 LIMIT 2)', [submissionUserID]);
                     }
                 }
             }
diff --git a/src/utils/isUserVIP.ts b/src/utils/isUserVIP.ts
index 596ac62..36388b5 100644
--- a/src/utils/isUserVIP.ts
+++ b/src/utils/isUserVIP.ts
@@ -2,7 +2,7 @@ import {db} from '../databases/databases';
 import { HashedUserID } from '../types/user.model';
 
 export async function isUserVIP(userID: HashedUserID): Promise<boolean> {
-    return (await db.prepare('get', "SELECT count(*) as userCount FROM vipUsers WHERE userID = ?", [userID])).userCount > 0;
+    return (await db.prepare('get', `SELECT count(*) as "userCount" FROM "vipUsers" WHERE "userID" = ?`, [userID])).userCount > 0;
 }