diff --git a/website/data/query-blacklist.txt b/website/data/query-blacklist.txt
index 3570cbbf..d7fd3f71 100644
--- a/website/data/query-blacklist.txt
+++ b/website/data/query-blacklist.txt
@@ -54,6 +54,7 @@
 ^movie[s]?
 ^new$
 ^other$
+^Part$
 ^private$
 ^public$
 ^pyload$
diff --git a/website/scripts/amc.groovy b/website/scripts/amc.groovy
index 01395a34..2192f5d3 100644
--- a/website/scripts/amc.groovy
+++ b/website/scripts/amc.groovy
@@ -115,7 +115,7 @@ input = input.findAll{ !(it.path =~ /\b(?i:sample|trailer|extras|deleted.scenes|
 input.each{ f -> _log.finest("Input: $f") }
 
 // artwork/nfo utility
-include('fn:lib/htpc')
+include('lib/htpc')
 
 // group episodes/movies and rename according to XBMC standards
 def groups = input.groupBy{ f ->
@@ -264,12 +264,12 @@ if (plex) {
 // mark episodes as 'acquired'
 if (myepisodes) {
 	_log.info 'Update MyEpisodes'
-	include('fn:update-mes', [login:myepisodes.join(':'), addshows:true], getRenameLog().values())
+	include('update-mes', [login:myepisodes.join(':'), addshows:true], getRenameLog().values())
 }
 
 if (pushover) {
 	// include webservice utility
-	include('fn:lib/ws')
+	include('lib/ws')
 	
 	_log.info 'Sending Pushover notification'
 	Pushover(pushover).send("Finished processing ${tryQuietly { ut_title } ?: input*.dir.name.unique()} (${getRenameLog().size()} files).")
@@ -278,7 +278,7 @@ if (pushover) {
 // send status email
 if (gmail) {
 	// ant/mail utility
-	include('fn:lib/ant')
+	include('lib/ant')
 	
 	// send html mail
 	def renameLog = getRenameLog()
@@ -331,6 +331,6 @@ if (clean) {
 	// deleting remaining files only makes sense after moving files
 	if ('MOVE'.equalsIgnoreCase(_args.action)) {
 		_log.info 'Clean clutter files and empty folders'
-		include('fn:cleaner', [root:true], !args.empty ? args : ut_kind == 'multi' && ut_dir ? [ut_dir as File] : [])
+		include('cleaner', [root:true], !args.empty ? args : ut_kind == 'multi' && ut_dir ? [ut_dir as File] : [])
 	}
 }
diff --git a/website/scripts/lib/htpc.groovy b/website/scripts/lib/htpc.groovy
index 7e41ba7d..1417e553 100644
--- a/website/scripts/lib/htpc.groovy
+++ b/website/scripts/lib/htpc.groovy
@@ -216,6 +216,11 @@ def fetchMovieNfo(outputFile, movieInfo, movieFile, override) {
 					role(a.character)
 				}
 			}
+			i.trailers?.each{ t ->
+				t.sources.each { s, v ->
+					trailer(type:t.type, name:t.name, size:s, v)
+				}
+			}
 			fileinfo {
 				streamdetails {
 					mi?.each { kind, streams ->
diff --git a/website/scripts/update-mes.groovy b/website/scripts/update-mes.groovy
index 1efb5dde..988c33b2 100644
--- a/website/scripts/update-mes.groovy
+++ b/website/scripts/update-mes.groovy
@@ -6,7 +6,7 @@ def mesupdate = tryQuietly { tick } ?: 'acquired'
 def mesvalue = tryQuietly { value } ?: '1'
 
 // import myepisodes scraper
-include('fn:lib/scraper')
+include('lib/scraper')
 
 def mes = MyEpisodes(mesacc[0], mesacc[1])
 def myshows = mes.getShowList()