diff --git a/module/config/itemConfig.mjs b/module/config/itemConfig.mjs
index 7d80e597..4f1727e8 100644
--- a/module/config/itemConfig.mjs
+++ b/module/config/itemConfig.mjs
@@ -1404,9 +1404,7 @@ export const allWeaponFeatures = () => {
 };
 
 export const orderedWeaponFeatures = () => {
-    const homebrewFeatures = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).itemFeatures
-        .weaponFeatures;
-    const allFeatures = { ...weaponFeatures, ...homebrewFeatures };
+    const allFeatures = allWeaponFeatures();
     const all = Object.keys(allFeatures).map(key => {
         const feature = allFeatures[key];
         return {
diff --git a/module/data/item/armor.mjs b/module/data/item/armor.mjs
index 2d31c290..0958a9f3 100644
--- a/module/data/item/armor.mjs
+++ b/module/data/item/armor.mjs
@@ -23,9 +23,7 @@ export default class DHArmor extends AttachableItem {
             armorFeatures: new fields.ArrayField(
                 new fields.SchemaField({
                     value: new fields.StringField({
-                        required: true,
-                        choices: CONFIG.DH.ITEM.allArmorFeatures,
-                        blank: true
+                        required: true
                     }),
                     effectIds: new fields.ArrayField(new fields.StringField({ required: true })),
                     actionIds: new fields.ArrayField(new fields.StringField({ required: true }))
@@ -58,7 +56,7 @@ export default class DHArmor extends AttachableItem {
     async getDescriptionData() {
         const baseDescription = this.description;
         const allFeatures = CONFIG.DH.ITEM.allArmorFeatures();
-        const features = this.armorFeatures.map(x => allFeatures[x.value]);
+        const features = this.armorFeatures.map(x => allFeatures[x.value]).filter(x => x);
 
         const prefix = await foundry.applications.handlebars.renderTemplate(
             'systems/daggerheart/templates/sheets/items/armor/description.hbs',
diff --git a/module/data/item/weapon.mjs b/module/data/item/weapon.mjs
index 5c6f8514..051fd42d 100644
--- a/module/data/item/weapon.mjs
+++ b/module/data/item/weapon.mjs
@@ -38,9 +38,7 @@ export default class DHWeapon extends AttachableItem {
             weaponFeatures: new fields.ArrayField(
                 new fields.SchemaField({
                     value: new fields.StringField({
-                        required: true,
-                        choices: CONFIG.DH.ITEM.allWeaponFeatures,
-                        blank: true
+                        required: true
                     }),
                     effectIds: new fields.ArrayField(new fields.StringField({ required: true })),
                     actionIds: new fields.ArrayField(new fields.StringField({ required: true }))
@@ -121,7 +119,7 @@ export default class DHWeapon extends AttachableItem {
         const burden = game.i18n.localize(CONFIG.DH.GENERAL.burden[this.burden].label);
 
         const allFeatures = CONFIG.DH.ITEM.allWeaponFeatures();
-        const features = this.weaponFeatures.map(x => allFeatures[x.value]);
+        const features = this.weaponFeatures.map(x => allFeatures[x.value]).filter(x => x);
 
         const prefix = await foundry.applications.handlebars.renderTemplate(
             'systems/daggerheart/templates/sheets/items/weapon/description.hbs',
diff --git a/module/helpers/utils.mjs b/module/helpers/utils.mjs
index 4ecc7809..57badd89 100644
--- a/module/helpers/utils.mjs
+++ b/module/helpers/utils.mjs
@@ -119,8 +119,8 @@ export const tagifyElement = (element, baseOptions, onChange, tagifyOptions = {}
         }),
         maxTags: typeof maxTags === 'function' ? maxTags() : maxTags,
         dropdown: {
+            searchKeys: ['value', 'name'],
             mapValueTo: 'name',
-            searchKeys: ['value'],
             enabled: 0,
             maxItems: 100,
             closeOnSelect: true,
diff --git a/system.json b/system.json
index fb23ad7b..40de5fa1 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "1.7.2",
+    "version": "1.7.3",
     "compatibility": {
         "minimum": "13.346",
         "verified": "13.351",