diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java
index 92e8462acec..3052d37dfa1 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/home/settings/VSubmenuDownloaders.java
@@ -48,6 +48,7 @@ import forge.util.ImageUtil;
 import forge.util.Localizer;
 import forge.util.RuntimeVersion;
 import net.miginfocom.swing.MigLayout;
+import org.apache.commons.lang3.tuple.Pair;
 
 /**
  * Assembles Swing components of utilities submenu singleton.
@@ -270,19 +271,19 @@ public enum VSubmenuDownloaders implements IVSubmenu<CSubmenuDownloaders> {
             int artIndex = 1;
             ArrayList<String> cis = new ArrayList<>();
 
-            HashMap<String, Integer> cardCount = new HashMap<>();
+            HashMap<String, Pair<Boolean, Integer>> cardCount = new HashMap<>();
             for (CardInSet c : e.getAllCardsInSet()) {
                 if (cardCount.containsKey(c.name)) {
-                    cardCount.put(c.name, cardCount.get(c.name) + 1);
+                    cardCount.put(c.name, Pair.of(c.collectorNumber.startsWith("F"), cardCount.get(c.name).getRight() + 1));
                 } else {
-                    cardCount.put(c.name, 1);
+                    cardCount.put(c.name, Pair.of(c.collectorNumber.startsWith("F"), 1));
                 }
             }
             
             // loop through the cards in this edition, considering art variations...
-            for (Entry<String, Integer> entry : cardCount.entrySet()) {
+            for (Entry<String, Pair<Boolean, Integer>> entry : cardCount.entrySet()) {
                 String c = entry.getKey();
-                artIndex = entry.getValue();
+                artIndex = entry.getValue().getRight();
 
                 PaperCard cp = cardDb.getCard(c, e.getCode(), artIndex);
                 if (cp == null) {
@@ -290,6 +291,8 @@ public enum VSubmenuDownloaders implements IVSubmenu<CSubmenuDownloaders> {
                 }
 
                 if (cp == null) {
+                    if (entry.getValue().getLeft()) //skip funny cards
+                        continue;
                     if (!cniHeader) {
                         cniSB.append("Edition: ").append(e.getName()).append(" ").append("(").append(e.getCode()).append("/").append(e.getCode2()).append(")\n");
                         cniHeader = true;
diff --git a/forge-gui/res/editions/Arena League 2004.txt b/forge-gui/res/editions/Arena League 2004.txt
index 6f701b73327..677d8677b7f 100644
--- a/forge-gui/res/editions/Arena League 2004.txt	
+++ b/forge-gui/res/editions/Arena League 2004.txt	
@@ -14,9 +14,9 @@ ScryfallCode=PAL04
 6 R Darksteel Ingot @Martina Pilcerova
 7 R Serum Visions @Ben Thompson
 8 R Glacial Ray @Jim Murray
-9 R Circle of Protection: Art @Mark “It’s teh-DEEN” Tedin
-10 R Mise @Mark Zug
-11 R Booster Tutor @Heather Hudson
-12 R Goblin Mime @Dan Frazier
-13 R Granny's Payback @Kaja Foglio
-14 R Ashnod's Coupon @Edward P. Beard, Jr.
+F9 R Circle of Protection: Art @Mark “It’s teh-DEEN” Tedin
+F10 R Mise @Mark Zug
+F11 R Booster Tutor @Heather Hudson
+F12 R Goblin Mime @Dan Frazier
+F13 R Granny's Payback @Kaja Foglio
+F14 R Ashnod's Coupon @Edward P. Beard, Jr.
diff --git a/forge-gui/res/editions/Online Promos.txt b/forge-gui/res/editions/Online Promos.txt
index 5a750bd1058..09629099426 100644
--- a/forge-gui/res/editions/Online Promos.txt	
+++ b/forge-gui/res/editions/Online Promos.txt	
@@ -247,4 +247,4 @@ ScryfallCode=PRM
 35096 S Zodiac Snake @Qi Baocheng
 35088 S Zodiac Tiger @Ai Desheng
 225 S Zuran Orb @Sandra Everingham
-26584 S Gleemox @Dan Frazier
+F26584 S Gleemox @Dan Frazier
diff --git a/forge-gui/res/editions/The List.txt b/forge-gui/res/editions/The List.txt
index 34d53b47a8c..b1c1d9fd687 100644
--- a/forge-gui/res/editions/The List.txt	
+++ b/forge-gui/res/editions/The List.txt	
@@ -563,7 +563,7 @@ ScryfallCode=PLIST
 555 U Call of the Nightwing @Adam Paquette
 556 M General Kudro of Drannith @Ryan Pancoast
 557 M Karametra, God of Harvests @Eric Deschamps
-558 R Kaya, Ghost Haunter @Sydney Adams
+F558 R Kaya, Ghost Haunter @Sydney Adams
 559 R Lich Lord of Unx @Dave Allsop
 560 R Lonis, Cryptozoologist @Andrew Mar
 561 S Mortify @Glen Angus
@@ -572,7 +572,7 @@ ScryfallCode=PLIST
 564 U Night // Day @Christopher Moeller
 565 U Gate to the Afterlife @Christine Choi
 566 M Helvault @Jaime Jones
-567 R Puresteel Angel @Lukas Litzsinger
+F567 R Puresteel Angel @Lukas Litzsinger
 568 R Sapphire Medallion @Sue Ellen Brown
 569 U Selesnya Keyrune @Daniel Ljunggren
 570 C Signpost Scarecrow @Jung Park
diff --git a/forge-gui/res/editions/Unstable Promos.txt b/forge-gui/res/editions/Unstable Promos.txt
index 593db144b0a..88801931f72 100644
--- a/forge-gui/res/editions/Unstable Promos.txt	
+++ b/forge-gui/res/editions/Unstable Promos.txt	
@@ -2,7 +2,7 @@
 Code=PUST
 Date=2017-12-08
 Name=Unstable Promos
-Type=Promo
+Type=Funny
 Border=Silver
 ScryfallCode=PUST