diff --git a/module/applications/characterCreation/characterCreation.mjs b/module/applications/characterCreation/characterCreation.mjs
index 19d8e4c5..ccb6f7c0 100644
--- a/module/applications/characterCreation/characterCreation.mjs
+++ b/module/applications/characterCreation/characterCreation.mjs
@@ -440,8 +440,9 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
 
         if (type === 'subclasses')
             presets.filter = {
-                'system.linkedClass': { key: 'system.linkedClass', value: this.setup.class?.uuid }
+                'system.linkedClass.uuid': { key: 'system.linkedClass.uuid', value: this.setup.class?.uuid }
             };
+        
         if (equipment.includes(type))
             presets.filter = {
                 'system.tier': { key: 'system.tier', value: 1 },
diff --git a/module/applications/ui/itemBrowser.mjs b/module/applications/ui/itemBrowser.mjs
index f0ad98db..9b9bef91 100644
--- a/module/applications/ui/itemBrowser.mjs
+++ b/module/applications/ui/itemBrowser.mjs
@@ -235,7 +235,7 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
         filters.forEach(f => {
             if (typeof f.field === 'string') f.field = foundry.utils.getProperty(game, f.field);
             else if (typeof f.choices === 'function') {
-                f.choices = f.choices();
+                f.choices = f.choices(this.items);
             }
             f.name ??= f.key;
             f.value = this.presets?.filter?.[f.name]?.value ?? null;
@@ -248,11 +248,8 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
     /* -------------------------------------------- */
 
     /**
-     * Create and initialize search filter instances for the inventory and loadout sections.
+     * Create and initialize search filter instance.
      *
-     * Sets up two {@link foundry.applications.ux.SearchFilter} instances:
-     * - One for the inventory, which filters items in the inventory grid.
-     * - One for the loadout, which filters items in the loadout/card grid.
      * @private
      */
     _createSearchFilter() {
@@ -339,7 +336,7 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
                 item = this.items.find(i => i.uuid === itemUUID);
 
             if (!item) continue;
-
+            
             const matchesMenu =
                 this.fieldFilter.length === 0 ||
                 this.fieldFilter.every(
diff --git a/module/config/itemBrowserConfig.mjs b/module/config/itemBrowserConfig.mjs
index 7b9a0456..e40c989b 100644
--- a/module/config/itemBrowserConfig.mjs
+++ b/module/config/itemBrowserConfig.mjs
@@ -265,12 +265,9 @@ export const typeConfig = {
     subclasses: {
         columns: [
             {
-                key: 'id',
+                key: 'system.linkedClass',
                 label: 'Class',
-                format: id => {
-                    console.log(id);
-                    return '';
-                }
+                format: linkedClass => linkedClass.name
             },
             {
                 key: 'system.spellcastingTrait',
@@ -279,9 +276,15 @@ export const typeConfig = {
         ],
         filters: [
             {
-                key: 'system.linkedClass',
+                key: 'system.linkedClass.uuid',
                 label: 'Class',
-                field: 'system.api.models.items.DHSubclass.schema.fields.linkedClass'
+                choices: (items) => {
+                    const list = items.map(item => ({ value: item.system.linkedClass.uuid, label: item.system.linkedClass.name }));
+                    return list.reduce((a,c) => {
+                        if(!(a.find(i => i.value === c.value))) a.push(c);
+                        return a;
+                    }, []);
+                }
             }
         ]
     },
diff --git a/styles/less/ui/item-browser/item-browser.less b/styles/less/ui/item-browser/item-browser.less
index df35d60b..407a3116 100644
--- a/styles/less/ui/item-browser/item-browser.less
+++ b/styles/less/ui/item-browser/item-browser.less
@@ -356,6 +356,8 @@
             display: grid;
             grid-template-rows: 0fr;
             transition: all 0.3s ease-in-out;
+            width: 100%;
+            
             .wrapper {
                 overflow: hidden;
                 display: grid;