diff --git a/sq2bs.js b/sq2bs.js
index 989d761..57a1e81 100644
--- a/sq2bs.js
+++ b/sq2bs.js
@@ -53,41 +53,35 @@ function doSearchSchedule(){
 }
 
 // equipment field dynamic styling
-function update_fields(type, alt="") {
-    let item = itemMap.get(document.querySelector("#"+type+"-choice").value);
-    if (item && ((item.type == type.replace(/[0-9]/g, '')) || (item.category == type))) {
-        // powder styling
-        document.querySelector("#"+type+"-powder").setAttribute("placeholder", item["slots"]+" slots"+alt);
 
-        if (item['slots'] == 0) {
-            document.querySelector("#"+type+"-powder").disabled = true;
-        } else {
-            document.querySelector("#"+type+"-powder").disabled = false;
-        }
-
-        // input box styling
-        document.querySelector("#"+type+"-choice").classList.remove("text-light", "is-invalid", 'Normal', 'Unique', 'Rare', 'Legendary', 'Fabled', 'Mythic', 'Set');
-        document.querySelector("#"+type+"-choice").classList.add(item.tier);
-
-        if (type == 'weapon') {
-            document.querySelector("#"+type+"-img").setAttribute('src', 'media/items/new/generic-'+item.type+'.png');
-        }
-    } else if (document.querySelector("#"+type+"-choice").value == '') {
-        document.querySelector("#"+type+"-choice").classList.remove("is-invalid", 'Normal', 'Unique', 'Rare', 'Legendary', 'Fabled', 'Mythic', 'Set');
-        document.querySelector("#"+type+"-powder").setAttribute("placeholder", '0 slots');
-    }
-    else {
-        document.querySelector("#"+type+"-choice").classList.remove('Normal', 'Unique', 'Rare', 'Legendary', 'Fabled', 'Mythic', 'Set');
-        document.querySelector("#"+type+"-choice").classList.add("text-light", "is-invalid");
-    }
-}
-
-function init_field_styles() {
+function update_fields() {
     for (const i in equipment_keys) {
-        update_fields(equipment_keys[i]);
+
+        // resets
+        document.querySelector("#"+equipment_keys[i]+"-choice").classList.remove("text-light", "is-invalid", 'Normal', 'Unique', 'Rare', 'Legendary', 'Fabled', 'Mythic', 'Set');
+
+        let item = player_build[equipment_keys[i]];
+
+        // set input text color
+        document.querySelector("#"+equipment_keys[i]+"-choice").classList.add(item.get('tier'));
+        
+        // set powder slots
+        document.querySelector("#"+equipment_keys[i]+"-powder").setAttribute("placeholder", item.get('slots')+" slots");
+
+        if (item.get('slots') == 0) {
+            document.querySelector("#"+equipment_keys[i]+"-powder").disabled = true;
+        } else {
+            document.querySelector("#"+equipment_keys[i]+"-powder").disabled = false;
+        }
+
+        // set weapon image
+        if (item.get('category') == 'weapon') {
+            document.querySelector("#weapon-img").setAttribute('src', 'media/items/new/generic-'+item.get('type')+'.png');
+        }
     }
 }
 
+
 function get_item_color(item) {
     item = itemMap.get(item);
     if (item) {return item.tier} else {return ''}
@@ -108,6 +102,7 @@ function init_autocomplete() {
     let dropdowns = new Map()
     for (const i in equipment_keys) {
         // build dropdown
+        console.log('init dropdown for '+ equipment_keys[i])
         let item_arr = [];
         if (equipment_keys[i] == 'weapon') {
             for (const weaponType of weapon_keys) {
@@ -116,6 +111,9 @@ function init_autocomplete() {
                     if (item_obj["restrict"] && item_obj["restrict"] === "DEPRECATED") {
                         continue;
                     }
+                    if (item_obj["name"] == 'No '+ equipment_keys[i].charAt(0).toUpperCase() + equipment_keys[i].slice(1)) {
+                        continue;
+                    }
                     item_arr.push(weapon);
                 }
             }
@@ -125,6 +123,9 @@ function init_autocomplete() {
                 if (item_obj["restrict"] && item_obj["restrict"] === "DEPRECATED") {
                     continue;
                 }
+                if (item_obj["name"] == 'No '+ equipment_keys[i].charAt(0).toUpperCase() + equipment_keys[i].slice(1)) {
+                    continue;
+                }
                 item_arr.push(item)
             }
         }
@@ -138,6 +139,7 @@ function init_autocomplete() {
             wrapper: false,
             resultsList: {
                 tabSelect: true,
+                noResults: true,
                 class: "search-box dark-7 rounded-bottom px-2 fw-bold dark-shadow-sm",
                 element: (list, data) => {
                     // dynamic result loc
@@ -145,6 +147,13 @@ function init_autocomplete() {
                     list.style.top = position.bottom + window.scrollY +"px";
                     list.style.left = position.x+"px";
                     list.style.width = position.width+"px";
+
+                    if (!data.results.length) {
+                        message = document.createElement('li');
+                        message.textContent = "Add: "+ data.query;
+                        message.value = data.query;
+                        list.prepend(message);
+                    }
                 },
             },
             resultItem: {
@@ -157,7 +166,9 @@ function init_autocomplete() {
             events: {
                 input: {
                     selection: (event) => {
-                        event.target.value = event.detail.selection.value;
+                        if (event.detail.selection.value) {
+                            event.target.value = event.detail.selection.value;
+                        }
                         update_fields(equipment_keys[i]);
                         calcBuildSchedule();
                     },
diff --git a/sq2builder.js b/sq2builder.js
index 2dd6a02..add6525 100644
--- a/sq2builder.js
+++ b/sq2builder.js
@@ -71,7 +71,6 @@ let powderInputs = [
 
 function init() {
     console.log("builder.js init");
-    init_field_styles();
     init_autocomplete();
     decodeBuild(url_tag);
 }
@@ -741,11 +740,11 @@ function calculateBuildStats() {
     for (let i in player_build.items) {
         // displaysq2ExpandedItem(player_build.items[i], buildFields[i], true);
     }
-    console.log(player_build)
-    console.log("build")
+
+    update_fields()
+
     displaysq2ArmorStats(player_build);
     displaysq2BuildStats("all-stats", player_build, build_all_display_commands);
-    // displaysq2BuildStats("minimal-stats", player_build, build_basic_display_commands);
     displaysq2BuildStats("minimal-offensive-stats",player_build, build_offensive_display_commands);
     displaySetBonuses("set-info",player_build);
     displayNextCosts("int-info",player_build);