diff --git a/module/applications/sheets-configs/activeEffectConfig.mjs b/module/applications/sheets-configs/activeEffectConfig.mjs
index 8574a5db..087b5b08 100644
--- a/module/applications/sheets-configs/activeEffectConfig.mjs
+++ b/module/applications/sheets-configs/activeEffectConfig.mjs
@@ -88,6 +88,9 @@ export default class DhActiveEffectConfig extends foundry.applications.sheets.Ac
                     element.value = `system.${item.value}`;
                 },
                 click: e => e.fetch(),
+                customize: function (_input, _inputRect, container) {
+                    container.style.zIndex = foundry.applications.api.ApplicationV2._maxZ;
+                },
                 minLength: 0
             });
         });
diff --git a/module/documents/token.mjs b/module/documents/token.mjs
index 3e7b49ea..89305128 100644
--- a/module/documents/token.mjs
+++ b/module/documents/token.mjs
@@ -16,7 +16,7 @@ export default class DHToken extends TokenDocument {
         });
         bars.sort((a, b) => a.label.compare(b.label));
 
-        const invalidAttributes = ['gold', 'levelData', 'rules.damageReduction.maxArmorMarked.value'];
+        const invalidAttributes = ['gold', 'levelData', 'actions', 'rules.damageReduction.maxArmorMarked.value'];
         const values = attributes.value.reduce((acc, v) => {
             const a = v.join('.');
             if (invalidAttributes.some(x => a.startsWith(x))) return acc;
@@ -32,19 +32,19 @@ export default class DHToken extends TokenDocument {
 
         return bars.concat(values);
     }
-    
-    static _getTrackedAttributesFromSchema(schema, _path=[]) {
-        const attributes = {bar: [], value: []};
-        for ( const [name, field] of Object.entries(schema.fields) ) {
+
+    static _getTrackedAttributesFromSchema(schema, _path = []) {
+        const attributes = { bar: [], value: [] };
+        for (const [name, field] of Object.entries(schema.fields)) {
             const p = _path.concat([name]);
-            if ( field instanceof foundry.data.fields.NumberField ) attributes.value.push(p);
-            if ( field instanceof foundry.data.fields.ArrayField ) attributes.value.push(p);
+            if (field instanceof foundry.data.fields.NumberField) attributes.value.push(p);
+            if (field instanceof foundry.data.fields.ArrayField) attributes.value.push(p);
             const isSchema = field instanceof foundry.data.fields.SchemaField;
             const isModel = field instanceof foundry.data.fields.EmbeddedDataField;
-            if ( isSchema || isModel ) {
+            if (isSchema || isModel) {
                 const schema = isModel ? field.model.schema : field;
-                const isBar = schema.has && schema.has("value") && schema.has("max");
-                if ( isBar ) attributes.bar.push(p);
+                const isBar = schema.has && schema.has('value') && schema.has('max');
+                if (isBar) attributes.bar.push(p);
                 else {
                     const inner = this.getTrackedAttributes(schema, p);
                     attributes.bar.push(...inner.bar);
diff --git a/styles/less/ux/autocomplete/autocomplete.less b/styles/less/ux/autocomplete/autocomplete.less
index 06cabf5a..868b4f43 100644
--- a/styles/less/ux/autocomplete/autocomplete.less
+++ b/styles/less/ux/autocomplete/autocomplete.less
@@ -10,7 +10,6 @@
     border-color: light-dark(@dark, @beige);
     border-radius: 6px;
     background-image: url('../assets/parchments/dh-parchment-dark.png');
-    z-index: 200;
     max-height: 400px !important;
     width: fit-content !important;
     overflow-y: auto;