diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp
index 5994a0f4..e7d09d62 100644
--- a/oracle/src/oracleimporter.cpp
+++ b/oracle/src/oracleimporter.cpp
@@ -201,7 +201,7 @@ QString OracleImporter::getStringPropertyFromMap(QVariantMap card, QString prope
     return card.contains(propertyName) ? card.value(propertyName).toString() : QString("");
 }
 
-int OracleImporter::importCardsFromSet(CardSetPtr currentSet, const QList<QVariant> &cardsList)
+int OracleImporter::importCardsFromSet(CardSetPtr currentSet, const QList<QVariant> &cardsList, bool skipSpecialNums)
 {
     static const QMap<QString, QString> cardProperties{
         // mtgjson name => xml name
@@ -220,11 +220,14 @@ int OracleImporter::importCardsFromSet(CardSetPtr currentSet, const QList<QVaria
     QString ptSeparator("/");
     QVariantMap card;
     QString layout, name, text, colors, colorIdentity, maintype, power, toughness;
-    bool isToken;
+    static const bool isToken = false;
     QStringList additionalNames;
     QVariantHash properties;
     CardInfoPerSet setInfo;
     QList<CardRelation *> relatedCards;
+    static const QList<QString> specialNumChars = {"★", "s"};
+    QMap<QString, QVariant> specialNumCards;
+    QList<QString> allNumProps;
 
     for (const QVariant &cardVar : cardsList) {
         card = cardVar.toMap();
@@ -236,9 +239,9 @@ int OracleImporter::importCardsFromSet(CardSetPtr currentSet, const QList<QVaria
         layout = getStringPropertyFromMap(card, "layout");
 
         // don't import tokens from the json file
-        isToken = false;
-        if (layout == "token")
+        if (layout == "token") {
             continue;
+        }
 
         // normal cards handling
         name = getStringPropertyFromMap(card, "name");
@@ -273,14 +276,22 @@ int OracleImporter::importCardsFromSet(CardSetPtr currentSet, const QList<QVaria
             continue;
         }
 
-        // skip cards containing a star char in the collectors number
-        if (setInfo.getProperty("num").contains("★")) {
-            continue;
-        }
-
-        // skip prerelease foils
-        if (setInfo.getProperty("num").contains("s")) {
-            continue;
+        // skip cards containing special stuff in the collectors number if it's not the only print
+        if (skipSpecialNums) {
+            QString numProperty = setInfo.getProperty("num");
+            bool skip = false;
+            for (const QString &specialChar : specialNumChars) {
+                if (numProperty.contains(specialChar)) {
+                    specialNumCards.insert(numProperty.remove(specialChar), cardVar);
+                    skip = true;
+                    break;
+                }
+            }
+            if (skip) {
+                continue;
+            } else {
+                allNumProps.append(numProperty);
+            }
         }
 
         // special handling properties
@@ -349,7 +360,6 @@ int OracleImporter::importCardsFromSet(CardSetPtr currentSet, const QList<QVaria
                   [](const SplitCardPart &a, const SplitCardPart &b) -> bool { return a.getIndex() < b.getIndex(); });
 
         text = QString("");
-        isToken = false;
         properties.clear();
         relatedCards.clear();
 
@@ -391,6 +401,18 @@ int OracleImporter::importCardsFromSet(CardSetPtr currentSet, const QList<QVaria
         numCards++;
     }
 
+    // add the unique cards with special chars in num
+    if (skipSpecialNums) {
+        QList<QVariant> extraStarCards;
+        for (auto cardIter = specialNumCards.constBegin(); cardIter != specialNumCards.constEnd(); ++cardIter) {
+            if (!allNumProps.contains(cardIter.key())) {
+                extraStarCards.append(cardIter.value());
+            }
+        }
+        if (!extraStarCards.isEmpty()) {
+            numCards += importCardsFromSet(currentSet, extraStarCards, false);
+        }
+    }
     return numCards;
 }
 
diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h
index fceca7c8..4a46f018 100644
--- a/oracle/src/oracleimporter.h
+++ b/oracle/src/oracleimporter.h
@@ -111,7 +111,7 @@ public:
     bool readSetsFromByteArray(const QByteArray &data);
     int startImport();
     bool saveToFile(const QString &fileName);
-    int importCardsFromSet(CardSetPtr currentSet, const QList<QVariant> &cards);
+    int importCardsFromSet(CardSetPtr currentSet, const QList<QVariant> &cards, bool skipSpecialNums = true);
     QList<SetToDownload> &getSets()
     {
         return allSets;