           ua->warning_msg(_("Pool \"%s\" not found, using any pool.\n"), pr.Name);
        }
     }
--
 +   /* use a storage filter */
 +   if (rx->store) {             /* or use storageid ? */
 +      Mmsg(temp_filter, " AND Media.StorageId=%s ", 

    if (!db_sql_query(ua->db, rx->query, NULL, NULL)) {
       ua->error_msg("%s\n", db_strerror(ua->db));
       goto bail_out;
@@ -1238,7 +1273,7 @@
 
    /* Now find most recent Differental Job after Full save, if any */
    Mmsg(rx->query, uar_dif, edit_uint64(rx->JobTDate, ed1), date,

+      pm_strcat(other_filter, temp_filter.c_str());
+      Dmsg1(0, "Use mediatype filter (%s)\n", rx->MediaType);
+   }
+   if (bstrcmp(other_filter.c_str(), "")) {
+      Dmsg0(0, "Don't use copy jobs\n");
+      pm_strcpy(other_filter, " AND Type='B' ");
+   }
 
    /* Find JobId of last Full backup for this client, fileset */
    edit_int64(cr.ClientId, ed1);
    Mmsg(rx->query, uar_last_full, ed1, ed1, date, fsr.FileSet,
