diff --git a/scraper/lib/torrent.js b/scraper/lib/torrent.js
index cf7a7a4..41ed1e1 100644
--- a/scraper/lib/torrent.js
+++ b/scraper/lib/torrent.js
@@ -123,17 +123,17 @@ function filesAndSizeFromTorrentStream(torrent, timeout = 30000) {
 }
 
 function filterVideos(files) {
-  const maxSize = Math.max(...files.map(file => file.size));
-  const minSampleRatio = files.length <= 3 ? 5 : 10;
-  const minRedundantRatio = files.length <= 3 ? 30 : Number.MAX_VALUE;
-  const isSample = file => file.path.match(/sample/i) && maxSize / parseInt(file.size) > minSampleRatio;
-  const isRedundant = file => maxSize / parseInt(file.size) > minRedundantRatio;
-  const isExtra = file => file.path.match(/extras?\//i);
-  return files
-      .filter(file => isVideo(file.path))
-      .filter(file => !isSample(file))
-      .filter(file => !isExtra(file))
-      .filter(file => !isRedundant(file));
+  const videos = files.filter(file => isVideo(file.path));
+  const maxSize = Math.max(...videos.map(video => video.size));
+  const minSampleRatio = videos.length <= 3 ? 5 : 10;
+  const minRedundantRatio = videos.length <= 3 ? 30 : Number.MAX_VALUE;
+  const isSample = video => video.path.match(/sample/i) && maxSize / parseInt(video.size) > minSampleRatio;
+  const isRedundant = video => maxSize / parseInt(video.size) > minRedundantRatio;
+  const isExtra = video => video.path.match(/extras?\//i);
+  return videos
+      .filter(video => !isSample(video))
+      .filter(video => !isExtra(video))
+      .filter(video => !isRedundant(video));
 }
 
 function filterSubtitles(files) {
diff --git a/scraper/lib/torrentFiles.js b/scraper/lib/torrentFiles.js
index df23612..e40e910 100644
--- a/scraper/lib/torrentFiles.js
+++ b/scraper/lib/torrentFiles.js
@@ -47,15 +47,16 @@ async function parseMovieFiles(torrent, parsedName, metadata) {
   }
 
   const parsedVideos = await Promises.sequence(filteredVideos
-      .map(video => () => findMovieImdbId(video.name)
-          .then(newImdbId => ({
-            infoHash: torrent.infoHash,
-            fileIndex: video.fileIndex,
-            title: video.path || video.name,
-            size: video.size,
-            imdbId: newImdbId,
-          })))
-      .map(video => isFeaturette(video) ? clearInfoFields(video) : video));
+      .map(video => () => isFeaturette(video)
+          ? Promise.resolve(video)
+          : findMovieImdbId(video.name).then(imdbId => ({ ...video, imdbId }))))
+      .then(videos => videos.map(video => ({
+        infoHash: torrent.infoHash,
+        fileIndex: video.fileIndex,
+        title: video.path || video.name,
+        size: video.size,
+        imdbId: video.imdbId,
+      })));
   return { contents, videos: parsedVideos, subtitles };
 }