diff --git a/BuildData.groovy b/BuildData.groovy
index f9362c3a..46354c48 100644
--- a/BuildData.groovy
+++ b/BuildData.groovy
@@ -251,6 +251,8 @@ addSeriesAlias('The Big Bang Theory', 'TBBT')
 addSeriesAlias('The Walking Dead', 'TWD')
 addSeriesAlias('@midnight', 'At Midnight')
 addSeriesAlias('The Late Late Show with Craig Ferguson', 'Craig Ferguson')
+addSeriesAlias('Naruto Shippuden', 'Naruto Shippuuden')
+
 
 
 thetvdb_index = thetvdb_index.findResults{ [it[0] as Integer, it[1].replaceAll(/\s+/, ' ').trim()] }.findAll{ !(it[1] =~ /(?i:duplicate)/ || it[1] =~ /\d{6,}/ || it[1].startsWith('*') || it[1].endsWith('*') || it[1].length() < 2) }
diff --git a/website/data/query-blacklist.txt b/website/data/query-blacklist.txt
index e4f1bbfc..70c812f2 100644
--- a/website/data/query-blacklist.txt
+++ b/website/data/query-blacklist.txt
@@ -19,6 +19,7 @@
 ^[0-9]{1,2}[.]
 ^[_]+$
 ^[lp]
+^__.+$
 ^Action$
 ^Adventure$
 ^and$
@@ -50,6 +51,7 @@
 ^emule$
 ^Entertainment$
 ^Episode$
+^Episodes$
 ^Erotic$
 ^extract$
 ^extracted$