diff --git a/Server/src/SOR.Admin/Components/Pages/Reports/CardReport.razor b/Server/src/SOR.Admin/Components/Pages/Reports/CardReport.razor
index 0c74dfa..8f391e5 100644
--- a/Server/src/SOR.Admin/Components/Pages/Reports/CardReport.razor
+++ b/Server/src/SOR.Admin/Components/Pages/Reports/CardReport.razor
@@ -137,8 +137,12 @@
@@ -316,6 +320,7 @@
private List? _rows;
private List _filtered = new();
private List _sets = new();
+ private List<(Guid Id, string Name)> _decks = new();
private string _search = string.Empty;
private string _filterType = string.Empty;
@@ -346,8 +351,11 @@
var prebuiltDecks = await BazaarDb.PrebuiltDecks
.Include(d => d.Cards)
+ .OrderBy(d => d.Name)
.ToListAsync();
+ _decks = prebuiltDecks.Select(d => (d.Id, d.Name)).ToList();
+
// Build card → [deck] lookup.
var cardToDecks = new Dictionary>();
foreach (var deck in prebuiltDecks)
@@ -438,6 +446,10 @@
if (_filterInDeck == "yes" && row.InDecks.Count == 0) return false;
if (_filterInDeck == "no" && row.InDecks.Count > 0) return false;
+ if (_filterInDeck != "" && _filterInDeck != "yes" && _filterInDeck != "no"
+ && Guid.TryParse(_filterInDeck, out var deckId)
+ && !row.InDecks.Any(d => d.Id == deckId))
+ return false;
return true;
}).ToList();