diff --git a/source/net/filebot/media/ReleaseInfo.properties b/source/net/filebot/media/ReleaseInfo.properties
index 6036c16f..9849fd0c 100644
--- a/source/net/filebot/media/ReleaseInfo.properties
+++ b/source/net/filebot/media/ReleaseInfo.properties
@@ -2,7 +2,7 @@
 pattern.video.source: CAMRip|CAM|PDVD|TS|TELESYNC|PDVD|PTVD|PPV|PPVRip|Screener|SCR|SCREENER|DVDSCR|DVDSCREENER|BDSCR|R4|R5|R5LINE|R5.LINE|DVD|DVD5|DVD9|DVDRip|DVDR|TVRip|DSR|PDTV|SDTV|HDTV|HDTVRip|DVB|DVBRip|DTHRip|VODRip|VODR|BDRip|BRRip|BluRay|Blu.Ray|BD|BDR|BD25|BD50|3D.BluRay|3DBluRay|3DBD|Remux|BDRemux|BR.Scr|BR.Screener|HDDVD|HDRip|WorkPrint|VHS|VCD|TELECINE|WEBRip|WEB.Rip|WEBDL|WEB.DL|WEBCap|WEB.Cap|ithd|iTunesHD|Laserdisc|NetflixHD|VHSRip|LaserRip|URip|UnknownRip|MicroHD
 
 # patterns for all video tags
-pattern.video.tags: extended|uncensored|remastered|unrated|uncut|director.?s.cut|theatrical.cut|ultimate.cut|final.cut|special.edition|rogue.cut|IMAX
+pattern.video.tags: Extended|Uncensored|Remastered|Unrated|Uncut|IMAX|(Director.?s|Theatrical|Ultimate|Final|Rogue|Collectors|Special).(Cut|Edition|Version)
 
 # patterns for stereoscopic 3D tags
 pattern.video.s3d: ((H|HALF|F|FULL)[^\\p{Alnum}]*)?(SBS|TAB|OU)
diff --git a/website/data/query-blacklist.txt b/website/data/query-blacklist.txt
index 7e56734c..0fd6bc68 100644
--- a/website/data/query-blacklist.txt
+++ b/website/data/query-blacklist.txt
@@ -1,29 +1,27 @@
-(?-i:WEB|SPECIAL|MULTi)
+(?-i:WEB|SPECIAL|MULTi|XXX)
 (?<=^)\w{1,2}(?=$)
-(pro7|rtl|rtl2|srtl|rtlnitro|vox|kabel1|sat1|viva|orf1|orf2|atv|arte|zdf|zdfneo|ard|ardeinsfestival|stv|tele5|sf1|sf2|hr3|bay3|puls4|mdr|wdr|rbb|sixx|sw3).\b\d{1,3}
-.+movies$
-.+tv.shows$
+(pro7|rtl|rtl2|srtl|rtlnitro|vox|kabel1|sat1|viva|orf1|orf2|atv|arte|zdf|zdfneo|ard|ardeinsfestival|stv|tele5|sf1|sf2|hr3|bay3|puls4|mdr|wdr|rbb|sixx|sw3)\D\d*
+(Season|Series)\D?\d+
+(The|A|MPG)$
+.+(movies|tv.shows)$
 1-3-3-8.com
 10.bit
 18p
 2DDL
 3D
-5[.,]1
 7p
 @KIDZ
-[1-3]CD
-[1-3]CDRip
+[1-3](CD|CDRip)
 [1-9].?of.?[1-9]
-\bThe$
 \d{2,4}.\b\d{2}.\b\d{2}.\b\d{2}.\b\d{2}
 \d{3,4}[pi]
 \d{8}.\d{4}
-^(amc|cover|dvd|specials)
-^(downloads).+$
-^.+(downloads)$
-^[0-9]{1,2}[.]
+^(downloads|amc).*$
+^(tvp|tvs)
+^.*(downloads)$
 ^[_]+$
 ^[lp]
+^\d{1,2}[.]
 ^\d{8,64}$
 ^__.+$
 ^Action$
@@ -51,6 +49,7 @@
 ^Complete.Torrents$
 ^Completed$
 ^Completos$
+^Cover$
 ^Crime$
 ^Das$
 ^data$
@@ -63,8 +62,8 @@
 ^Desktop$
 ^dev$
 ^Die$
-^Disco[0-9]$
-^disk[0-9]$
+^Disco\d+$
+^disk\d+$
 ^Documentaries$
 ^Documentary$
 ^Documents$
@@ -74,6 +73,7 @@
 ^Downloads$
 ^Drama$
 ^Dropbox$
+^DVD$
 ^emule$
 ^Entertainment$
 ^Episode$
@@ -105,6 +105,7 @@
 ^Horror$
 ^HVDVD_TS$
 ^I+$
+^ignore$
 ^ignore.folder$
 ^In.Progress$
 ^inbox$
@@ -185,7 +186,7 @@
 ^Serier$
 ^Series$
 ^SERIJE$
-^Sex$
+^sex$
 ^share$
 ^shared$
 ^Shorts$
@@ -194,6 +195,7 @@
 ^sort$
 ^sorted$
 ^SortedMedia$
+^Specials$
 ^Sports$
 ^staging$
 ^Storage$
@@ -222,8 +224,6 @@
 ^TV.Series$
 ^TV.Show$
 ^TV.Shows$
-^tvp
-^tvs
 ^unsorted$
 ^user$
 ^utorrent$
@@ -232,7 +232,7 @@
 ^Video$
 ^VIDEO_TS$
 ^Videos$
-^Volume.[0-9]$
+^Volume\D?\d+$
 ^Volumes$
 ^War$
 ^watch$
@@ -252,8 +252,6 @@ Actionkomödie
 Actionthriller
 Addic7ed.com
 aGGr0
-AMC-BL
-AMC-TEST
 Anaglyph
 Animationsfilm
 Arte
@@ -266,9 +264,8 @@ By.Cool.Release
 C.orig
 Castellano
 CBC
-CD[0]?[1-3]
-Channel.4
-Channel.5
+CD\D?\d+
+Channel\D?\d+
 CLASSIC
 CN
 CODIFICAR
@@ -278,8 +275,7 @@ Creditless
 Custom.DKsubs
 CVCD
 DC
-DD2[.,]0
-DD5[.,]1
+DD\d[.,]\d
 DDL
 ddlsource
 ddlsource.com
@@ -287,8 +283,6 @@ DDLValley
 DDLValley.(eu|net)
 ded
 Demonoid
-Director's.Cut
-Directors.Cut
 DKsubs
 DL
 docu
@@ -298,8 +292,7 @@ dreambox.cut
 DSKI
 Dual.Audio
 dubbed
-DVD5
-DVD9
+DVD\d+
 DVDsize
 DVDXvID
 DVSKY
@@ -309,9 +302,6 @@ English
 ENSub
 Ext
 EXTENDED
-Extended.Collectors.Cut
-Extended.Collectors.Edition
-Extended.Version
 ExtraScene
 ExtraTorrent
 Fantasy
@@ -326,7 +316,6 @@ French
 funxd
 GER
 German
-H.SBS
 Hard.Subbed
 HAVE.TO.BE.CUT
 HBO
@@ -340,7 +329,6 @@ HiDef
 Hindi
 History.Channel
 HOME.SERVER
-HORiZON-ArtSubs
 Horrorfilm
 Horrorkomödie
 Horrorthriller
@@ -362,6 +350,7 @@ jigaxx
 Katastrophenfilm
 KIDZCORNER
 Kino.und.TV
+kodi
 Komödie
 KOR
 KORSUB
@@ -381,7 +370,6 @@ MkvCage
 mkvonly
 MoTv
 Movie.Pack
-mpg$
 MultiSub
 MVGroup.org
 Mysterythriller
@@ -410,7 +398,6 @@ ProSieben.MAXX
 PS3
 PSP
 QEBS\d*
-REACTOR
 READNFO
 REAL.PROPER
 RecordedTV
@@ -426,12 +413,9 @@ RiPSalot
 Romantikkomödie
 sample
 samples
-SBS
 Screenshot
 sd
-Season\D?\d+
 sed
-Series\D?\d+
 ShareGo
 ShareReactor
 ShareZONE
@@ -440,7 +424,6 @@ Snapshots
 sortmovie
 SPA
 Spanish
-Special.Edition
 Stephen.Kings
 STRATOS
 STV
@@ -455,10 +438,7 @@ SYNC
 SYNCED
 SYNCFIX
 t\d{2,4}
-TAXES
 TC
-theatrical.cut
-THEORY
 Thrillerkomödie
 to.be.sorted
 ToSort
@@ -468,23 +448,17 @@ TRUEDEF
 TRUEFRENCH
 TS
 TSXVID
-tt\d{2,8}
+tt\d{7}
 TV.Aufnahmen
 TV.Opnamen
 TV.Thriller
 TVOON.DE
-tvp
 tvrecorder
 TwoDDL
 TwoDDL.eu
 UE
-ultimate.edition
-UNCUT
-unrated
-unrated.edition
 UsaBit.com
 utorrent.downloads
-video[s]?
 vo
 Volume.TB
 Western
@@ -495,6 +469,5 @@ xbmc
 XORBiTANT
 xRipp
 XtremeDoN
-xxx+[0-9]*
 YIFY
 Zune
\ No newline at end of file
diff --git a/website/data/release-groups.txt b/website/data/release-groups.txt
index 232993a0..49ee7e5d 100644
--- a/website/data/release-groups.txt
+++ b/website/data/release-groups.txt
@@ -1250,6 +1250,7 @@ Honto
 HoodBag
 HooKah
 HORiZON
+HORiZON-ArtSubs
 HorribleSubs
 hoschi
 HOSTiLE