diff --git a/website/data/query-blacklist.txt b/website/data/query-blacklist.txt
index ad1e155c..a32f5cdd 100644
--- a/website/data/query-blacklist.txt
+++ b/website/data/query-blacklist.txt
@@ -76,6 +76,7 @@
 ^Sort$
 ^Staging$
 ^Storage$
+^tank$
 ^temp$
 ^temporary$
 ^Test$
@@ -218,7 +219,7 @@ samples
 SBS
 Screenshot
 sd
-Season.?[0-9]+
+Season.?\d{1,2}(?!\d)
 sed
 ShareGo
 ShareReactor
diff --git a/website/data/release-groups.txt b/website/data/release-groups.txt
index 424cb216..2b300b3c 100644
--- a/website/data/release-groups.txt
+++ b/website/data/release-groups.txt
@@ -86,6 +86,7 @@ AaS
 ABB
 aBD
 ABiS
+Abjex
 AbSurdity
 ABU
 AC-Subs
diff --git a/website/scripts/amc.groovy b/website/scripts/amc.groovy
index 587e339a..165c523a 100644
--- a/website/scripts/amc.groovy
+++ b/website/scripts/amc.groovy
@@ -52,7 +52,7 @@ def forceMovie(f) {
 }
 
 def forceSeries(f) {
-	tryQuietly{ ut_label } =~ /^(?i:TV|Kids.Shows)/ || parseEpisodeNumber(f.path) || parseDate(f.path) || f.path =~ /(?i:Season)\D?[0-9]{1,2}/ || tryQuietly{ f.metadata?.object?.class.name =~ /Episode/ }
+	tryQuietly{ ut_label } =~ /^(?i:TV|Kids.Shows)/ || parseEpisodeNumber(f.path) || parseDate(f.path) || f.path =~ /(?i:Season)\D?[0-9]{1,2}\D/ || tryQuietly{ f.metadata?.object?.class.name =~ /Episode/ }
 }
 
 def forceAnime(f) {
@@ -147,7 +147,7 @@ def groups = input.groupBy{ f ->
 		/**
 		println '--- EPISODE FILTER (POS) ---'
 		println parseEpisodeNumber(fn, true) || parseDate(fn)
-		println ([dn, fn].find{ it =~ sn && matchMovie(it, true) == null } && (parseEpisodeNumber(fn.after(sn), false) || fn.after(sn) =~ /\d{1,2}\D+\d{1,2}/) && matchMovie(fn, true) == null)
+		println ([dn, fn].find{ it =~ sn && matchMovie(it, true) == null } && (parseEpisodeNumber(stripReleaseInfo(fn.after(sn), false), false) || fn.after(sn) =~ /\D\d{1,2}\D{1,3}\d{1,2}\D/) && matchMovie(fn, true) == null)
 		println (fn.after(sn) ==~ /.{0,3} - .+/ && matchMovie(fn, true) == null)
 		println f.dir.listFiles{ it.isVideo() && (dn =~ sn || norm(it.name) =~ sn) && it.name =~ /\b\d{1,3}\b/}.size() >= 10
 		println '--- EPISODE FILTER (NEG) ---'
@@ -156,7 +156,7 @@ def groups = input.groupBy{ f ->
 		**/
 		
 		// S00E00 | 2012.07.21 | One Piece 217 | Firefly - Serenity | [Taken 1, Taken 2, Taken 3, Taken 4, ..., Taken 10]
-		if ((parseEpisodeNumber(fn, true) || parseDate(fn) || ([dn, fn].find{ it =~ sn && matchMovie(it, true) == null } && (parseEpisodeNumber(fn.after(sn), false) || fn.after(sn) =~ /\d{1,2}\D+\d{1,2}/) && matchMovie(fn, true) == null) || (fn.after(sn) ==~ /.{0,3} - .+/ && matchMovie(fn, true) == null) || f.dir.listFiles{ it.isVideo() && (dn =~ sn || norm(it.name) =~ sn) && it.name =~ /\b\d{1,3}\b/}.size() >= 10 || mov.year < 1900) && !( (mov.year >= 1950 && f.listPath().reverse().take(3).find{ it.name =~ mov.year }) || (mn =~ sn && [dn, fn].find{ it =~ /(19|20)\d{2}/ }) ) ) {
+		if ((parseEpisodeNumber(fn, true) || parseDate(fn) || ([dn, fn].find{ it =~ sn && matchMovie(it, true) == null } && (parseEpisodeNumber(stripReleaseInfo(fn.after(sn), false), false) || fn.after(sn) =~ /\D\d{1,2}\D{1,3}\d{1,2}\D/) && matchMovie(fn, true) == null) || (fn.after(sn) ==~ /.{0,3} - .+/ && matchMovie(fn, true) == null) || f.dir.listFiles{ it.isVideo() && (dn =~ sn || norm(it.name) =~ sn) && it.name =~ /\b\d{1,3}\b/}.size() >= 10 || mov.year < 1900) && !( (mov.year >= 1950 && f.listPath().reverse().take(3).find{ it.name =~ mov.year }) || (mn =~ sn && [dn, fn].find{ it =~ /(19|20)\d{2}/ }) ) ) {
 			_log.fine("Exclude Movie: $mov")
 			mov = null
 		} else if (similarity(mn, fn) >= 0.8 || [dn, fn].find{ it =~ /\b/+mov.year+/\b/ } || [dn, fn].find{ it =~ mn && !(it.after(mn) =~ /\b\d{1,3}\b/) && !(it.before(mn).contains(sn)) } || (detectMovie(f, true) && [dn, fn].find{ it =~ /(19|20)\d{2}/ })) {