diff --git a/fileflows/scripts/Radarr_-_Trigger_Manual_Import.js b/fileflows/scripts/Radarr_-_Trigger_Manual_Import.js
index 5ebc556..b4c4844 100644
--- a/fileflows/scripts/Radarr_-_Trigger_Manual_Import.js
+++ b/fileflows/scripts/Radarr_-_Trigger_Manual_Import.js
@@ -2,7 +2,7 @@
  * @name Radarr - Trigger Manual Import
  * @description Safely trigger Radarr ManualImport for exactly one processed file.
  * @author FileFlows + Sascha
- * @revision 10
+ * @revision 11
  * @output Import erfolgreich
  * @output Fehler
  * @param {string} URL Radarr root URL and port
@@ -48,12 +48,20 @@ function Script(URL, ApiKey, ImportPath, UseUnmappedPath, MoveMode, TimeOut) {
     const radarr = new Radarr(URL, ApiKey);
 
     /*── movieId detection ──────────────────────────────────*/
-    const searchPattern = Variables.file.Orig.FileNameNoExtension;
-    let movieId = Variables['Radarr.movieId']
-        ?? findMovieIdFromQueue(searchPattern, radarr)
-        ?? findMovieIdFromGrabHistory(searchPattern, radarr)
-        ?? parseMovie(searchPattern, radarr)
-        ?? null;
+    const filePattern = Variables.file.Orig.FileNameNoExtension;
+    const folderPattern = System.IO.Path.GetFileName(System.IO.Path.GetDirectoryName(exactImportPath));
+    const searchPatterns = [folderPattern, filePattern]
+        .filter(Boolean)
+        .filter((value, index, values) => values.indexOf(value) === index);
+    let movieId = Variables['Radarr.movieId'] ?? null;
+    for (const pattern of searchPatterns) {
+        if (!movieId) {
+            movieId = findMovieIdFromQueue(pattern, radarr)
+                ?? findMovieIdFromGrabHistory(pattern, radarr);
+        }
+        if (movieId) break;
+    }
+    if (!movieId) movieId = parseMovie(searchPatterns[0] || '', radarr);
 
     Logger.ILog(`Radarr URL: ${URL}`);
     Logger.ILog(`Triggering Path: ${exactImportPath}`);
@@ -61,11 +69,12 @@ function Script(URL, ApiKey, ImportPath, UseUnmappedPath, MoveMode, TimeOut) {
     Logger.ILog(movieId ? `movieId: ${movieId} → ManualImport` : 'No unambiguous movieId → fail closed');
 
     if (!movieId) {
-        Logger.ELog(`Unable to identify '${searchPattern}' uniquely; file remains for manual recovery.`);
+        Logger.ELog(`Unable to identify '${searchPatterns.join("' or '")}' uniquely; file remains for manual recovery.`);
         return -1;
     }
 
-    return manualImportWorkflow(radarr, exactImportPath, importMode, movieId, TimeOut);
+    const releaseMetadata = findGrabMetadata(searchPatterns, radarr, movieId);
+    return manualImportWorkflow(radarr, exactImportPath, importMode, movieId, releaseMetadata, TimeOut);
 
 }
 
@@ -80,7 +89,7 @@ function Script(URL, ApiKey, ImportPath, UseUnmappedPath, MoveMode, TimeOut) {
  * @param {number}  timeout - Timeout in milliseconds
  * @returns {number} 1 on success, −1 on failure
  */
-function manualImportWorkflow(radarr, importPath, mode, movieId, timeout) {
+function manualImportWorkflow(radarr, importPath, mode, movieId, releaseMetadata, timeout) {
     const candidates = getManualImportCandidates(radarr, importPath);
     if (!candidates.length) {
         Logger.WLog('No candidates returned by fetching ManualImport');
@@ -98,7 +107,7 @@ function manualImportWorkflow(radarr, importPath, mode, movieId, timeout) {
         return -1;
     }
 
-    const fileObj = buildManualImportFile(cand, movieId, importPath);
+    const fileObj = buildManualImportFile(cand, movieId, importPath, releaseMetadata);
     const cmdBody = { name: 'ManualImport', files: [fileObj], importMode: mode };
     const cmdId = sendManualImportCommand(radarr, cmdBody);
     if (cmdId === null) {
@@ -133,21 +142,49 @@ function getManualImportCandidates(radarr, importPath) {
  * @param {number} movieId – Radarr movieId to which the file is linked
  * @returns {object} File descriptor for ManualImport
  */
-function buildManualImportFile(src, movieId, importPath) {
+function buildManualImportFile(src, movieId, importPath, releaseMetadata) {
     const path =  src.path || importPath
     const fallbackFolder = System.IO.Path.GetFileName(System.IO.Path.GetDirectoryName(path)) ?? Variables.folder.Name;
+    const metadata = releaseMetadata || {};
+    const metadataData = metadata.data || {};
 
     return {
         path: path,
         folderName: src.folderName || src.name || fallbackFolder,
         movieId: movieId,
-        releaseGroup: src.releaseGroup || 'Radarr',
-        quality: src.quality,
-        languages: src.languages || [ { id:0, name:'Unknown' } ],
-        indexerFlags: src.indexerFlags ?? 0
+        releaseGroup: metadataData.releaseGroup || metadata.releaseGroup || src.releaseGroup || 'Radarr',
+        quality: metadata.quality || src.quality,
+        languages: metadata.languages || src.languages || [ { id:0, name:'Unknown' } ],
+        indexerFlags: Number(metadataData.indexerFlags ?? metadata.indexerFlags ?? src.indexerFlags ?? 0)
     };
 }
 
+function findGrabMetadata(searchPatterns, radarr, movieId) {
+    try {
+        const query = buildQueryParams({
+            page: 1, pageSize: 250, eventType: 1,
+            sortKey: 'date', sortDirection: 'descending'
+        });
+        const response = radarr.fetchJson('history', query) || {};
+        const records = Array.isArray(response) ? response : (response.records || []);
+        const wanted = searchPatterns.map(normalizeReleaseTitle);
+        const matching = records.filter(item =>
+            item?.movieId === movieId
+            && wanted.includes(normalizeReleaseTitle(item.sourceTitle || ''))
+        );
+        if (!matching.length) return null;
+        const movieIds = matching
+            .map(item => item.movieId)
+            .filter((id, index, values) => values.indexOf(id) === index);
+        if (movieIds.length !== 1) return null;
+        Logger.ILog(`Using metadata from exact Radarr grab history match (${matching[0].sourceTitle}).`);
+        return matching[0];
+    } catch (e) {
+        Logger.WLog(`Unable to recover Radarr grab metadata: ${e.message}`);
+        return null;
+    }
+}
+
 /**
  * @description Send the **ManualImport** command to Radarr and return command-id
  * @param {Radarr} radarr – Radarr API instance