diff --git a/Changelog b/Changelog
index c14d43e1e..97ee9480d 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2016-02-09 DariusIII
+	Upd: Switch to category constants from category numbers, part 1
 	Upd: Change other cat numbers to be the last number in their range x999
 2016-02-07 DariusIII
 	Chg: Remove CAT_ from categories names and rename parent categories to root.
diff --git a/misc/testing/DB/reset_postprocessing.php b/misc/testing/DB/reset_postprocessing.php
index 2e26d9ec7..fcbe91a5f 100755
--- a/misc/testing/DB/reset_postprocessing.php
+++ b/misc/testing/DB/reset_postprocessing.php
@@ -1,9 +1,11 @@
 <?php
 require_once realpath(dirname(dirname(dirname(__DIR__))) . DIRECTORY_SEPARATOR . 'indexer.php');
 
+use newznab\Category;
 use newznab\ConsoleTools;
 use newznab\db\Settings;
 
+$category = new Category();
 $pdo = new Settings();
 $consoletools = new ConsoleTools(['ColorCLI' => $pdo->log]);
 $ran = false;
@@ -61,7 +63,7 @@ if (isset($argv[1]) && ($argv[1] === "consoles" || $argv[1] === "all")) {
 		$where = ' WHERE consoleinfoid IS NOT NULL';
 	} else {
 		echo $pdo->log->header("Resetting all failed Console postprocessing");
-		$where = " WHERE consoleinfoid IN (-2, 0) AND categoryid BETWEEN 1000 AND 1999";
+		$where = " WHERE consoleinfoid IN (-2, 0) AND categoryid BETWEEN " . Category::GAME_ROOT . " AND " . Category::GAME_OTHER;
 	}
 
 	$qry = $pdo->queryDirect("SELECT id FROM releases" . $where);
@@ -117,7 +119,7 @@ if (isset($argv[1]) && ($argv[1] === "movies" || $argv[1] === "all")) {
 		$where = ' WHERE imdbid IS NOT NULL';
 	} else {
 		echo $pdo->log->header("Resetting all failed Movie postprocessing");
-		$where = " WHERE imdbid IN (-2, 0) AND categoryid BETWEEN 2000 AND 2999";
+		$where = " WHERE imdbid IN (-2, 0) AND categoryid BETWEEN " . Category::MOVIE_ROOT . " AND " . Category::MOVIE_OTHER;
 	}
 
 	$qry = $pdo->queryDirect("SELECT id FROM releases" . $where);
@@ -145,7 +147,7 @@ if (isset($argv[1]) && ($argv[1] === "music" || $argv[1] === "all")) {
 		$where = ' WHERE musicinfoid IS NOT NULL';
 	} else {
 		echo $pdo->log->header("Resetting all failed Music postprocessing");
-		$where = " WHERE musicinfoid IN (-2, 0) AND categoryid BETWEEN 3000 AND 3999";
+		$where = " WHERE musicinfoid IN (-2, 0) AND categoryid BETWEEN " . Category::MUSIC_ROOT . " AND " . Category::MUSIC_OTHER;
 	}
 
 	$qry = $pdo->queryDirect("SELECT id FROM releases" . $where);
diff --git a/misc/testing/PostProc/getConsole.php b/misc/testing/PostProc/getConsole.php
index a5201ef0b..699dda700 100644
--- a/misc/testing/PostProc/getConsole.php
+++ b/misc/testing/PostProc/getConsole.php
@@ -3,15 +3,23 @@
 
 require_once realpath(dirname(dirname(dirname(__DIR__))) . DIRECTORY_SEPARATOR . 'indexer.php');
 
+use newznab\Category;
 use newznab\db\Settings;
 use newznab\Console;
 
 
 
+$category = new Category();
 $pdo = new Settings();
 $console = new Console(['Echo' => true, 'Settings' => $pdo]);
 
-$res = $pdo->queryDirect(sprintf("SELECT searchname, id FROM releases WHERE consoleinfoid IS NULL AND categoryid BETWEEN 1000 AND 1999 ORDER BY id DESC" ));
+$res = $pdo->queryDirect(
+	sprintf(
+		"SELECT searchname, id FROM releases WHERE consoleinfoid IS NULL AND categoryid
+				BETWEEN %s AND %s ORDER BY id DESC",
+		Category::GAME_ROOT,
+		Category::GAME_OTHER
+	));
 if ($res instanceof \Traversable) {
 	echo $pdo->log->header("Updating console info for " . number_format($res->rowCount()) . " releases.");
 
diff --git a/misc/update/update_releases.php b/misc/update/update_releases.php
index 21bdcc3ce..930147f14 100755
--- a/misc/update/update_releases.php
+++ b/misc/update/update_releases.php
@@ -1,11 +1,13 @@
 <?php
 require_once realpath(dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'indexer.php');
 
+use newznab\Category;
 use newznab\ConsoleTools;
 use newznab\NNTP;
 use newznab\db\Settings;
 use newznab\processing\ProcessReleases;
 
+$category = new Category();
 $pdo = new Settings();
 
 if (isset($argv[2]) && $argv[2] === 'true') {
@@ -37,7 +39,7 @@ if (isset($argv[1]) && isset($argv[2])) {
 	} else if ($argv[1] == 5 && ($argv[2] == 'true' || $argv[2] == 'false')) {
 		echo $pdo->log->header("Categorizing all non-categorized releases in other->misc using usenet subject. This can take a while, be patient.");
 		$timestart = TIME();
-		$relcount = $releases->categorizeRelease('name', 'WHERE iscategorized = 0 AND categoryID = 7010');
+		$relcount = $releases->categorizeRelease('name', "WHERE iscategorized = 0 AND categoryid = " . Category::OTHER_MISC);
 		$time = $consoletools->convertTime(TIME() - $timestart);
 		echo $pdo->log->primary("\n" . 'Finished categorizing ' . $relcount . ' releases in ' . $time . " seconds, using the usenet subject.");
 	} else if ($argv[1] == 6 && $argv[2] == 'true') {
@@ -50,7 +52,15 @@ if (isset($argv[1]) && isset($argv[2])) {
 	} else if ($argv[1] == 6 && $argv[2] == 'false') {
 		echo $pdo->log->header("Categorizing releases in misc sections using the searchname. This can take a while, be patient.");
 		$timestart = TIME();
-		$relcount = $releases->categorizeRelease('searchname', 'WHERE categoryID IN (1999, 2999, 3999, 5999, 6050, 7010)');
+		$relcount = $releases->categorizeRelease('searchname',
+			sprintf("WHERE categoryid IN (%s, %s, %s, %s, %s, %s)",
+				Category::GAME_OTHER,
+				Category::MOVIE_OTHER,
+				Category::MUSIC_OTHER,
+				Category::TV_OTHER,
+				Category::XXX_OTHER,
+				Category::OTHER_MISC
+			));
 		$consoletools = new ConsoleTools(['ColorCLI' => $pdo->log]);
 		$time = $consoletools->convertTime(TIME() - $timestart);
 		echo $pdo->log->primary("\n" . 'Finished categorizing ' . $relcount . ' releases in ' . $time . " seconds, using the search name.");
diff --git a/newznab/Category.php b/newznab/Category.php
index 1132d33bd..91c5c937d 100644
--- a/newznab/Category.php
+++ b/newznab/Category.php
@@ -9,6 +9,10 @@ use newznab\db\Settings;
 class Category
 {
 
+	/**
+	 * Category constants.
+	 * Do NOT use the values, as they may change, always use the constant - that's what it's for.
+	 */
 	const OTHER_MISC = '0010';
 	const OTHER_HASHED = '0020';
 	const GAME_NDS = '1010';
diff --git a/newznab/Console.php b/newznab/Console.php
index 018ae041d..f297b8bf2 100644
--- a/newznab/Console.php
+++ b/newznab/Console.php
@@ -1,6 +1,7 @@
 <?php
 namespace newznab;
 
+use newznab\Category;
 use newznab\db\Settings;
 use libs\ApaiIO\Configuration\GenericConfiguration;
 use libs\ApaiIO\Operations\Search;
@@ -91,6 +92,7 @@ class Console
 			$this->renamed = 'AND isrenamed = 1';
 		}
 		//$this->cleanconsole = ($this->pdo->getSetting('lookupgames') == 2) ? 'AND isrenamed = 1' : '';
+		$this->catWhere = "AND categoryid BETWEEN " . Category::GAME_ROOT . " AND " . Category::GAME_OTHER;
 
 		$this->failCache =[];
 	}
@@ -753,12 +755,12 @@ class Console
 							SELECT searchname, id
 							FROM releases
 							WHERE nzbstatus = %d %s
-							AND consoleinfoid IS NULL
-							AND categoryid BETWEEN 1000 AND 1999
+							AND consoleinfoid IS NULL %s
 							ORDER BY postdate DESC
 							LIMIT %d',
 				NZB::NZB_ADDED,
 				$this->renamed,
+				$this->catWhere,
 				$this->gameqty
 			)
 		);
@@ -823,9 +825,10 @@ class Console
 					sprintf('
 								UPDATE releases
 								SET consoleinfoid = %d
-								WHERE id = %d',
+								WHERE id = %d %s',
 						$gameId,
-						$arr['id']
+						$arr['id'],
+						$this->catWhere
 					)
 				);
 
diff --git a/newznab/Movie.php b/newznab/Movie.php
index 5c6791e08..2fd194580 100644
--- a/newznab/Movie.php
+++ b/newznab/Movie.php
@@ -1,6 +1,7 @@
 <?php
 namespace newznab;
 
+use newznab\Category;
 use newznab\db\Settings;
 use newznab\utility\Utility;
 use newznab\processing\tv\TMDB;
@@ -161,6 +162,7 @@ class Movie
 		$this->echooutput = ($options['Echo'] && NN_ECHOCLI && $this->pdo->cli);
 		$this->imgSavePath = NN_COVERS . 'movies' . DS;
 		$this->service = '';
+		$this->catWhere = 'AND categoryid BETWEEN ' . Category::MOVIE_ROOT . ' AND ' . Category::MOVIE_OTHER;
 
 		if (NN_DEBUG || NN_LOGGING) {
 			$this->debug = true;
@@ -1046,14 +1048,14 @@ class Movie
 				$this->pdo->log->doEcho($this->pdo->log->headerOver($service . ' found IMDBid: ') . $this->pdo->log->primary('tt' . $imdbID));
 			}
 
-			$this->pdo->queryExec(sprintf('UPDATE releases SET imdbid = %s WHERE id = %d', $this->pdo->escapeString($imdbID), $id));
+			$this->pdo->queryExec(sprintf('UPDATE releases SET imdbid = %s WHERE id = %d %s', $this->pdo->escapeString($imdbID), $id, $this->catWhere));
 
 			// If set, scan for imdb info.
 			if ($processImdb == 1) {
 				$movCheck = $this->getMovieInfo($imdbID);
 				if ($movCheck === false || (isset($movCheck['updateddate']) && (time() - strtotime($movCheck['updateddate'])) > 2592000)) {
 					if ($this->updateMovieInfo($imdbID) === false) {
-						$this->pdo->queryExec(sprintf('UPDATE releases SET imdbid = %s WHERE id = %d', 0000000, $id));
+						$this->pdo->queryExec(sprintf('UPDATE releases SET imdbid = %s WHERE id = %d %s', 0000000, $id, $this->catWhere));
 					}
 				}
 			}
@@ -1081,9 +1083,9 @@ class Movie
 				FROM releases r
 				WHERE r.imdbid IS NULL
 				AND r.nzbstatus = 1
-				AND r.categoryid BETWEEN 2000 AND 2999
-				%s %s %s
+				%s %s %s %s
 				LIMIT %d",
+				$this->catWhere,
 				($groupID === '' ? '' : ('AND r.groupid = ' . $groupID)),
 				($guidChar === '' ? '' : ('AND r.guid ' . $this->pdo->likeString($guidChar, false, true))),
 				($lookupIMDB == 2 ? 'AND r.isrenamed = 1' : ''),
@@ -1105,7 +1107,7 @@ class Movie
 				// Try to get a name/year.
 				if ($this->parseMovieSearchName($arr['searchname']) === false) {
 					//We didn't find a name, so set to all 0's so we don't parse again.
-					$this->pdo->queryExec(sprintf("UPDATE releases SET imdbid = 0000000 WHERE id = %d", $arr["id"]));
+					$this->pdo->queryExec(sprintf("UPDATE releases SET imdbid = 0000000 WHERE id = %d %s", $arr["id"], $this->catWhere));
 					continue;
 
 				} else {
@@ -1171,7 +1173,7 @@ class Movie
 					}
 
 					// We failed to get an IMDB id from all sources.
-					$this->pdo->queryExec(sprintf("UPDATE releases SET imdbid = 0000000 WHERE id = %d", $arr["id"]));
+					$this->pdo->queryExec(sprintf("UPDATE releases SET imdbid = 0000000 WHERE id = %d %s", $arr["id"], $this->catWhere));
 				}
 			}
 		}
diff --git a/newznab/Music.php b/newznab/Music.php
index 3e18f2a2f..be8667dd0 100644
--- a/newznab/Music.php
+++ b/newznab/Music.php
@@ -675,9 +675,22 @@ class Music
 	 */
 	public function processMusicReleases($local = false)
 	{
-		$res = $this->pdo->queryDirect(sprintf('SELECT searchname, id FROM releases '
-				. 'WHERE musicinfoid IS NULL AND nzbstatus = 1 %s AND categoryid IN (3010, 3040, 3999) '
-				. 'ORDER BY postdate DESC LIMIT %d', $this->renamed, $this->musicqty));
+		$res = $this->pdo->queryDirect(
+			sprintf('
+					SELECT searchname, id
+					FROM releases
+					WHERE musicinfoid IS NULL
+					AND nzbstatus = 1 %s
+					AND categoryid IN (%s, %s, %s)
+					ORDER BY postdate DESC
+					LIMIT %d',
+				$this->renamed,
+				Category::MUSIC_MP3,
+				Category::MUSIC_LOSSLESS,
+				Category::MUSIC_OTHER,
+				$this->musicqty
+			)
+		);
 		if ($res instanceof \Traversable && $res->rowCount() > 0) {
 			if ($this->echooutput) {
 				$this->pdo->log->doEcho(
diff --git a/newznab/RSS.php b/newznab/RSS.php
index daf51057e..5318c613c 100644
--- a/newznab/RSS.php
+++ b/newznab/RSS.php
@@ -3,6 +3,7 @@
 namespace newznab;
 
 use newznab\db\Settings;
+use newznab\Category;
 
 /**
  * Class RSS -- contains specific functions for RSS
@@ -52,7 +53,7 @@ Class RSS
 	{
 		$catSearch = $cartSearch = '';
 
-		$catLimit = "AND r.categoryid BETWEEN 5000 AND 5999";
+		$catLimit = "AND r.categoryid BETWEEN ' . Category::MOVIE_ROOT . ' AND ' . Category::MOVIE_OTHER . '";
 
 		if (count($cat)) {
 			if ($cat[0] == -2) {
@@ -129,7 +130,7 @@ Class RSS
 				LEFT OUTER JOIN tv_episodes tve ON tve.id = r.tv_episodes_id
 				WHERE %s %s %s
 				AND r.nzbstatus = %d
-				AND r.categoryid BETWEEN 5000 AND 5999
+				AND r.categoryid BETWEEN ' . Category::TV_ROOT . ' AND ' . Category::TV_OTHER . '
 				AND r.passwordstatus %s
 				ORDER BY postdate DESC %s",
 						$this->releases->getConcatenatedCategoryIDs(),
@@ -167,7 +168,7 @@ Class RSS
 				LEFT OUTER JOIN movieinfo mi ON mi.imdbid = r.imdbid
 				WHERE %s %s
 				AND r.nzbstatus = %d
-				AND r.categoryid BETWEEN 2000 AND 2999
+				AND r.categoryid BETWEEN ' . Category::MOVIE_ROOT . ' AND ' . Category::MOVIE_OTHER . '
 				AND r.passwordstatus %s
 				ORDER BY postdate DESC %s",
 						$this->releases->getConcatenatedCategoryIDs(),
diff --git a/newznab/Releases.php b/newznab/Releases.php
index c9f9c5ed0..d5fefc126 100755
--- a/newznab/Releases.php
+++ b/newznab/Releases.php
@@ -494,7 +494,7 @@ class Releases
 				LEFT OUTER JOIN dnzb_failures df ON df.release_id = r.id
 				WHERE %s %s
 				AND r.nzbstatus = %d
-				AND r.categoryid BETWEEN 5000 AND 5999
+				AND r.categoryid BETWEEN " . Category::TV_ROOT . " AND " . Category::TV_OTHER . "
 				AND r.passwordstatus %s
 				%s
 				GROUP BY r.id
@@ -529,7 +529,7 @@ class Releases
 				FROM releases r
 				WHERE %s %s
 				AND r.nzbstatus = %d
-				AND r.categoryid BETWEEN 5000 AND 5999
+				AND r.categoryid BETWEEN " . Category::TV_ROOT . " AND " . Category::TV_OTHER . "
 				AND r.passwordstatus %s
 				%s',
 				$this->uSQL($userShows, 'videos_id'),
@@ -957,7 +957,7 @@ class Releases
 
 		$whereSql = sprintf(
 			"%s
-			WHERE r.categoryid BETWEEN 5000 AND 5999
+			WHERE r.categoryid BETWEEN " . Category::TV_ROOT . " AND " . Category::TV_OTHER . "
 			AND v.type = 0
 			AND r.nzbstatus = %d
 			AND r.passwordstatus %s
@@ -1085,7 +1085,7 @@ class Releases
 	{
 		$whereSql = sprintf(
 			"%s
-			WHERE r.categoryid BETWEEN 2000 AND 2999
+			WHERE r.categoryid BETWEEN " . Category::MOVIE_ROOT . " AND " . Category::MOVIE_OTHER . "
 			AND r.nzbstatus = %d
 			AND r.passwordstatus %s
 			%s %s %s %s",
@@ -1289,7 +1289,7 @@ class Releases
 				INNER JOIN groups ON groups.id = r.groupid
 				INNER JOIN category c ON c.id = r.categoryid
 				INNER JOIN category cp ON cp.id = c.parentid
-				WHERE r.categoryid BETWEEN 5000 AND 5999
+				WHERE r.categoryid BETWEEN " . Category::TV_ROOT . " AND " . Category::TV_OTHER . "
 				AND r.passwordstatus %s
 				AND videos_id = %d %s %s",
 				$this->showPasswords,
@@ -1441,7 +1441,7 @@ class Releases
 				m.cover
 			FROM releases r
 			INNER JOIN movieinfo m USING (imdbid)
-			WHERE r.categoryid BETWEEN 2000 AND 2999
+			WHERE r.categoryid BETWEEN " . Category::MOVIE_ROOT . " AND " . Category::MOVIE_OTHER . "
 			AND m.imdbid > 0
 			AND m.cover = 1
 			AND r.id in (select max(id) from releases where imdbid > 0 group by imdbid)
@@ -1463,7 +1463,7 @@ class Releases
 				xxx.cover, xxx.title
 			FROM releases r
 			INNER JOIN xxxinfo xxx ON r.xxxinfo_id = xxx.id
-			WHERE r.categoryid BETWEEN 6000 AND 6999
+			WHERE r.categoryid BETWEEN " . Category::XXX_ROOT . " AND " . Category::XXX_OTHER . "
 			AND xxx.id > 0
 			AND xxx.cover = 1
 			AND r.id in (select max(id) from releases where xxxinfo_id > 0 group by xxxinfo_id)
@@ -1485,7 +1485,7 @@ class Releases
 				con.cover
 			FROM releases r
 			INNER JOIN consoleinfo con ON r.consoleinfoid = con.id
-			WHERE r.categoryid BETWEEN 1000 AND 1999
+			WHERE r.categoryid BETWEEN " . Category::GAME_ROOT . " AND " . Category::GAME_OTHER . "
 			AND con.id > 0
 			AND con.cover > 0
 			AND r.id in (select max(id) from releases where consoleinfoid > 0 group by consoleinfoid)
@@ -1529,8 +1529,8 @@ class Releases
 				m.cover
 			FROM releases r
 			INNER JOIN musicinfo m ON r.musicinfoid = m.id
-			WHERE r.categoryid BETWEEN 3000 AND 3999
-			AND r.categoryid != 3030
+			WHERE r.categoryid BETWEEN " . Category::MUSIC_ROOT . " AND " . Category::MUSIC_OTHER . "
+			AND r.categoryid != " . Category::MUSIC_AUDIOBOOK ."
 			AND m.id > 0
 			AND m.cover > 0
 			AND r.id in (select max(id) from releases where musicinfoid > 0 group by musicinfoid)
@@ -1552,8 +1552,8 @@ class Releases
 				b.url,	b.cover, b.title as booktitle, b.author
 			FROM releases r
 			INNER JOIN bookinfo b ON r.bookinfoid = b.id
-			WHERE r.categoryid BETWEEN 0000 AND 0999
-			OR r.categoryid = 3030
+			WHERE r.categoryid BETWEEN " . Category::BOOKS_ROOT . " AND " . Category::BOOKS_UNKNOWN . "
+			OR r.categoryid = " . Category::MUSIC_AUDIOBOOK ."
 			AND b.id > 0
 			AND b.cover > 0
 			AND r.id in (select max(id) from releases where bookinfoid > 0 group by bookinfoid)
@@ -1577,7 +1577,7 @@ class Releases
 			FROM releases r
 			INNER JOIN videos v ON r.videos_id = v.id
 			INNER JOIN tv_info tvi ON r.videos_id = tvi.videos_id
-			WHERE r.categoryid BETWEEN 5000 AND 5999
+			WHERE r.categoryid BETWEEN " . Category::TV_ROOT . " AND " . Category::TV_OTHER . "
 			AND v.id > 0
 			AND v.type = 0
 			AND tvi.image = 1
diff --git a/newznab/Tmux.php b/newznab/Tmux.php
index a753d4714..e4e56a055 100644
--- a/newznab/Tmux.php
+++ b/newznab/Tmux.php
@@ -1,6 +1,7 @@
 <?php
 namespace newznab;
 
+use newznab\Category;
 use newznab\db\Settings;
 
 
@@ -381,25 +382,43 @@ class Tmux
 	public function proc_query($qry, $bookreqids, $request_hours, $db_name)
 	{
 		switch ((int) $qry) {
+			case 1:
 			case 1:
 				return sprintf("SELECT
-					SUM(IF(nzbstatus = 1 AND categoryid BETWEEN 5000 AND 5999 AND categoryid != 5070 AND videos_id = 0
+					SUM(IF(nzbstatus = 1 AND categoryid BETWEEN %d AND %d AND categoryid != %d AND videos_id = 0
 						AND tv_episodes_id BETWEEN -3 AND 0 AND size > 1048576,1,0)) AS processtv,
-					SUM(IF(nzbstatus = 1 AND categoryid = 5070 AND anidbid IS NULL,1,0)) AS processanime,
-					SUM(IF(nzbstatus = 1 AND categoryid BETWEEN 2000 AND 2999 AND imdbid IS NULL,1,0)) AS processmovies,
-					SUM(IF(nzbstatus = 1 AND categoryid IN (3010, 3040, 3999) AND musicinfoid IS NULL,1,0)) AS processmusic,
-					SUM(IF(nzbstatus = 1 AND categoryid BETWEEN 1000 AND 1999 AND consoleinfoid IS NULL,1,0)) AS processconsole,
+					SUM(IF(nzbstatus = 1 AND categoryid = %d AND anidbid IS NULL,1,0)) AS processanime,
+					SUM(IF(nzbstatus = 1 AND categoryid BETWEEN %d AND %d AND imdbid IS NULL,1,0)) AS processmovies,
+					SUM(IF(nzbstatus = 1 AND categoryid IN (%d, %d, %d) AND musicinfoid IS NULL,1,0)) AS processmusic,
+					SUM(IF(nzbstatus = 1 AND categoryid BETWEEN %d AND %d AND consoleinfoid IS
+					NULL,1,0)) AS processconsole,
 					SUM(IF(nzbstatus = 1 AND categoryid IN (%s) AND bookinfoid IS NULL,1,0)) AS processbooks,
-					SUM(IF(nzbstatus = 1 AND categoryid = 4050 AND gamesinfo_id = 0,1,0)) AS processgames,
-					SUM(IF(nzbstatus = 1 AND categoryid BETWEEN 6000 AND 6040 AND xxxinfo_id = 0,1,0)) AS processxxx,
+					SUM(IF(nzbstatus = 1 AND categoryid = %d AND gamesinfo_id = 0,1,0)) AS processgames,
+					SUM(IF(nzbstatus = 1 AND categoryid BETWEEN %d AND %d AND xxxinfo_id = 0,1,0)) AS processxxx,
 					SUM(IF(1=1 %s,1,0)) AS processnfo,
 					SUM(IF(nzbstatus = 1 AND nfostatus = 1,1,0)) AS nfo,
-					SUM(IF(nzbstatus = 1 AND isrequestid = 1 AND preid = 0 AND
-						((reqidstatus = 0) OR (reqidstatus = -1) OR (reqidstatus = -3 AND adddate > NOW() - INTERVAL %s HOUR)),1,0)) AS requestid_inprogress,
+					SUM(IF(nzbstatus = 1 AND isrequestid = 1 AND preid = 0 AND ((reqidstatus = 0) OR (reqidstatus = -1) OR (reqidstatus = -3 AND adddate > NOW() - INTERVAL %s HOUR)),1,0)) AS requestid_inprogress,
 					SUM(IF(preid > 0 AND nzbstatus = 1 AND isrequestid = 1 AND reqidstatus = 1,1,0)) AS requestid_matched,
 					SUM(IF(preid > 0 AND searchname IS NOT NULL,1,0)) AS predb_matched,
 					COUNT(DISTINCT(preid)) AS distinct_predb_matched
-					FROM releases r", $bookreqids, Nfo::NfoQueryString($this->pdo), $request_hours);
+					FROM releases r",
+					Category::TV_ROOT,
+					Category::TV_OTHER,
+					Category::TV_ANIME,
+					Category::TV_ANIME,
+					Category::MOVIE_ROOT,
+					Category::MOVIE_OTHER,
+					Category::MUSIC_MP3,
+					Category::MUSIC_LOSSLESS,
+					Category::MUSIC_OTHER,
+					Category::GAME_ROOT,
+					Category::GAME_OTHER,
+					$bookreqids,
+					Category::PC_GAMES,
+					Category::XXX_ROOT,
+					Category::XXX_X264,
+					Nfo::NfoQueryString($this->pdo),
+					$request_hours);
 			case 2:
 				return "SELECT
 					(SELECT COUNT(r.id) FROM releases r
diff --git a/newznab/libraries/Forking.php b/newznab/libraries/Forking.php
index d27923afa..4b9a7fc50 100644
--- a/newznab/libraries/Forking.php
+++ b/newznab/libraries/Forking.php
@@ -766,7 +766,7 @@ class Forking extends \fork_daemon
 						FROM releases
 						WHERE nzbstatus = %d
 						AND imdbid IS NULL
-						AND categoryid BETWEEN 2000 AND 2999
+						AND categoryid BETWEEN ' . Category::MOVIE_ROOT . ' AND ' . Category::MOVIE_OTHER . '
 						%s %s
 						LIMIT 1',
 						NZB::NZB_ADDED,
@@ -791,7 +791,7 @@ class Forking extends \fork_daemon
 					FROM releases
 					WHERE nzbstatus = %d
 					AND imdbid IS NULL
-					AND categoryid BETWEEN 2000 AND 2999
+					AND categoryid BETWEEN ' . Category::MOVIE_ROOT . ' AND ' . Category::MOVIE_OTHER . '
 					%s %s
 					GROUP BY LEFT(guid, 1)
 					LIMIT 16',
@@ -821,7 +821,7 @@ class Forking extends \fork_daemon
 						WHERE nzbstatus = %d
 						AND size > 1048576
 						AND tv_episodes_id BETWEEN -2 AND 0
-						AND categoryid BETWEEN 5000 AND 5999
+						AND categoryid BETWEEN ' . Category::TV_ROOT . ' AND ' . Category::TV_OTHER . '
 						%s %s
 						LIMIT 1',
 					NZB::NZB_ADDED,
@@ -847,7 +847,7 @@ class Forking extends \fork_daemon
 					WHERE nzbstatus = %d
 					AND tv_episodes_id BETWEEN -2 AND 0
 					AND size > 1048576
-					AND categoryid BETWEEN 5000 AND 5999
+					AND categoryid BETWEEN ' . Category::TV_ROOT . ' AND ' . Category::TV_OTHER . '
 					%s %s
 					GROUP BY LEFT(guid, 1)
 					LIMIT 16',
diff --git a/www/admin/site-edit.php b/www/admin/site-edit.php
index 88bc3df3d..05e9c2eea 100644
--- a/www/admin/site-edit.php
+++ b/www/admin/site-edit.php
@@ -3,11 +3,13 @@
 require_once './config.php';
 
 
+use newznab\Category;
 use newznab\Sites;
 use newznab\SABnzbd;
 
 use newznab\db\Settings;
 
+$category = new Category();
 $page = new AdminPage();
 $sites = new Sites();
 $id = 0;
@@ -144,7 +146,7 @@ $page->smarty->assign('lookup_reqids_names', array('Disabled', 'Lookup Request I
 $page->smarty->assign('coversPath', NN_COVERS);
 
 // return a list of audiobooks, mags, ebooks, technical and foreign books
-$result = $page->settings->query("SELECT id, title FROM category WHERE id in (3030, 7010, 7020, 7040, 7060)");
+$result = $page->settings->query("SELECT id, title FROM category WHERE id IN ({$category::MUSIC_AUDIOBOOK}, {$category::BOOKS_MAGAZINES}, {$category::BOOKS_TECHNICAL}, {$category::BOOKS_FOREIGN})");
 
 // setup the display lists for these categories, this could have been static, but then if names changed they would be wrong
 $book_reqids_ids = [];