diff --git a/plugins/core-altered-cards/assets/card-search.js b/plugins/core-altered-cards/assets/card-search.js
index 7f64625..9a18f4e 100644
--- a/plugins/core-altered-cards/assets/card-search.js
+++ b/plugins/core-altered-cards/assets/card-search.js
@@ -108,6 +108,12 @@ function CardSearch(cfg) {
         forest:      ini.forest      !== undefined ? ini.forest      : null,
         mountain:    ini.mountain    !== undefined ? ini.mountain    : null,
         ocean:       ini.ocean       !== undefined ? ini.ocean       : null,
+        mainCostOp:    'eq',
+        recallCostOp:  'eq',
+        forestOp:      'eq',
+        mountainOp:    'eq',
+        oceanOp:       'eq',
+        costRelation:  '',
         sets:           (_setsDirty ? (ini.sets || []) : DEFAULT_SETS.slice()),
         subtypes:       (ini.subtypes       || []).slice(),
         keywords:       (ini.keywords       || []).slice(),
@@ -117,6 +123,8 @@ function CardSearch(cfg) {
         isErrated:      !!ini.isErrated,
         isSuspended:    !!ini.isSuspended,
         hasNoEffect:    !!ini.hasNoEffect,
+        effects:        [],
+        effectMode:     'or',
         sort:           ini.sort            || DEFAULT_SORT_1,
     };
 
@@ -127,6 +135,9 @@ function CardSearch(cfg) {
     var tsInst             = {};
     var _collEl            = null;
     var _defaultCollection = '';
+    var _effectData    = null;
+    var _effectLoading = false;
+    var _effectQueue   = [];
 
     // sort key → API order params
     var SORT_MAP = {
@@ -252,6 +263,219 @@ function CardSearch(cfg) {
         return s || ' ';
     }
 
+    // ── Effect filter ────────────────────────────────────────────────────────
+
+    function _loadEffectData(cb) {
+        if (_effectData) { cb(_effectData); return; }
+        _effectQueue.push(cb);
+        if (_effectLoading) return;
+        _effectLoading = true;
+        var done = 0;
+        var res  = { triggers: [], conditions: [], effects: [] };
+        ['triggers', 'conditions', 'effects'].forEach(function(key) {
+            fetch(API_BASE + '/api/' + key)
+                .then(function(r) { return r.json(); })
+                .then(function(data) { res[key] = Array.isArray(data) ? data : []; })
+                .catch(function() {})
+                .then(function() {
+                    done++;
+                    if (done < 3) return;
+                    _effectData    = res;
+                    _effectLoading = false;
+                    _effectQueue.forEach(function(fn) { fn(_effectData); });
+                    _effectQueue   = [];
+                });
+        });
+    }
+
+    function _effectLabel(item) {
+        var t = item.translations || {};
+        return t[LANG] || t.en || String(item.alteredId);
+    }
+
+    function _effectLabelPlain(item) {
+        return _effectLabel(item).replace(/\{[^}]*\}/g, '').replace(/\s+/g, ' ').trim() || String(item.alteredId);
+    }
+
+    function _alteredIconHtml(escaped) {
+        return escaped.replace(/\{([^}]+)\}/g, function(_, code) {
+            return '<i class="fak fa-altered-' + code.toLowerCase() + '" style="font-size:.9em;vertical-align:middle;margin:0 1px"></i>';
+        });
+    }
+
+    function _buildEffectSel(items, anyLabel, currentVal) {
+        var sorted = items.slice().sort(function(a, b) {
+            return _effectLabelPlain(a).localeCompare(_effectLabelPlain(b));
+        });
+        var sel = document.createElement('select');
+        var def = document.createElement('option');
+        def.value = ''; def.textContent = anyLabel; sel.appendChild(def);
+        sorted.forEach(function(item) {
+            var o = document.createElement('option');
+            o.value = String(item.alteredId);
+            o.textContent = _effectLabel(item);
+            if (String(item.alteredId) === String(currentVal)) o.selected = true;
+            sel.appendChild(o);
+        });
+        return sel;
+    }
+
+    function _buildEffectRow(n, data, saved) {
+        saved = saved || {};
+        var rowEl = document.createElement('div');
+        rowEl.className = 'effect-row d-flex gap-1 align-items-center mb-1';
+        rowEl.dataset.effectN = n;
+
+        var sels = [
+            _buildEffectSel(data.triggers,   txt.any_trigger   || '—', saved.trigger),
+            _buildEffectSel(data.conditions, txt.any_condition || '—', saved.condition),
+            _buildEffectSel(data.effects,    txt.any_effect    || '—', saved.effect),
+        ];
+
+        var tsRender = typeof TomSelect !== 'undefined' ? {
+            option: function(d, e) {
+                return '<div style="white-space:normal;line-height:1.3">' + _alteredIconHtml(e(d.text)) + '</div>';
+            },
+            item: function(d, e) {
+                return '<div>' + _alteredIconHtml(e(d.text)) + '</div>';
+            }
+        } : null;
+
+        var tsInsts = [];
+        sels.forEach(function(sel) {
+            var wrap = document.createElement('div');
+            wrap.style.cssText = 'flex:1;min-width:160px';
+            wrap.appendChild(sel);
+            rowEl.appendChild(wrap);
+            if (tsRender) {
+                var ts = new TomSelect(sel, {
+                    create: false, maxItems: 1, plugins: [],
+                    onChange: updateFilterCount,
+                    render: tsRender,
+                });
+                tsInsts.push(ts);
+            } else {
+                sel.addEventListener('change', updateFilterCount);
+                tsInsts.push(null);
+            }
+        });
+        rowEl._tsInsts = tsInsts;
+
+        var rmBtn = document.createElement('button');
+        rmBtn.type = 'button';
+        rmBtn.className = 'btn btn-sm btn-outline-secondary flex-shrink-0';
+        rmBtn.innerHTML = '<i class="fa-solid fa-xmark"></i>';
+        rmBtn.addEventListener('click', function() { _removeEffectRow(rowEl); });
+        rowEl.appendChild(rmBtn);
+        return rowEl;
+    }
+
+    function _syncEffectUi() {
+        var rowsEl = document.getElementById(P + '-effect-rows');
+        var addBtn = document.getElementById(P + '-effect-add');
+        var modeEl = document.getElementById(P + '-effect-mode');
+        var count  = rowsEl ? rowsEl.querySelectorAll('.effect-row').length : 0;
+        if (rowsEl) {
+            rowsEl.querySelectorAll('.effect-row').forEach(function(r) {
+                var rm = r.querySelector('button');
+                if (rm) rm.style.display = count > 1 ? '' : 'none';
+            });
+        }
+        if (addBtn) addBtn.style.display = count >= 3 ? 'none' : '';
+        if (modeEl) modeEl.style.display = count > 1  ? '' : 'none';
+    }
+
+    function _removeEffectRow(rowEl) {
+        if (rowEl._tsInsts) rowEl._tsInsts.forEach(function(ts) { if (ts) ts.destroy(); });
+        if (rowEl.parentNode) rowEl.parentNode.removeChild(rowEl);
+        _syncEffectUi();
+        updateFilterCount();
+    }
+
+    function _addEffectRow(saved) {
+        var rowsEl = document.getElementById(P + '-effect-rows');
+        if (!rowsEl) return;
+        var count = rowsEl.querySelectorAll('.effect-row').length;
+        if (count >= 3) return;
+        var n = count;
+        if (_effectData) {
+            rowsEl.appendChild(_buildEffectRow(n, _effectData, saved));
+            _syncEffectUi();
+        } else {
+            var ph = document.createElement('div');
+            ph.className = 'effect-row text-muted small py-1';
+            ph.dataset.effectN = n;
+            ph.textContent = '…';
+            rowsEl.appendChild(ph);
+            _syncEffectUi();
+            _loadEffectData(function(data) {
+                var real = _buildEffectRow(n, data, saved);
+                if (ph.parentNode) ph.parentNode.replaceChild(real, ph);
+                _syncEffectUi();
+            });
+        }
+    }
+
+    function _readEffectRows() {
+        var rowsEl = document.getElementById(P + '-effect-rows');
+        var modeEl = document.getElementById(P + '-effect-mode');
+        filters.effects    = [];
+        filters.effectMode = modeEl ? (modeEl.dataset.mode || 'or') : 'or';
+        if (!rowsEl) return;
+        rowsEl.querySelectorAll('.effect-row').forEach(function(row) {
+            var insts = row._tsInsts;
+            if (insts && insts.length >= 3) {
+                filters.effects.push({
+                    trigger:   insts[0] ? String(insts[0].getValue() || '') : '',
+                    condition: insts[1] ? String(insts[1].getValue() || '') : '',
+                    effect:    insts[2] ? String(insts[2].getValue() || '') : '',
+                });
+            } else {
+                var sels = row.querySelectorAll('select');
+                if (sels.length >= 3) {
+                    filters.effects.push({ trigger: sels[0].value, condition: sels[1].value, effect: sels[2].value });
+                }
+            }
+        });
+    }
+
+    function _resetEffectRows() {
+        var rowsEl = document.getElementById(P + '-effect-rows');
+        var modeEl = document.getElementById(P + '-effect-mode');
+        if (rowsEl) { rowsEl.innerHTML = ''; _effectRowsCnt = 0; }
+        if (modeEl) {
+            modeEl.style.display = 'none';
+            modeEl.dataset.mode  = 'or';
+            modeEl.querySelectorAll('.effect-mode-btn').forEach(function(b) {
+                b.classList.toggle('active', b.dataset.mode === 'or');
+            });
+        }
+        _addEffectRow(null);
+    }
+
+    function initEffects() {
+        var addBtn = document.getElementById(P + '-effect-add');
+        var modeEl = document.getElementById(P + '-effect-mode');
+        if (addBtn) {
+            addBtn.addEventListener('click', function() { _addEffectRow(null); });
+        }
+        if (modeEl) {
+            modeEl.addEventListener('click', function(e) {
+                var btn = e.target.closest('.effect-mode-btn');
+                if (!btn) return;
+                var mode = btn.dataset.mode;
+                modeEl.dataset.mode = mode;
+                modeEl.querySelectorAll('.effect-mode-btn').forEach(function(b) {
+                    b.classList.toggle('active', b.dataset.mode === mode);
+                });
+                filters.effectMode = mode;
+            });
+        }
+        _addEffectRow(null);
+    }
+
+    // ── End effect filter ────────────────────────────────────────────────────
+
     // build direct API URL
     function buildApiUrl(page) {
         // Reference lookup: bypass all filters and collection scope
@@ -305,17 +529,38 @@ function CardSearch(cfg) {
         filters.subtypes.forEach(function(v)   { parts.push('subTypes[]='  + encodeURIComponent(v)); });
         filters.variations.forEach(function(v) { parts.push('variation[]=' + encodeURIComponent(v)); });
 
-        if (filters.mainCost   !== null) parts.push('mainCost[]='      + filters.mainCost);
-        if (filters.recallCost !== null) parts.push('recallCost[]='    + filters.recallCost);
-        if (filters.forest     !== null) parts.push('forestPower[]='   + filters.forest);
-        if (filters.mountain   !== null) parts.push('mountainPower[]=' + filters.mountain);
-        if (filters.ocean      !== null) parts.push('oceanPower[]='    + filters.ocean);
-
+        function _costP(field, val, op) {
+            if (val === null) return;
+            var suffix = op === 'lt' ? '[lt]' : op === 'lte' ? '[lte]' : op === 'gt' ? '[gt]' : op === 'gte' ? '[gte]' : '';
+            parts.push(field + suffix + '=' + val);
+        }
+        _costP('mainCost',     filters.mainCost,   filters.mainCostOp);
+        _costP('recallCost',   filters.recallCost, filters.recallCostOp);
+        _costP('forestPower',  filters.forest,     filters.forestOp);
+        _costP('mountainPower',filters.mountain,   filters.mountainOp);
+        _costP('oceanPower',   filters.ocean,      filters.oceanOp);
+        if (filters.costRelation === 'eq')        parts.push('costRelation=equal');
+        else if (filters.costRelation === 'main_gt')   parts.push('costRelation=mainHigher');
+        else if (filters.costRelation === 'recall_gt') parts.push('costRelation=recallHigher');
         if (filters.isBanned)    parts.push('isBanned=true');
         if (filters.isErrated)   parts.push('isErrated=true');
         if (filters.isSuspended) parts.push('isSuspended=true');
         if (filters.hasNoEffect) parts.push('hasNoEffect=true');
 
+        _readEffectRows();
+        var _activeEffects = filters.effects.filter(function(ef) {
+            return ef.trigger || ef.condition || ef.effect;
+        });
+        if (_activeEffects.length) {
+            if (_activeEffects.length > 1) parts.push('effectSlotMode=' + filters.effectMode);
+            _activeEffects.forEach(function(ef, i) {
+                var n = i;
+                if (ef.trigger)   parts.push('effectSlot[' + n + '][trigger]='   + encodeURIComponent(ef.trigger));
+                if (ef.condition) parts.push('effectSlot[' + n + '][condition]=' + encodeURIComponent(ef.condition));
+                if (ef.effect)    parts.push('effectSlot[' + n + '][effect]='    + encodeURIComponent(ef.effect));
+            });
+        }
+
         if (filters.q) parts.push('name=' + encodeURIComponent(filters.q));
 
         return API_BASE + '/api/cards?' + parts.join('&');
@@ -394,11 +639,15 @@ function CardSearch(cfg) {
         filters.subtypes      = sv('subtype');
         filters.keywords      = sv('keyword');
         filters.variations    = sv('variation');
-        filters.mainCost   = rv('maincost');
-        filters.recallCost = rv('recallcost');
-        filters.forest     = rv('forestpower');
-        filters.mountain   = rv('mountainpower');
-        filters.ocean      = rv('oceanpower');
+        function rop(id) {
+            var el = document.getElementById(P + '-filter-' + id + '-op');
+            return el ? (el.value || 'eq') : 'eq';
+        }
+        filters.mainCost      = rv('maincost');    filters.mainCostOp    = rop('maincost');
+        filters.recallCost    = rv('recallcost');  filters.recallCostOp  = rop('recallcost');
+        filters.forest        = rv('forestpower'); filters.forestOp      = rop('forestpower');
+        filters.mountain      = rv('mountainpower'); filters.mountainOp  = rop('mountainpower');
+        filters.ocean         = rv('oceanpower');  filters.oceanOp       = rop('oceanpower');
         var statusVals        = sv('status');
         filters.isBanned      = statusVals.indexOf('banned')    >= 0;
         filters.isErrated     = statusVals.indexOf('errated')   >= 0;
@@ -407,6 +656,9 @@ function CardSearch(cfg) {
         filters.hasNoEffect = hneEl ? hneEl.checked : false;
         var kwModeEl = document.getElementById(P + '-kw-mode');
         filters.keywordMode = kwModeEl ? (kwModeEl.dataset.mode || 'or') : 'or';
+        var _crEl = document.getElementById(P + '-filter-cost-relation');
+        filters.costRelation = _crEl ? _crEl.value : '';
+        _readEffectRows();
     }
 
     // filter count badge
@@ -423,7 +675,9 @@ function CardSearch(cfg) {
             + (_setsDirty ? filters.sets.length : 0) + filters.subtypes.length + filters.keywords.length
             + (_variationDirty ? filters.variations.length : 0) + (_collDirty ? 1 : 0)
             + (filters.isBanned ? 1 : 0) + (filters.isErrated ? 1 : 0) + (filters.isSuspended ? 1 : 0)
-            + (filters.hasNoEffect ? 1 : 0);
+            + (filters.hasNoEffect ? 1 : 0)
+            + (filters.costRelation ? 1 : 0)
+            + filters.effects.filter(function(ef) { return ef.trigger || ef.condition || ef.effect; }).length;
         if (elFilterCount) {
             elFilterCount.textContent = n || '';
             elFilterCount.style.display = n > 0 ? '' : 'none';
@@ -790,6 +1044,11 @@ function CardSearch(cfg) {
         filters.isErrated      = false;
         filters.isSuspended    = false;
         filters.hasNoEffect    = false;
+        filters.effects        = [];
+        filters.effectMode     = 'or';
+        filters.mainCostOp     = 'eq'; filters.recallCostOp = 'eq';
+        filters.forestOp       = 'eq'; filters.mountainOp   = 'eq'; filters.oceanOp = 'eq';
+        filters.costRelation   = '';
         filters.sort           = DEFAULT_SORT_1;
 
         if (elSearch)     elSearch.value     = '';
@@ -813,6 +1072,15 @@ function CardSearch(cfg) {
         });
         var _hneReset = document.getElementById(P + '-filter-hasnoeffect');
         if (_hneReset) _hneReset.checked = false;
+        ['maincost','recallcost','forestpower','mountainpower','oceanpower'].forEach(function(id) {
+            var opEl = document.getElementById(P + '-filter-' + id + '-op');
+            if (opEl) opEl.value = 'eq';
+            var valEl = document.getElementById(P + '-filter-' + id);
+            if (valEl) valEl.value = '';
+        });
+        var _crReset = document.getElementById(P + '-filter-cost-relation');
+        if (_crReset) _crReset.value = '';
+        _resetEffectRows();
         var _kwReset = document.getElementById(P + '-kw-mode');
         if (_kwReset) {
             _kwReset.dataset.mode = 'or';
@@ -936,10 +1204,12 @@ function CardSearch(cfg) {
         var userInit = (opts || {}).onInitialize;
         var merged = Object.assign({ plugins: ['remove_button'], create: false, maxOptions: null }, opts || {});
         merged.onInitialize = function() {
-            this.control_input.style.cssText =
-                'width:0!important;min-width:0!important;padding:0!important;margin:0!important;opacity:0!important;flex:0 0 0!important;';
-            this.control_input.setAttribute('inputmode', 'none');
-            this.control_input.readOnly = true;
+            if (!this.settings.placeholder) {
+                this.control_input.style.cssText =
+                    'width:0!important;min-width:0!important;padding:0!important;margin:0!important;opacity:0!important;flex:0 0 0!important;';
+                this.control_input.setAttribute('inputmode', 'none');
+                this.control_input.readOnly = true;
+            }
             if (userInit) userInit.call(this);
         };
         var inst = new TomSelect('#' + id, merged);
@@ -1028,8 +1298,8 @@ function CardSearch(cfg) {
             });
         }
 
-        tsInst.subtype   = makeTs('subtype',   { options: opts.subtypeOptions   || [], items: opts.initialSubtypes   || [] });
-        tsInst.keyword   = makeTs('keyword',   { options: opts.keywordOptions   || [], items: opts.initialKeywords   || [] });
+        tsInst.subtype   = makeTs('subtype',   { options: opts.subtypeOptions || [], items: opts.initialSubtypes || [], placeholder: txt.lbl_subtype || 'Subtype' });
+        tsInst.keyword   = makeTs('keyword',   { options: opts.keywordOptions || [], items: opts.initialKeywords || [], placeholder: txt.lbl_keyword || 'Keyword' });
         tsInst.variation = makeTs('variation', { options: opts.variationOptions || [], onChange: function() { _variationDirty = true; updateFilterCount(); } });
         var _initVars = (opts.initialVariations && opts.initialVariations.length) ? opts.initialVariations : DEFAULT_VARIATIONS.slice();
         if (tsInst.variation && _initVars.length) tsInst.variation.setValue(_initVars, true);
@@ -1045,7 +1315,7 @@ function CardSearch(cfg) {
                 });
             });
         });
-        tsInst.status = makeTs('status', {});
+        tsInst.status = makeTs('status', { placeholder: txt.lbl_card_status || 'Status' });
 
         // Range selects: set initial values and register change listeners
         var _iniRange = cfg.initial || {};
@@ -1087,6 +1357,16 @@ function CardSearch(cfg) {
             if (_iniRange.hasNoEffect) _hneEl.checked = true;
             _hneEl.addEventListener('change', updateFilterCount);
         }
+
+        // Cost operator selects + cost relation
+        ['maincost','recallcost','forestpower','mountainpower','oceanpower'].forEach(function(id) {
+            var el = document.getElementById(P + '-filter-' + id + '-op');
+            if (el) el.addEventListener('change', updateFilterCount);
+        });
+        var _crEl2 = document.getElementById(P + '-filter-cost-relation');
+        if (_crEl2) _crEl2.addEventListener('change', updateFilterCount);
+
+        initEffects();
     }
 
     // wire up events
diff --git a/plugins/core-altered-cards/includes/card-search.php b/plugins/core-altered-cards/includes/card-search.php
index c8dbb34..abf2d60 100644
--- a/plugins/core-altered-cards/includes/card-search.php
+++ b/plugins/core-altered-cards/includes/card-search.php
@@ -1,27 +1,7 @@
 <?php
 /**
- * Reusable card search widget.
- * Set $_cs before including:
- *
- * prefix              string   'cs' | 'db'
- * mode                string   'cards' | 'deck'
- * lang                string   'en' | 'fr'
- * txt                 array    translations (lbl_faction, lbl_type, lbl_rarity,
- *                              lbl_cost_m, lbl_cost_r, lbl_forest, lbl_mountain, lbl_ocean,
- *                              lbl_set, lbl_subtype, lbl_keyword, lbl_variation,
- *                              lbl_card_status, lbl_banned, lbl_errated, lbl_suspended,
- *                              lbl_collection, lbl_scope, scope_all, scope_collection,
- *                              search_ph, filters, reset, search, loading, initial_msg,
- *                              no_results, err_api, api_later, showing, sorts{})
- * data                array    { factions, types, rarities, sets, subtypes, keywords, variations }
- * defaults            array    { types[], rarities[], sets[], variations[], sort1, sort2, cols, perPage }
- * selected            array    { q, faction[], type[], rarity[], sets[], sort,
- *                               isBanned, isErrated, isSuspended }
- * col_options         array    [2,3,4,5]
- * show_cols           bool
- * collection_mode     bool
- * collection_enabled  bool
- * base_url            string   BASE_URL
+ * Reusable card search widget — flat layout, no modal.
+ * Set $_cs before including.
  */
 
 $_csP          = $_cs['prefix']             ?? 'cs';
@@ -45,22 +25,21 @@
 $_csKeywords   = $_csData['keywords']   ?? [];
 $_csVariations = $_csData['variations'] ?? [];
 
-$_csSelFactions  = $_csSel['faction']   ?? [];
-$_csSelTypes     = $_csSel['type']      ?? [];
-$_csSelRarities  = $_csSel['rarity']    ?? [];
-$_csSelSets      = $_csSel['sets']      ?? [];
-$_csSelSort      = $_csSel['sort']      ?? ($_csDef['sort1']    ?? 'default');
-$_csSelQ         = $_csSel['q']         ?? '';
-$_csIsBanned     = !empty($_csSel['isBanned']);
-$_csIsErrated    = !empty($_csSel['isErrated']);
-$_csIsSuspended  = !empty($_csSel['isSuspended']);
+$_csSelFactions = $_csSel['faction'] ?? [];
+$_csSelTypes    = $_csSel['type']    ?? [];
+$_csSelRarities = $_csSel['rarity'] ?? [];
+$_csSelSets     = $_csSel['sets']   ?? [];
+$_csSelSort     = $_csSel['sort']   ?? ($_csDef['sort1'] ?? 'default');
+$_csSelQ        = $_csSel['q']      ?? '';
+$_csIsBanned    = !empty($_csSel['isBanned']);
+$_csIsErrated   = !empty($_csSel['isErrated']);
+$_csIsSuspended = !empty($_csSel['isSuspended']);
 
 $_csDefCols    = max(2, min(5, (int)($_csDef['cols'] ?? 4)));
 $_csMobileCols = $_csDefCols >= 3 ? 2 : $_csDefCols;
-$_csSorts      = $_csTxt['sorts']  ?? [];
+$_csSorts      = $_csTxt['sorts'] ?? [];
 $_csValidCost  = array_map('strval', range(0, 12));
 
-// Derived labels
 $_csFactionNames = [];
 foreach ($_csFactions as $_fk => $_fv) {
     $_csFactionNames[$_fk] = $_fv[$_csLang] ?? $_fv['en'] ?? $_fk;
@@ -73,10 +52,9 @@
 $_csRarityGems = [];
 foreach ($_csRarities as $_rk => $_rv) {
     $_csRarityTxt[$_rk]  = $_rv[$_csLang] ?? $_rv['en'] ?? $_rk;
-    $_csRarityGems[$_rk] = $_rv['gem'] ?? substr($_rk, 0, 1);
+    $_csRarityGems[$_rk] = $_rv['gem']    ?? substr($_rk, 0, 1);
 }
 
-// Collection filter options by type
 $_csCollOpts      = [];
 $_csSeenColl      = [];
 $_csDefCollection = $_csDef['collection'] ?? 'official';
@@ -88,25 +66,59 @@
     }
 }
 $_csHasCollFilter = !empty($_csCollOpts);
+
+$_csOfficialSets = array_filter($_csSets, fn($s) => ($s['type'] ?? '') === 'official' && ($s['subtype'] ?? '') === 'main');
+
+$_csRangeFields = [
+    'maincost'      => ['icon' => '<i class="fak fa-altered-h" style="font-size:1.1rem;flex-shrink:0"></i>',                                                                                  'title' => $_csTxt['lbl_cost_m']   ?? 'Hand'],
+    'recallcost'    => ['icon' => '<i class="fak fa-altered-r" style="font-size:1.1rem;flex-shrink:0"></i>',                                                                                  'title' => $_csTxt['lbl_cost_r']   ?? 'Reserve'],
+    'forestpower'   => ['icon' => '<img src="' . h($_csBaseUrl) . '/plugins/core-altered-cards/assets/biome/F.webp" style="height:20px;width:auto;flex-shrink:0" alt="">',                    'title' => $_csTxt['lbl_forest']   ?? 'Forest'],
+    'mountainpower' => ['icon' => '<img src="' . h($_csBaseUrl) . '/plugins/core-altered-cards/assets/biome/M.webp" style="height:20px;width:auto;flex-shrink:0" alt="">',                    'title' => $_csTxt['lbl_mountain'] ?? 'Mountain'],
+    'oceanpower'    => ['icon' => '<img src="' . h($_csBaseUrl) . '/plugins/core-altered-cards/assets/biome/O.webp" style="height:20px;width:auto;flex-shrink:0" alt="">',                    'title' => $_csTxt['lbl_ocean']    ?? 'Ocean'],
+];
+
+$_csOpEq = $_csLang === 'fr' ? 'égal'       : 'equal';
+$_csOpLt = $_csLang === 'fr' ? 'inférieur'  : 'less than';
+$_csOpGt = $_csLang === 'fr' ? 'supérieur'  : 'greater than';
+$_csHeroLabel = $_csTxt['lbl_hero'] ?? ($_csLang === 'fr' ? 'Héros' : 'Hero');
+$_csHeroAll   = $_csTxt['hero_all'] ?? ($_csLang === 'fr' ? 'Tous les héros' : 'All heroes');
 ?>
+
+<!-- Card count — outside the search box -->
+<span id="<?= h($_csP) ?>-count" style="display:block;font-size:.85rem;color:var(--neutral-500);min-height:1.2em;margin-bottom:.5rem"></span>
+
 <div id="<?= h($_csP) ?>-panel">
 
     <div class="card-altered p-3 mb-3">
 
-        <!-- Search + filter toggle + always-visible actions -->
-        <div class="d-flex gap-2 align-items-center">
-            <input type="text" id="<?= h($_csP) ?>-search"
-                   value="<?= h($_csSelQ) ?>"
-                   placeholder="<?= h($_csTxt['search_ph'] ?? 'Search cards…') ?>"
-                   class="form-control form-control-sm" autocomplete="off" style="min-width:0">
-            <button type="button" id="<?= h($_csP) ?>-filter-btn"
-                    class="btn btn-sm btn-outline-secondary flex-shrink-0"
-                    data-bs-toggle="modal" data-bs-target="#<?= h($_csP) ?>-filter-modal">
-                <i class="fa-solid fa-sliders"></i>
-                <span class="d-none d-sm-inline ms-1"><?= h($_csTxt['filters'] ?? 'Filters') ?></span>
-                <span id="<?= h($_csP) ?>-filter-count"
-                      class="cs-filter-count" style="display:none"></span>
+        <!-- Row 1: scope + sort + controls -->
+        <div class="d-flex align-items-center gap-2 flex-wrap mb-2">
+            <button type="button" id="<?= h($_csP) ?>-scope-all"
+                    class="filter-toggle active" data-scope="all">
+                <i class="fa-solid fa-table-cells"></i>
+                <?= h($_csTxt['scope_all'] ?? 'All cards') ?>
             </button>
+            <button type="button" id="<?= h($_csP) ?>-scope-collection"
+                    class="filter-toggle<?= $_csCollMode ? '' : ' filter-toggle-soon' ?>"
+                    data-scope="collection"<?= $_csCollMode ? '' : ' disabled' ?>>
+                <i class="fa-solid fa-box-archive"></i>
+                <?= h($_csTxt['scope_collection'] ?? 'My collection') ?>
+            </button>
+            <select id="<?= h($_csP) ?>-sort" class="form-select form-select-sm flex-shrink-0 ms-auto" style="width:auto">
+                <?php foreach ($_csSorts as $_sv => $_sl): ?>
+                <option value="<?= h($_sv) ?>"<?= $_csSelSort === $_sv ? ' selected' : '' ?>><?= h($_sl) ?></option>
+                <?php endforeach; ?>
+            </select>
+            <?php if ($_csShowCols): ?>
+            <div class="d-flex align-items-center gap-1 flex-shrink-0">
+                <i class="fa-solid fa-table-cells" style="font-size:.8rem;color:var(--neutral-400)"></i>
+                <select id="<?= h($_csP) ?>-cols" class="form-select form-select-sm" style="width:auto">
+                    <?php foreach ($_csColOpt as $_cv): ?>
+                    <option value="<?= (int)$_cv ?>"<?= (int)$_cv === $_csDefCols ? ' selected' : '' ?>><?= (int)$_cv ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+            <?php endif; ?>
             <button type="button" id="<?= h($_csP) ?>-reset-btn"
                     class="btn btn-sm btn-outline-secondary flex-shrink-0"
                     title="<?= h($_csTxt['reset'] ?? 'Reset') ?>">
@@ -117,14 +129,48 @@ class="btn btn-sm btn-outline-secondary flex-shrink-0"
                     class="btn btn-sm btn-primary-altered flex-shrink-0">
                 <i class="fa-solid fa-magnifying-glass me-1"></i><?= h($_csTxt['search'] ?? 'Search') ?>
             </button>
+            <span id="<?= h($_csP) ?>-filter-count" class="cs-filter-count" style="display:none"></span>
         </div>
 
-        <!-- Quick-filter: Official sets only -->
-        <?php
-        $_csOfficialSets = array_filter($_csSets, function($s) { return ($s['type'] ?? '') === 'official' && ($s['subtype'] ?? '') === 'main'; });
-        if (!empty($_csOfficialSets)):
-        ?>
-        <div class="filter-row filter-row--scroll mt-2">
+        <!-- Row 2: name + keyword + variation + status -->
+        <div class="d-flex gap-2 align-items-center flex-wrap mb-2">
+            <input type="text" id="<?= h($_csP) ?>-search"
+                   value="<?= h($_csSelQ) ?>"
+                   placeholder="<?= h($_csTxt['search_ph'] ?? 'Search…') ?>"
+                   class="form-control form-control-sm" autocomplete="off" style="min-width:140px;flex:2">
+            <div style="flex:1;min-width:160px;max-width:280px;display:flex;align-items:center;gap:6px">
+                <div id="<?= h($_csP) ?>-kw-mode" data-mode="or"
+                     class="btn-group btn-group-sm flex-shrink-0" role="group">
+                    <button type="button" class="btn btn-outline-secondary kw-mode-btn active" data-mode="or" style="padding:1px 5px;font-size:.65rem"><?= h($_csTxt['kw_mode_or'] ?? 'OR') ?></button>
+                    <button type="button" class="btn btn-outline-secondary kw-mode-btn" data-mode="and" style="padding:1px 5px;font-size:.65rem"><?= h($_csTxt['kw_mode_and'] ?? 'AND') ?></button>
+                </div>
+                <div style="flex:1;min-width:0">
+                    <select id="<?= h($_csP) ?>-filter-keyword" multiple>
+                        <?php foreach ($_csKeywords as $_kk => $_kv): ?>
+                        <option value="<?= h($_kk) ?>"><?= h($_kv[$_csLang] ?? $_kv['en'] ?? $_kk) ?></option>
+                        <?php endforeach; ?>
+                    </select>
+                </div>
+            </div>
+            <div style="flex:1;min-width:130px;max-width:200px">
+                <select id="<?= h($_csP) ?>-filter-variation" multiple>
+                    <?php foreach ($_csVariations as $_vk => $_vv): ?>
+                    <option value="<?= h($_vk) ?>"><?= h($_vv[$_csLang] ?? $_vv['en'] ?? $_vk) ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+            <div style="flex:1;min-width:130px;max-width:200px">
+                <select id="<?= h($_csP) ?>-filter-status" multiple>
+                    <option value="banned"<?= $_csIsBanned ? ' selected' : '' ?>><?= h($_csTxt['lbl_banned'] ?? 'Banned') ?></option>
+                    <option value="errated"<?= $_csIsErrated ? ' selected' : '' ?>><?= h($_csTxt['lbl_errated'] ?? 'Errated') ?></option>
+                    <option value="suspended"<?= $_csIsSuspended ? ' selected' : '' ?>><?= h($_csTxt['lbl_suspended'] ?? 'Suspended') ?></option>
+                </select>
+            </div>
+        </div>
+
+        <!-- Set — quick-filter buttons -->
+        <?php if (!empty($_csOfficialSets)): ?>
+        <div class="filter-row filter-row--scroll mb-1">
             <?php foreach (array_reverse($_csOfficialSets, true) as $_sk => $_sv): ?>
             <button type="button"
                     class="filter-toggle set-qf-btn<?= in_array($_sk, $_csSelSets) ? ' active' : '' ?>"
@@ -138,10 +184,25 @@ class="filter-toggle set-qf-btn<?= in_array($_sk, $_csSelSets) ? ' active' : ''
             <?php endforeach; ?>
         </div>
         <?php endif; ?>
+        <!-- Hidden selects for TomSelect / collection filter JS -->
+        <div class="d-none">
+            <?php if ($_csHasCollFilter): ?>
+            <select id="<?= h($_csP) ?>-filter-collection">
+                <?php foreach ($_csCollOpts as $_co): ?>
+                <option value="<?= h($_co['value']) ?>"<?= $_co['value'] === $_csDefCollection ? ' selected' : '' ?>><?= h($_co['label']) ?></option>
+                <?php endforeach; ?>
+            </select>
+            <?php endif; ?>
+            <select id="<?= h($_csP) ?>-filter-set" multiple>
+                <?php foreach ($_csSets as $_sk => $_sv): ?>
+                <option value="<?= h($_sk) ?>"<?= in_array($_sk, $_csSelSets) ? ' selected' : '' ?>><?= h($_sv[$_csLang] ?? $_sv['en'] ?? $_sk) ?></option>
+                <?php endforeach; ?>
+            </select>
+        </div>
 
-        <!-- Quick-filter: Faction -->
-        <?php if (!empty($_csFactions)): ?>
-        <div class="filter-row filter-row--scroll mt-1">
+        <!-- Faction + Rarity -->
+        <?php if (!empty($_csFactions) || !empty($_csRarities)): ?>
+        <div class="filter-row filter-row--scroll mb-1">
             <?php foreach ($_csFactions as $_fk => $_fv): ?>
             <button type="button"
                     class="filter-toggle<?= in_array($_fk, $_csSelFactions) ? ' active' : '' ?>"
@@ -151,12 +212,9 @@ class="filter-toggle<?= in_array($_fk, $_csSelFactions) ? ' active' : '' ?>"
                 <?= h($_csFactionNames[$_fk] ?? $_fk) ?>
             </button>
             <?php endforeach; ?>
-        </div>
-        <?php endif; ?>
-
-        <!-- Quick-filter: Rarity -->
-        <?php if (!empty($_csRarities)): ?>
-        <div class="filter-row filter-row--scroll mt-1">
+            <?php if (!empty($_csFactions) && !empty($_csRarities)): ?>
+            <span style="width:1px;background:var(--neutral-300,#dee2e6);align-self:stretch;margin:0 4px;flex-shrink:0"></span>
+            <?php endif; ?>
             <?php foreach ($_csRarities as $_rk => $_rv): ?>
             <button type="button"
                     class="filter-toggle<?= in_array($_rk, $_csSelRarities) ? ' active' : '' ?>"
@@ -169,9 +227,9 @@ class="filter-toggle<?= in_array($_rk, $_csSelRarities) ? ' active' : '' ?>"
         </div>
         <?php endif; ?>
 
-        <!-- Quick-filter: Type -->
+        <!-- Type + Subtype -->
         <?php if (!empty($_csTypes)): ?>
-        <div class="filter-row filter-row--scroll mt-1">
+        <div class="filter-row filter-row--scroll mb-1">
             <?php foreach ($_csTypes as $_tk => $_tv): ?>
             <button type="button"
                     class="filter-toggle<?= in_array($_tk, $_csSelTypes) ? ' active' : '' ?>"
@@ -179,227 +237,64 @@ class="filter-toggle<?= in_array($_tk, $_csSelTypes) ? ' active' : '' ?>"
                 <?= h($_csTypeTxt[$_tk] ?? $_tk) ?>
             </button>
             <?php endforeach; ?>
+            <?php if (!empty($_csSubtypes)): ?>
+            <span style="width:1px;background:var(--neutral-300,#dee2e6);align-self:stretch;margin:0 4px;flex-shrink:0"></span>
+            <div style="min-width:140px;max-width:200px;flex-shrink:0">
+                <select id="<?= h($_csP) ?>-filter-subtype" multiple>
+                    <?php foreach ($_csSubtypes as $_sk => $_sv): ?>
+                    <option value="<?= h($_sk) ?>"><?= h($_sv[$_csLang] ?? $_sv['en'] ?? $_sk) ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+            <?php endif; ?>
         </div>
         <?php endif; ?>
 
-        <span id="<?= h($_csP) ?>-count" style="display:block;margin-top:.4rem;font-size:.8rem;color:var(--neutral-500)"></span>
-
-    </div><!-- /.card-altered -->
-
-    <!-- Filter modal -->
-    <div class="modal fade" id="<?= h($_csP) ?>-filter-modal" tabindex="-1"
-         aria-labelledby="<?= h($_csP) ?>-filter-modal-label" aria-hidden="true">
-        <div class="modal-dialog modal-dialog-centered modal-lg modal-dialog-scrollable">
-            <div class="modal-content">
-
-                <div class="modal-header py-2">
-                    <h6 class="modal-title" id="<?= h($_csP) ?>-filter-modal-label">
-                        <i class="fa-solid fa-sliders me-2"></i><?= h($_csTxt['filters'] ?? 'Filters') ?>
-                    </h6>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-
-                <div class="modal-body">
-
-                    <!-- Sort + cols row -->
-                    <div class="filter-row mb-2">
-                        <div class="ms-auto d-flex align-items-center gap-2 flex-shrink-0">
-                            <div style="display:flex;align-items:center;gap:6px">
-                                <i class="fa-solid fa-arrow-down-a-z" style="font-size:.8rem;color:var(--neutral-400)"></i>
-                                <select id="<?= h($_csP) ?>-sort" class="form-select form-select-sm" style="width:auto">
-                                    <?php foreach ($_csSorts as $_sv => $_sl): ?>
-                                    <option value="<?= h($_sv) ?>"<?= $_csSelSort === $_sv ? ' selected' : '' ?>><?= h($_sl) ?></option>
-                                    <?php endforeach; ?>
-                                </select>
-                            </div>
-                            <?php if ($_csShowCols): ?>
-                            <div style="display:flex;align-items:center;gap:6px">
-                                <i class="fa-solid fa-table-cells" style="font-size:.8rem;color:var(--neutral-400)"></i>
-                                <select id="<?= h($_csP) ?>-cols" class="form-select form-select-sm" style="width:auto">
-                                    <?php foreach ($_csColOpt as $_cv): ?>
-                                    <option value="<?= (int)$_cv ?>"<?= (int)$_cv === $_csDefCols ? ' selected' : '' ?>><?= (int)$_cv ?></option>
-                                    <?php endforeach; ?>
-                                </select>
-                            </div>
-                            <?php endif; ?>
-                        </div>
-                    </div>
-
-                    <!-- Scope (search in all / my collection) -->
-                    <div class="filter-row mb-2">
-                        <span class="filter-label"><?= h($_csTxt['lbl_scope'] ?? 'Search in') ?></span>
-                        <button type="button" id="<?= h($_csP) ?>-scope-all"
-                                class="filter-toggle active" data-scope="all">
-                            <i class="fa-solid fa-table-cells"></i>
-                            <?= h($_csTxt['scope_all'] ?? 'All cards') ?>
-                        </button>
-                        <button type="button" id="<?= h($_csP) ?>-scope-collection"
-                                class="filter-toggle<?= $_csCollMode ? '' : ' filter-toggle-soon' ?>"
-                                data-scope="collection"<?= $_csCollMode ? '' : ' disabled' ?>>
-                            <i class="fa-solid fa-box-archive"></i>
-                            <?= h($_csTxt['scope_collection'] ?? 'My collection') ?>
-                        </button>
-                    </div>
-
-                    <!-- Faction (TomSelect, syncs with quick-filter toggles above) -->
-                    <div class="filter-row mb-2">
-                        <span class="filter-label"><?= h($_csTxt['lbl_faction'] ?? 'Faction') ?></span>
-                        <div style="flex:1;min-width:0">
-                            <select id="<?= h($_csP) ?>-filter-faction" multiple>
-                                <?php foreach ($_csFactions as $_fk => $_fv): ?>
-                                <option value="<?= h($_fk) ?>"><?= h($_csFactionNames[$_fk] ?? $_fk) ?></option>
-                                <?php endforeach; ?>
-                            </select>
-                        </div>
-                    </div>
-
-                    <!-- Type -->
-                    <div class="filter-row mb-2">
-                        <span class="filter-label"><?= h($_csTxt['lbl_type'] ?? 'Type') ?></span>
-                        <?php foreach ($_csTypes as $_tk => $_tv): ?>
-                        <button type="button"
-                                class="filter-toggle<?= in_array($_tk, $_csSelTypes) ? ' active' : '' ?>"
-                                data-filter="type" data-value="<?= h($_tk) ?>">
-                            <?= h($_csTypeTxt[$_tk] ?? $_tk) ?>
-                        </button>
-                        <?php endforeach; ?>
-                    </div>
-
-                    <!-- Rarity -->
-                    <div class="filter-row mb-2">
-                        <span class="filter-label"><?= h($_csTxt['lbl_rarity'] ?? 'Rarity') ?></span>
-                        <?php foreach ($_csRarities as $_rk => $_rv): ?>
-                        <button type="button"
-                                class="filter-toggle<?= in_array($_rk, $_csSelRarities) ? ' active' : '' ?>"
-                                data-filter="rarity" data-value="<?= h($_rk) ?>">
-                            <img src="<?= h($_csBaseUrl) ?>/plugins/core-altered-cards/assets/gems/<?= h($_csRarityGems[$_rk] ?? substr($_rk, 0, 1)) ?>.png"
-                                 alt="<?= h($_rk) ?>" style="width:15px;height:15px">
-                            <?= h($_csRarityTxt[$_rk] ?? $_rk) ?>
-                        </button>
-                        <?php endforeach; ?>
-                    </div>
-
-                    <!-- Row 1: Main + Reserve + Forest + Mountain + Ocean (single exact-value selects 0-12) -->
-                    <div class="row g-2 mb-2">
-                        <?php
-                        $_csRangeFields = [
-                            'maincost'     => ['icon_html' => '<i class="fak fa-altered-h" style="font-size:1.25rem;flex-shrink:0"></i>',                                                              'title' => $_csTxt['lbl_cost_m']   ?? 'Hand'],
-                            'recallcost'   => ['icon_html' => '<i class="fak fa-altered-r" style="font-size:1.25rem;flex-shrink:0"></i>',                                                              'title' => $_csTxt['lbl_cost_r']   ?? 'Reserve'],
-                            'forestpower'  => ['icon_html' => '<img src="' . h($_csBaseUrl) . '/plugins/core-altered-cards/assets/biome/F.webp" style="height:22px;width:auto;flex-shrink:0" alt="">',                            'title' => $_csTxt['lbl_forest']   ?? 'Forest'],
-                            'mountainpower'=> ['icon_html' => '<img src="' . h($_csBaseUrl) . '/plugins/core-altered-cards/assets/biome/M.webp" style="height:22px;width:auto;flex-shrink:0" alt="">',                            'title' => $_csTxt['lbl_mountain'] ?? 'Mountain'],
-                            'oceanpower'   => ['icon_html' => '<img src="' . h($_csBaseUrl) . '/plugins/core-altered-cards/assets/biome/O.webp" style="height:22px;width:auto;flex-shrink:0" alt="">',                            'title' => $_csTxt['lbl_ocean']    ?? 'Ocean'],
-                        ];
-                        foreach ($_csRangeFields as $_rfKey => $_rfData): ?>
-                        <div class="col">
-                            <div class="d-flex align-items-center gap-1" title="<?= h($_rfData['title']) ?>">
-                                <?= $_rfData['icon_html'] ?>
-                                <select id="<?= h($_csP) ?>-filter-<?= h($_rfKey) ?>" class="form-select form-select-sm" style="min-width:0;flex:1;padding-left:4px;padding-right:2px">
-                                    <option value="">—</option>
-                                    <?php foreach ($_csValidCost as $_v): ?>
-                                    <option value="<?= h($_v) ?>"><?= h($_v) ?></option>
-                                    <?php endforeach; ?>
-                                </select>
-                            </div>
-                        </div>
-                        <?php endforeach; ?>
-                    </div>
-
-                    <!-- Row 3: Collection (optional) + Set -->
-                    <div class="row g-2 mb-2">
-                        <?php if ($_csHasCollFilter): ?>
-                        <div class="col-4">
-                            <div class="filter-label mb-1"><?= h($_csTxt['lbl_collection'] ?? 'Collection') ?></div>
-                            <select id="<?= h($_csP) ?>-filter-collection">
-                                <?php foreach ($_csCollOpts as $_co): ?>
-                                <option value="<?= h($_co['value']) ?>"<?= $_co['value'] === $_csDefCollection ? ' selected' : '' ?>><?= h($_co['label']) ?></option>
-                                <?php endforeach; ?>
-                            </select>
-                        </div>
-                        <div class="col-8">
-                        <?php else: ?>
-                        <div class="col-12">
-                        <?php endif; ?>
-                            <div class="filter-label mb-1"><?= h($_csTxt['lbl_set'] ?? 'Set') ?></div>
-                            <select id="<?= h($_csP) ?>-filter-set" multiple>
-                                <?php foreach ($_csSets as $_sk => $_sv): ?>
-                                <option value="<?= h($_sk) ?>"<?= in_array($_sk, $_csSelSets) ? ' selected' : '' ?>><?= h($_sv[$_csLang] ?? $_sv['en'] ?? $_sk) ?></option>
-                                <?php endforeach; ?>
-                            </select>
-                        </div>
-                    </div>
-
-                    <!-- Row 4: Subtype + Keyword -->
-                    <div class="row g-2 mb-2">
-                        <div class="col-6">
-                            <div class="filter-label mb-1"><?= h($_csTxt['lbl_subtype'] ?? 'Subtype') ?></div>
-                            <select id="<?= h($_csP) ?>-filter-subtype" multiple>
-                                <?php foreach ($_csSubtypes as $_sk => $_sv): ?>
-                                <option value="<?= h($_sk) ?>"><?= h($_sv[$_csLang] ?? $_sv['en'] ?? $_sk) ?></option>
-                                <?php endforeach; ?>
-                            </select>
-                        </div>
-                        <div class="col-6">
-                            <div class="filter-label mb-1 d-flex align-items-center justify-content-between">
-                                <span><?= h($_csTxt['lbl_keyword'] ?? 'Keyword') ?></span>
-                                <div id="<?= h($_csP) ?>-kw-mode" data-mode="or"
-                                     class="btn-group btn-group-sm flex-shrink-0" role="group">
-                                    <button type="button" class="btn btn-outline-secondary kw-mode-btn active" data-mode="or" style="padding:1px 6px;font-size:.65rem"><?= h($_csTxt['kw_mode_or'] ?? 'OR') ?></button>
-                                    <button type="button" class="btn btn-outline-secondary kw-mode-btn" data-mode="and" style="padding:1px 6px;font-size:.65rem"><?= h($_csTxt['kw_mode_and'] ?? 'AND') ?></button>
-                                </div>
-                            </div>
-                            <select id="<?= h($_csP) ?>-filter-keyword" multiple>
-                                <?php foreach ($_csKeywords as $_kk => $_kv): ?>
-                                <option value="<?= h($_kk) ?>"><?= h($_kv[$_csLang] ?? $_kv['en'] ?? $_kk) ?></option>
-                                <?php endforeach; ?>
-                            </select>
-                        </div>
-                    </div>
-
-                    <!-- Row 5: Variation + Status -->
-                    <div class="row g-2 mb-0">
-                        <div class="col-6">
-                            <div class="filter-label mb-1"><?= h($_csTxt['lbl_variation'] ?? 'Variation') ?></div>
-                            <select id="<?= h($_csP) ?>-filter-variation" multiple>
-                                <?php foreach ($_csVariations as $_vk => $_vv): ?>
-                                <option value="<?= h($_vk) ?>"><?= h($_vv[$_csLang] ?? $_vv['en'] ?? $_vk) ?></option>
-                                <?php endforeach; ?>
-                            </select>
-                        </div>
-                        <div class="col-6">
-                            <div class="filter-label mb-1"><?= h($_csTxt['lbl_card_status'] ?? 'Status') ?></div>
-                            <select id="<?= h($_csP) ?>-filter-status" multiple>
-                                <option value="banned"<?= $_csIsBanned ? ' selected' : '' ?>><?= h($_csTxt['lbl_banned'] ?? 'Banned') ?></option>
-                                <option value="errated"<?= $_csIsErrated ? ' selected' : '' ?>><?= h($_csTxt['lbl_errated'] ?? 'Errated') ?></option>
-                                <option value="suspended"<?= $_csIsSuspended ? ' selected' : '' ?>><?= h($_csTxt['lbl_suspended'] ?? 'Suspended') ?></option>
-                            </select>
-                            <div class="form-check mt-2">
-                                <input class="form-check-input" type="checkbox" id="<?= h($_csP) ?>-filter-hasnoeffect">
-                                <label class="form-check-label" style="font-size:.85rem" for="<?= h($_csP) ?>-filter-hasnoeffect">
-                                    <?= h($_csTxt['lbl_no_effect'] ?? 'No effect') ?>
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-
-                </div><!-- /.modal-body -->
+        <!-- Cost (operator + value per type) + subtype + gestion -->
+        <div class="filter-row flex-wrap mb-1" style="row-gap:.5rem">
+            <?php foreach ($_csRangeFields as $_rfKey => $_rfData): ?>
+            <div class="d-flex align-items-center gap-1" title="<?= h($_rfData['title']) ?>">
+                <?= $_rfData['icon'] ?>
+                <select id="<?= h($_csP) ?>-filter-<?= h($_rfKey) ?>-op"
+                        class="form-select form-select-sm" style="width:auto">
+                    <option value="eq">&#61;</option>
+                    <option value="lt">&lt;</option>
+                    <option value="lte">&#8804;</option>
+                    <option value="gt">&gt;</option>
+                    <option value="gte">&#8805;</option>
+                </select>
+                <input type="number" id="<?= h($_csP) ?>-filter-<?= h($_rfKey) ?>"
+                       min="0" max="12" placeholder="—"
+                       class="form-control form-control-sm" style="width:52px">
+            </div>
+            <?php endforeach; ?>
+            <select id="<?= h($_csP) ?>-filter-cost-relation" class="form-select form-select-sm" style="width:auto">
+                <option value=""><?= h($_csTxt['cost_relation_ph'] ?? ($_csLang === 'fr' ? 'Gestion des coûts' : 'Cost management')) ?></option>
+                <option value="eq"><?= h($_csTxt['cost_main_eq_recall']    ?? ($_csLang === 'fr' ? 'Coût main = réserve'       : 'Main cost = reserve')) ?></option>
+                <option value="main_gt"><?= h($_csTxt['cost_main_gt_recall'] ?? ($_csLang === 'fr' ? 'Coût main plus élevé'     : 'Higher main cost')) ?></option>
+                <option value="recall_gt"><?= h($_csTxt['cost_recall_gt_main'] ?? ($_csLang === 'fr' ? 'Coût réserve plus élevé' : 'Higher reserve cost')) ?></option>
+            </select>
+        </div>
 
-                <div class="modal-footer py-2">
-                    <button type="button" id="<?= h($_csP) ?>-modal-reset-btn"
-                            class="btn btn-sm btn-outline-secondary me-auto"
-                            title="<?= h($_csTxt['reset'] ?? 'Reset') ?>"
-                            data-bs-dismiss="modal">
-                        <i class="fa-solid fa-rotate-left me-1"></i><?= h($_csTxt['reset'] ?? 'Reset') ?>
-                    </button>
-                    <button type="button" id="<?= h($_csP) ?>-modal-apply-btn"
-                            class="btn btn-sm btn-primary-altered"
-                            data-bs-dismiss="modal">
-                        <i class="fa-solid fa-magnifying-glass me-1"></i><?= h($_csTxt['search'] ?? 'Search') ?>
-                    </button>
+        <!-- Effects -->
+        <div class="filter-row flex-wrap mb-0" style="row-gap:.5rem;align-items:flex-start;min-width:0">
+            <div style="flex:1;min-width:0">
+                <div id="<?= h($_csP) ?>-effect-mode" data-mode="or"
+                     class="btn-group btn-group-sm mb-1" style="display:none">
+                    <button type="button" class="btn btn-outline-secondary effect-mode-btn active"
+                            data-mode="or" style="padding:1px 6px;font-size:.65rem">OR</button>
+                    <button type="button" class="btn btn-outline-secondary effect-mode-btn"
+                            data-mode="and" style="padding:1px 6px;font-size:.65rem">AND</button>
                 </div>
+                <div id="<?= h($_csP) ?>-effect-rows"></div>
+                <button type="button" id="<?= h($_csP) ?>-effect-add"
+                        class="btn btn-sm btn-outline-secondary mt-1" style="font-size:.8rem">
+                    <i class="fa-solid fa-plus me-1"></i><?= h($_csTxt['add_effect'] ?? ($_csLang === 'fr' ? 'Ajouter un effet' : 'Add effect')) ?>
+                </button>
+            </div>
+        </div>
 
-            </div><!-- /.modal-content -->
-        </div><!-- /.modal-dialog -->
-    </div><!-- /.modal -->
+    </div><!-- /.card-altered -->
 
     <!-- Loading -->
     <div id="<?= h($_csP) ?>-loading" class="ac-state-pane" style="display:none">
@@ -408,7 +303,7 @@ class="btn btn-sm btn-primary-altered"
         <div class="mt-2 small text-muted"><?= h($_csTxt['loading'] ?? '') ?></div>
     </div>
 
-    <!-- Initial state -->
+    <!-- Initial -->
     <div id="<?= h($_csP) ?>-initial" class="ac-state-pane">
         <i class="fa-solid fa-magnifying-glass ac-state-icon"></i>
         <?= h($_csTxt['initial_msg'] ?? 'Use filters or search to display cards.') ?>
@@ -420,14 +315,14 @@ class="btn btn-sm btn-primary-altered"
         <?= h($_csTxt['no_results'] ?? 'No cards found.') ?>
     </div>
 
-    <!-- API error -->
+    <!-- Error -->
     <div id="<?= h($_csP) ?>-error" class="ac-state-pane" style="display:none">
         <i class="fa-solid fa-triangle-exclamation ac-state-icon" style="opacity:1;color:#f87171"></i>
         <p class="small text-muted mb-1"><?= h($_csTxt['err_api'] ?? 'Could not load cards.') ?></p>
         <p class="small text-muted"><?= h($_csTxt['api_later'] ?? '') ?></p>
     </div>
 
-    <!-- Card grid -->
+    <!-- Grid -->
     <?php $_csGridClass = $_csMode === 'deck' ? 'cards-grid-db' : 'cards-grid'; ?>
     <?php $_csCssVar    = $_csMode === 'deck' ? '--db-cols' : '--cards-cols'; ?>
     <div id="<?= h($_csP) ?>-grid"
@@ -442,14 +337,11 @@ class="d-flex align-items-center justify-content-center gap-2 mt-3 flex-wrap"
 </div><!-- /#{prefix}-panel -->
 
 <?php if ($_csMode === 'cards'): ?>
-<!-- Card lightbox modal -->
-<div id="<?= h($_csP) ?>-modal"
-     class="ac-lightbox-overlay" style="display:none">
-    <div id="<?= h($_csP) ?>-modal-inner"
-         class="ac-lightbox-inner"
-         onclick="event.stopPropagation()"></div>
+<div id="<?= h($_csP) ?>-modal" class="ac-lightbox-overlay" style="display:none">
+    <div id="<?= h($_csP) ?>-modal-inner" class="ac-lightbox-inner" onclick="event.stopPropagation()"></div>
 </div>
 <?php endif; ?>
+
 <script>
 (function() {
     document.querySelectorAll('.filter-row--scroll').forEach(function(el) {
diff --git a/plugins/core-altered-cards/pages/cards.php b/plugins/core-altered-cards/pages/cards.php
index 3987842..30e5aa1 100644
--- a/plugins/core-altered-cards/pages/cards.php
+++ b/plugins/core-altered-cards/pages/cards.php
@@ -3,6 +3,7 @@
 $lang   = getLang();
 $uiLang = getUiLang();
 
+
 // translations
 $_ss        = loadSearchSettings();
 $_sharedTxt = $_ss['translations'][$uiLang] ?? [];
@@ -14,6 +15,8 @@
         'community'   => 'Community',
         'detail_label'=> 'View detail',
         'btn_collection' => 'My collection',
+        'lbl_effects' => 'Effects',
+        'add_effect'  => 'Add effect',
     ],
     'fr' => [
         'page_title'  => 'Cartes',
@@ -22,6 +25,8 @@
         'community'   => 'Communauté',
         'detail_label'=> 'Accéder au détail',
         'btn_collection' => 'Ma collection',
+        'lbl_effects' => 'Effets',
+        'add_effect'  => 'Ajouter un effet',
     ],
 ][$uiLang] ?? []);
 
@@ -274,10 +279,17 @@ function($code, $names) use ($uiLang) { return ['value' => $code, 'text' => $nam
     },
     typesMerged: <?= json_encode($typesMergedData) ?>,
     txt: {
-        prev:         <?= json_encode($txt['prev']         ?? '← Prev') ?>,
-        next:         <?= json_encode($txt['next']         ?? 'Next →') ?>,
-        showing:      <?= json_encode($txt['showing']      ?? '%d cards') ?>,
-        detail_label: <?= json_encode($txt['detail_label'] ?? 'View detail') ?>,
+        prev:          <?= json_encode($txt['prev']          ?? '← Prev') ?>,
+        next:          <?= json_encode($txt['next']          ?? 'Next →') ?>,
+        showing:       <?= json_encode($txt['showing']       ?? '%d cards') ?>,
+        detail_label:  <?= json_encode($txt['detail_label']  ?? 'View detail') ?>,
+        any_trigger:    <?= json_encode($uiLang === 'fr' ? 'Tous les déclencheurs' : 'Any trigger') ?>,
+        any_condition:  <?= json_encode($uiLang === 'fr' ? 'Toutes les conditions' : 'Any condition') ?>,
+        any_effect:     <?= json_encode($uiLang === 'fr' ? 'Tous les effets'       : 'Any effect') ?>,
+        lbl_subtype:    <?= json_encode($txt['lbl_subtype']    ?? ($uiLang === 'fr' ? 'Sous-type' : 'Subtype')) ?>,
+        lbl_card_status:<?= json_encode($txt['lbl_card_status'] ?? ($uiLang === 'fr' ? 'Statut'    : 'Status')) ?>,
+        lbl_keyword:    <?= json_encode($txt['lbl_keyword']    ?? ($uiLang === 'fr' ? 'Mot-clé'   : 'Keyword')) ?>,
+        lbl_variation:  <?= json_encode($txt['lbl_variation']  ?? ($uiLang === 'fr' ? 'Variation'  : 'Variation')) ?>,
     },
     onColsChange: function(n) {
         var grid = document.getElementById('cs-grid');
diff --git a/plugins/core-altered-cards/pages/deck.php b/plugins/core-altered-cards/pages/deck.php
index e981592..9a75380 100644
--- a/plugins/core-altered-cards/pages/deck.php
+++ b/plugins/core-altered-cards/pages/deck.php
@@ -390,7 +390,7 @@
 $heroCard    = $cardGroups['HERO'][0] ?? null;
 $heroRef     = $heroCard['cardReference'] ?? '';
 $heroName    = $heroCard['name'] ?? null;
-$heroImgUrl  = $heroRef ? CDN_URL . '/cards/hero/' . $heroRef . '_1.webp' : null;
+$heroImgUrl  = $heroRef ? CDN_URL . '/cards/hero/' . normalizeCardRef($heroRef) . '_1.webp' : null;
 $factionCode = $heroCard['factionCode'] ?? null;
 $factionsData   = loadAlteredData('factions');
 $formatsData    = loadAlteredData('formats');
diff --git a/plugins/core-altered-cards/pages/deckbuilder.php b/plugins/core-altered-cards/pages/deckbuilder.php
index 736560b..0551b41 100644
--- a/plugins/core-altered-cards/pages/deckbuilder.php
+++ b/plugins/core-altered-cards/pages/deckbuilder.php
@@ -932,6 +932,12 @@ function cdnUrl(ref) {
         var p = ref.split('_');
         return AlteredDB.cdnUrl + '/cards/' + AlteredDB.uiLang + '/' + (p[1] || '') + '/' + ref + '.webp';
     }
+    function normalizeHeroRef(ref) {
+        var p = ref.split('_');
+        if (p[2] === 'P') p[2] = 'B';
+        if (p[1] === 'BISE') p[1] = 'CORE';
+        return p.join('_');
+    }
     function cardName(card) {
         var n = card.name;
         return typeof n === 'object' ? (n[AlteredDB.lang] || n.en || '') : (n || '');
@@ -1092,7 +1098,7 @@ function setHero(heroData) {
         elHeroBanner.style.cssText = '';
 
         if (ref) {
-            var heroImg = AlteredDB.cdnUrl + '/cards/hero/' + ref + '_1.webp';
+            var heroImg = AlteredDB.cdnUrl + '/cards/hero/' + normalizeHeroRef(ref) + '_1.webp';
             var fImg    = faction ? AlteredDB.pluginAssetsUrl + '/faction/' + faction + '.png' : '';
             elHeroBanner.style.cssText =
                 'background-image:linear-gradient(to right,' + fColor + 'b3 30%,' + fColor + '00 100%),url(' + heroImg + ');' +
diff --git a/plugins/core-altered-cards/pages/decks.php b/plugins/core-altered-cards/pages/decks.php
index 1d1b935..666a707 100644
--- a/plugins/core-altered-cards/pages/decks.php
+++ b/plugins/core-altered-cards/pages/decks.php
@@ -60,6 +60,8 @@
         'search_ph'       => 'Search a deck…',
         'lbl_format'      => 'Format',
         'lbl_faction'     => 'Faction',
+        'lbl_hero'        => 'Hero',
+        'hero_all'        => 'All heroes',
         'lbl_visibility'  => 'Visibility',
         'lbl_sort'        => 'Sort',
         'sort_updated_desc' => 'Recently updated',
@@ -157,6 +159,8 @@
         'search_ph'       => 'Rechercher un deck…',
         'lbl_format'      => 'Format',
         'lbl_faction'     => 'Faction',
+        'lbl_hero'        => 'Héros',
+        'hero_all'        => 'Tous les héros',
         'lbl_visibility'  => 'Visibilité',
         'lbl_sort'        => 'Tri',
         'sort_updated_desc' => 'Récemment modifié',
@@ -439,6 +443,25 @@
     exit;
 }
 
+// AJAX proxy: heroes list
+if ($_SERVER['REQUEST_METHOD'] === 'GET' && ($_GET['ajax'] ?? '') === 'heroes') {
+    header('Content-Type: application/json');
+    $heroLocale = in_array($uiLang, ['fr', 'en', 'de', 'es', 'it'], true) ? $uiLang : 'en';
+    $heroesUrl = 'https://deckbuilder.alteredcore.org/deck-api-proxy/decks/public/heroes?locale=' . $heroLocale;
+    $ch = curl_init($heroesUrl);
+    curl_setopt_array($ch, [CURLOPT_RETURNTRANSFER => true, CURLOPT_HTTPHEADER => ['Accept: application/json'], CURLOPT_TIMEOUT => 10]);
+    $heroesResp = curl_exec($ch);
+    $heroesCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+    curl_close($ch);
+    if ($heroesCode >= 200 && $heroesCode < 300 && $heroesResp) {
+        echo $heroesResp;
+    } else {
+        http_response_code($heroesCode ?: 500);
+        echo json_encode([]);
+    }
+    exit;
+}
+
 // aJAX proxy: public decks
 if ($_SERVER['REQUEST_METHOD'] === 'GET' && ($_GET['ajax'] ?? '') === 'public' && $publicDecksApiPath !== '') {
     header('Content-Type: application/json');
@@ -452,8 +475,15 @@
     if (!in_array($pubOrder, $allowedPubOrders, true)) $pubOrder = 'updatedAt';
     if (!in_array($pubDir,   $allowedPubDirs,   true)) $pubDir   = 'desc';
 
+    $pubFaction = $_GET['faction'] ?? '';
+    if (!preg_match('/^[A-Z]{2}$/', $pubFaction)) $pubFaction = '';
+    $pubHero = $_GET['hero'] ?? '';
+    if (!preg_match('/^[A-Z0-9_]+$/', $pubHero)) $pubHero = '';
+
     $apiParams = ['page' => $pubPage, 'itemsPerPage' => 21];
-    if ($pubFormat !== '') $apiParams['format'] = strtolower($pubFormat);
+    if ($pubFormat  !== '') $apiParams['format']  = strtolower($pubFormat);
+    if ($pubFaction !== '') $apiParams['faction'] = $pubFaction;
+    if ($pubHero    !== '') $apiParams['hero']    = $pubHero;
     $headers = ['Accept: application/json'];
     if ($isLoggedIn) {
         $token = deckApiToken();
@@ -493,11 +523,17 @@
     if (!in_array($myOrder, ['createdAt', 'updatedAt', 'name'], true)) $myOrder = 'updatedAt';
     if (!in_array($myDir,   ['asc', 'desc'],                    true)) $myDir   = 'desc';
 
+    $myFaction = $_GET['faction'] ?? '';
+    if (!preg_match('/^[A-Z]{2}$/', $myFaction)) $myFaction = '';
+    $myHero = $_GET['hero'] ?? '';
+    if (!preg_match('/^[A-Z0-9_]+$/', $myHero)) $myHero = '';
+
     $apiParams = ['page' => $myPage, 'itemsPerPage' => 21];
     if ($myFormat !== '')    $apiParams['format']   = $myFormat;
     if ($myIsPublic !== '')  $apiParams['isPublic'] = $myIsPublic === '1' ? 'true' : 'false';
     if ($myIsDraft  !== '')  $apiParams['isDraft']  = $myIsDraft  === '1' ? 'true' : 'false';
-    // $apiParams['faction'] = ...; // TODO: enable when API supports faction filtering
+    if ($myFaction !== '')   $apiParams['faction']  = $myFaction;
+    if ($myHero    !== '')   $apiParams['hero']     = $myHero;
 
     $myUrl = DECKS_API_URL . '/api/decks?' . http_build_query($apiParams) . '&order[' . $myOrder . ']=' . $myDir;
     $ch = curl_init($myUrl);
@@ -685,6 +721,12 @@ class="form-control form-control-sm" style="width:220px" autocomplete="off">
                     </button>
                     <?php endforeach; ?>
                 </div>
+                <div class="filter-row mb-2">
+                    <span class="filter-label"><?= h($txt['lbl_hero']) ?></span>
+                    <select id="my-hero" class="form-select form-select-sm" style="width:auto;max-width:260px">
+                        <option value=""><?= h($txt['hero_all']) ?></option>
+                    </select>
+                </div>
                 <div class="filter-row filter-row--scroll mb-2">
                     <button type="button" class="filter-toggle" data-my-visibility="1">
                         <i class="fa-solid fa-globe me-1"></i><?= h($txt['public']) ?>
@@ -752,6 +794,12 @@ class="form-control form-control-sm" style="width:220px" autocomplete="off">
                     </button>
                     <?php endforeach; ?>
                 </div>
+                <div class="filter-row mb-2">
+                    <span class="filter-label"><?= h($txt['lbl_hero']) ?></span>
+                    <select id="pub-hero" class="form-select form-select-sm" style="width:auto;max-width:260px">
+                        <option value=""><?= h($txt['hero_all']) ?></option>
+                    </select>
+                </div>
                 <div class="filter-row mb-0">
                     <span class="filter-label"><?= h($txt['lbl_sort']) ?></span>
                     <select id="pub-sort" class="form-select form-select-sm" style="width:auto">
@@ -814,6 +862,7 @@ class="form-control form-control-sm" style="width:220px" autocomplete="off">
         'legalityRulesSection'  => $txt['legality_rules_section'],
         'legalityErrorsSection' => $txt['legality_errors_section'],
         'legalityKeys'          => $txt['legality_keys'],
+        'hero_all'              => $txt['hero_all'],
     ]) ?>;
     var formats = <?= json_encode(array_map(fn($d) => [
         'label' => $d[$uiLang] ?? $d['en'] ?? '',
@@ -821,6 +870,7 @@ class="form-control form-control-sm" style="width:220px" autocomplete="off">
     ], $formatsData)) ?>;
     var factions = <?= json_encode(array_map(fn($d) => [
         'color' => $d['color'] ?? '#ffffff',
+        'name'  => $d[$uiLang] ?? $d['en'] ?? '',
     ], $factionsData)) ?>;
     var cdnUrl = <?= json_encode(CDN_URL) ?>;
 
@@ -873,7 +923,8 @@ class="form-control form-control-sm" style="width:220px" autocomplete="off">
     var myGrid        = document.getElementById('my-deck-grid');
     var myPagination  = document.getElementById('my-pagination');
     var myCountEl     = document.getElementById('my-deck-count');
-    var myFactions    = [];
+    var myFaction     = '';
+    var myHero        = '';
     var myFormat      = '';
     var myVisibility  = '';
     var mySortVal     = 'updatedAt:desc';
@@ -883,6 +934,12 @@ class="form-control form-control-sm" style="width:220px" autocomplete="off">
     function escHtml(s) {
         return String(s).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;');
     }
+    function normalizeRef(ref) {
+        var p = ref.split('_');
+        if (p[2] === 'P') p[2] = 'B';
+        if (p[1] === 'BISE') p[1] = 'CORE';
+        return p.join('_');
+    }
 
     function apiErrorHtml(msg) {
         return '<i class="fa-solid fa-triangle-exclamation" style="font-size:3rem;color:#f87171;margin-bottom:.75rem;display:block"></i>'
@@ -1000,7 +1057,7 @@ function renderMyDeck(deck) {
         var factionData  = factions[factionCode] || {};
         var factionColor = factionData.color || '#ffffff';
         var factionImg   = factionCode ? pluginAssetsUrl + '/faction/' + factionCode + '.png' : '';
-        var heroImgUrl   = heroRef ? cdnUrl + '/cards/hero/' + heroRef + '_1.webp' : '';
+        var heroImgUrl   = heroRef ? cdnUrl + '/cards/hero/' + normalizeRef(heroRef) + '_1.webp' : '';
 
         var heroStyle    = _deckHeroStyle(heroImgUrl, factionColor);
         var rarityHtml   = _deckRarityHtml(byRarity);
@@ -1146,6 +1203,8 @@ function loadMyDecks(p, scroll) {
             + '&dir='   + encodeURIComponent(sortParts[1] || 'desc');
         if (myFormat)     fetchUrl += '&format='   + encodeURIComponent(myFormat);
         if (myVisibility !== '') fetchUrl += '&isPublic=' + encodeURIComponent(myVisibility);
+        if (myFaction)    fetchUrl += '&faction='  + encodeURIComponent(myFaction);
+        if (myHero)       fetchUrl += '&hero='     + encodeURIComponent(myHero);
         var q = mySearch ? mySearch.value.trim() : '';
         // name search is client-side only (API has no text search param)
 
@@ -1158,14 +1217,6 @@ function loadMyDecks(p, scroll) {
                 var decks = data.member || data.data || (Array.isArray(data) ? data : []);
                 // Client-side name search filter
                 if (q) decks = decks.filter(function(d) { return (d.name || '').toLowerCase().indexOf(q.toLowerCase()) >= 0; });
-                // Client-side faction filter (API doesn't support it yet)
-                if (myFactions.length) {
-                    decks = decks.filter(function(d) {
-                        var ref = (d.stats && d.stats.hero && d.stats.hero.reference) || '';
-                        var fm2 = ref.match(/^ALT_[^_]+_[^_]+_([A-Z]{2})_/);
-                        return fm2 && myFactions.indexOf(fm2[1]) >= 0;
-                    });
-                }
                 if (!decks.length) { myEmpty.style.display = ''; return; }
                 decks.forEach(function(deck) { myGrid.insertAdjacentHTML('beforeend', renderMyDeck(deck)); });
                 myAllItems = Array.from(myGrid.querySelectorAll('.my-deck-item'));
@@ -1281,9 +1332,14 @@ function sectionLabel(label) {
 
     document.querySelectorAll('[data-my-faction]').forEach(function(btn) {
         btn.addEventListener('click', function() {
-            var v = btn.dataset.myFaction, idx = myFactions.indexOf(v);
-            if (idx >= 0) { myFactions.splice(idx, 1); btn.classList.remove('active'); }
-            else          { myFactions.push(v);          btn.classList.add('active'); }
+            var v = btn.dataset.myFaction;
+            if (myFaction === v) { myFaction = ''; btn.classList.remove('active'); }
+            else { document.querySelectorAll('[data-my-faction]').forEach(function(b) { b.classList.remove('active'); }); myFaction = v; btn.classList.add('active'); }
+            myHero = '';
+            if (myHeroSelect) {
+                myHeroSelect.value = '';
+                loadHeroes(function(h) { populateHeroSelect(myHeroSelect, h, myFaction, txt.hero_all); });
+            }
             loadMyDecks(1);
         });
     });
@@ -1316,11 +1372,75 @@ function sectionLabel(label) {
     var pubNoMatch    = document.getElementById('pub-no-match');
     var pubGrid       = document.getElementById('pub-grid');
     var pubPagination = document.getElementById('pub-pagination');
-    var pubFactions   = [];
+    var pubFaction    = '';
+    var pubHero       = '';
     var pubFormat     = '';
     var pubSortVal    = 'updatedAt:desc';
     var pubAllItems   = [];
 
+    var myHeroSelect  = document.getElementById('my-hero');
+    var pubHeroSelect = document.getElementById('pub-hero');
+
+    function populateHeroSelect(sel, heroes, activeFaction, heroAllLabel) {
+        var current = sel.value;
+        while (sel.lastElementChild) sel.removeChild(sel.lastElementChild);
+        var allOpt = document.createElement('option');
+        allOpt.value = '';
+        allOpt.textContent = heroAllLabel;
+        sel.appendChild(allOpt);
+        var groups = {};
+        heroes.forEach(function(h) {
+            var m = h.reference.match(/^ALT_[^_]+_[^_]+_([A-Z]{2})_/);
+            var fc = m ? m[1] : '';
+            if (activeFaction && fc !== activeFaction) return;
+            if (!groups[fc]) groups[fc] = [];
+            groups[fc].push(h);
+        });
+        Object.keys(groups).sort().forEach(function(fc) {
+            var grp = document.createElement('optgroup');
+            grp.label = (factions[fc] && factions[fc].name) ? factions[fc].name : fc;
+            groups[fc].forEach(function(h) {
+                var opt = document.createElement('option');
+                opt.value = h.reference;
+                opt.textContent = h.name;
+                if (h.reference === current) opt.selected = true;
+                grp.appendChild(opt);
+            });
+            sel.appendChild(grp);
+        });
+    }
+
+    var heroesCache = null;
+    function loadHeroes(cb) {
+        if (heroesCache) { cb(heroesCache); return; }
+        fetch(baseUrl + '/pages/decks?ajax=heroes')
+            .then(function(r) { return r.json(); })
+            .then(function(data) {
+                heroesCache = Array.isArray(data) ? data : [];
+                cb(heroesCache);
+            })
+            .catch(function() { cb([]); });
+    }
+
+    loadHeroes(function(heroes) {
+        var label = txt.hero_all;
+        if (myHeroSelect) populateHeroSelect(myHeroSelect,  heroes, myFaction,  label);
+        if (pubHeroSelect) populateHeroSelect(pubHeroSelect, heroes, pubFaction, label);
+    });
+
+    if (myHeroSelect) {
+        myHeroSelect.addEventListener('change', function() {
+            myHero = myHeroSelect.value;
+            loadMyDecks(1);
+        });
+    }
+    if (pubHeroSelect) {
+        pubHeroSelect.addEventListener('change', function() {
+            pubHero = pubHeroSelect.value;
+            loadPublicDecks(1);
+        });
+    }
+
     function renderPublicDeck(deck) {
         var deckId   = deck.id || '';
         var name     = deck.name || txt.unnamed;
@@ -1347,7 +1467,7 @@ function renderPublicDeck(deck) {
         var factionData  = factions[factionCode] || {};
         var factionColor = factionData.color || '#ffffff';
         var factionImg   = factionCode ? pluginAssetsUrl + '/faction/' + factionCode + '.png' : '';
-        var heroImgUrl   = heroRef ? cdnUrl + '/cards/hero/' + heroRef + '_1.webp' : '';
+        var heroImgUrl   = heroRef ? cdnUrl + '/cards/hero/' + normalizeRef(heroRef) + '_1.webp' : '';
 
         var heroStyle    = _deckHeroStyle(heroImgUrl, factionColor);
         var rarityHtml   = _deckRarityHtml(byRarity);
@@ -1414,9 +1534,8 @@ function filterPublic() {
         var q = pubSearch ? pubSearch.value.trim().toLowerCase() : '';
         var visible = 0;
         pubAllItems.forEach(function (el) {
-            var show = (!q              || (el.dataset.name    || '').includes(q))
-                    && (!pubFormat      || el.dataset.format   === pubFormat)
-                    && (!pubFactions.length || pubFactions.indexOf(el.dataset.faction) >= 0);
+            var show = (!q         || (el.dataset.name   || '').includes(q))
+                    && (!pubFormat || el.dataset.format  === pubFormat);
             el.style.display = show ? '' : 'none';
             if (show) visible++;
         });
@@ -1437,7 +1556,9 @@ function loadPublicDecks(p, scroll) {
         var fetchUrl = baseUrl + '/pages/decks?ajax=public&page=' + p
             + '&order=' + encodeURIComponent(pubSortParts[0])
             + '&dir='   + encodeURIComponent(pubSortParts[1] || 'desc');
-        if (pubFormat) fetchUrl += '&format=' + encodeURIComponent(pubFormat);
+        if (pubFormat)  fetchUrl += '&format='  + encodeURIComponent(pubFormat);
+        if (pubFaction) fetchUrl += '&faction=' + encodeURIComponent(pubFaction);
+        if (pubHero)    fetchUrl += '&hero='    + encodeURIComponent(pubHero);
         fetch(fetchUrl)
             .then(function (r) { return r.json(); })
             .then(function (data) {
@@ -1473,10 +1594,15 @@ function loadPublicDecks(p, scroll) {
 
     document.querySelectorAll('[data-pub-faction]').forEach(function (btn) {
         btn.addEventListener('click', function () {
-            var v = btn.dataset.pubFaction, idx = pubFactions.indexOf(v);
-            if (idx >= 0) { pubFactions.splice(idx, 1); btn.classList.remove('active'); }
-            else          { pubFactions.push(v);         btn.classList.add('active'); }
-            filterPublic();
+            var v = btn.dataset.pubFaction;
+            if (pubFaction === v) { pubFaction = ''; btn.classList.remove('active'); }
+            else { document.querySelectorAll('[data-pub-faction]').forEach(function(b) { b.classList.remove('active'); }); pubFaction = v; btn.classList.add('active'); }
+            pubHero = '';
+            if (pubHeroSelect) {
+                pubHeroSelect.value = '';
+                loadHeroes(function(h) { populateHeroSelect(pubHeroSelect, h, pubFaction, txt.hero_all); });
+            }
+            loadPublicDecks(1);
         });
     });
 
@@ -1662,7 +1788,7 @@ function renderGuestDeck() {
         var factionData = factions[factionCode] || {};
         var factionColor = factionData.color || '#ffffff';
         var factionImg  = factionCode ? pluginAssetsUrl + '/faction/' + factionCode + '.png' : '';
-        var heroImgUrl  = heroRef ? cdnUrl + '/cards/hero/' + heroRef + '_1.webp' : '';
+        var heroImgUrl  = heroRef ? cdnUrl + '/cards/hero/' + normalizeRef(heroRef) + '_1.webp' : '';
 
         var heroStyle = heroImgUrl
             ? 'background-image:linear-gradient(to right,' + factionColor + 'cc 30%,' + factionColor + '00 100%),url(' + escHtml(heroImgUrl) + ');background-size:cover;background-position:left top;'