diff --git a/website/data/query-blacklist.txt b/website/data/query-blacklist.txt
index d78cd4ee..ece99d13 100644
--- a/website/data/query-blacklist.txt
+++ b/website/data/query-blacklist.txt
@@ -13,18 +13,28 @@
 ^(TV.)?(Show|Serie)[s]?
 ^[0-9]{1,2}[.]
 ^[lp]
+^Action$
+^Adventure$
 ^AUDIO_TS$
 ^BDMV$
+^Comedy$
 ^Cover
+^Crime$
+^Documentary$
 ^download[s]?$
 ^DVD
+^Erotic$
 ^Film[s]?
+^Horror$
 ^HVDVD_TS$
 ^Movie[s]?
 ^new$
 ^other$
+^Romance$
+^Science.Fiction$
 ^Season.[0-9]+
 ^storage$
+^Test$
 ^Torrents[s]?
 ^Tracker
 ^Trailer
@@ -32,8 +42,6 @@
 ^VIDEO_TS$
 A.Release.Lounge
 ABC
-Action
-Adventure
 Anime[s]?
 Arte
 BBC
@@ -45,8 +53,6 @@ Channel.4
 Channel.5
 CLASSIC
 CN
-Comedy
-Crime
 CVCD
 DC
 Demonoid
@@ -54,13 +60,11 @@ Director's.Cut
 Directors.Cut
 Discovery.Channel
 docu
-Documentary
 Dual.Audio
 dubbed
 DVDXvID
 DVSKY
 ENG
-Erotic
 EXTENDED
 Extended.Version
 ExtraScene
@@ -76,7 +80,6 @@ HBO
 HDRip
 Hindi
 History.Channel
-Horror
 HQ
 info
 iNT
@@ -117,10 +120,8 @@ ReRip
 RESYNC
 RETAIL
 RiffTrax
-Romance
 sample[s]?
 SBS
-Science.Fiction
 Screenshot
 ShareGo
 ShareReactor