diff --git a/assets/database/db.bin b/assets/database/db.bin
index 9ce978d32..c0983abf2 100644
Binary files a/assets/database/db.bin and b/assets/database/db.bin differ
diff --git a/assets/database/db.json b/assets/database/db.json
index c39b3c176..44f67ea35 100644
--- a/assets/database/db.json
+++ b/assets/database/db.json
@@ -5375,7 +5375,7 @@
 {"id":17067,"name":"Ancient Cornerstone Grimoire","icon":"inv_misc_book_07","type":13,"weaponType":5,"handType":3,"stats":[0,0,10,15,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":76,"phase":1,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":10184,"zoneId":2159}}]},
 {"id":17068,"name":"Deathbringer","icon":"inv_axe_09","type":13,"weaponType":1,"handType":2,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":114,"weaponDamageMax":213,"weaponSpeed":2.9,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":75,"phase":1,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":10184,"zoneId":2159}},{"drop":{"difficulty":1,"npcId":10184,"zoneId":2159}}]},
 {"id":17069,"name":"Striker's Mark","icon":"inv_weapon_bow_08","type":14,"rangedWeaponType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,1,0,0,0,0,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":69,"weaponDamageMax":129,"weaponSpeed":2.5,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":69,"phase":1,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":11982,"zoneId":2717}}]},
-{"id":17070,"name":"Fang of the Mystics","icon":"inv_weapon_shortblade_06","type":13,"weaponType":2,"handType":2,"stats":[0,0,0,10,0,40,0,0,0,0,0,0,4,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":39,"weaponDamageMax":86,"weaponSpeed":1.5,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":70,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":6109}}]},
+{"id":17070,"name":"Fang of the Mystics","icon":"inv_weapon_shortblade_06","type":13,"weaponType":2,"handType":2,"stats":[0,0,0,10,0,40,0,0,0,0,0,0,4,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":39,"weaponDamageMax":86,"weaponSpeed":1.5,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":70,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":6109,"zoneId":16}}]},
 {"id":17071,"name":"Gutgore Ripper","icon":"inv_weapon_shortblade_18","type":13,"weaponType":2,"handType":2,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":63,"weaponDamageMax":119,"weaponSpeed":1.8,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":69,"phase":1,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":12057,"zoneId":2717}}]},
 {"id":17072,"name":"Blastershot Launcher","icon":"inv_weapon_rifle_09","type":14,"rangedWeaponType":3,"stats":[0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":73,"weaponDamageMax":136,"weaponSpeed":2.6,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":70,"phase":1,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":11988,"zoneId":2717}}]},
 {"id":17073,"name":"Earthshaker","icon":"inv_hammer_04","type":13,"weaponType":4,"handType":4,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0,0,0,0,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":175,"weaponDamageMax":263,"weaponSpeed":3.5,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":66,"phase":1,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":11982,"zoneId":2717}}]},
@@ -5538,11 +5538,11 @@
 {"id":18103,"name":"Band of Rumination","icon":"inv_jewelry_ring_16","type":11,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,5,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":63,"phase":1,"quality":3,"unique":true,"expansion":1,"sources":[{"drop":{"npcId":10429,"zoneId":1583}},{"drop":{"difficulty":1,"npcId":10429,"zoneId":1583}}]},
 {"id":18104,"name":"Feralsurge Girdle","icon":"inv_belt_03","type":8,"armorType":3,"stats":[0,0,9,10,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,208,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":63,"phase":1,"quality":3,"unique":true,"expansion":1,"sources":[{"drop":{"npcId":10429,"zoneId":1583}},{"drop":{"difficulty":1,"npcId":10429,"zoneId":1583}}]},
 {"id":18168,"name":"Force Reactive Disk","icon":"spell_arcane_portaldarnassus","type":13,"weaponType":7,"handType":3,"stats":[0,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2468,0,0,0,44,0,0,0,0,0,0,0,0,0,80,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":65,"phase":1,"quality":4,"requiredProfession":4,"expansion":1,"sources":[{"crafted":{"profession":4}},{"crafted":{"profession":4,"spellId":22797}}]},
-{"id":18202,"name":"Eskhandar's Left Claw","icon":"inv_misc_monsterclaw_04","type":13,"weaponType":3,"handType":3,"stats":[0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":50,"weaponDamageMax":94,"weaponSpeed":1.5,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":66,"phase":2,"quality":4,"unique":true,"setName":"Spirit of Eskhandar","setId":261,"expansion":1,"sources":[{"drop":{"npcId":6109}}]},
+{"id":18202,"name":"Eskhandar's Left Claw","icon":"inv_misc_monsterclaw_04","type":13,"weaponType":3,"handType":3,"stats":[0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":50,"weaponDamageMax":94,"weaponSpeed":1.5,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":66,"phase":2,"quality":4,"unique":true,"setName":"Spirit of Eskhandar","setId":261,"expansion":1,"sources":[{"drop":{"npcId":6109,"zoneId":16}}]},
 {"id":18203,"name":"Eskhandar's Right Claw","icon":"inv_misc_monsterclaw_04","type":13,"weaponType":3,"handType":1,"stats":[0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":50,"weaponDamageMax":94,"weaponSpeed":1.5,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":66,"phase":1,"quality":4,"unique":true,"setName":"Spirit of Eskhandar","setId":261,"expansion":1,"sources":[{"drop":{"npcId":11982,"zoneId":2717}}]},
 {"id":18204,"name":"Eskhandar's Pelt","icon":"inv_misc_cape_07","type":4,"stats":[0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,51,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":66,"phase":2,"quality":4,"unique":true,"setName":"Spirit of Eskhandar","setId":261,"expansion":1,"sources":[{"drop":{"npcId":12397,"zoneId":4}}]},
 {"id":18205,"name":"Eskhandar's Collar","icon":"inv_belt_12","type":2,"stats":[0,0,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":71,"phase":1,"quality":4,"unique":true,"setName":"Spirit of Eskhandar","setId":261,"expansion":1,"sources":[{"drop":{"npcId":10184,"zoneId":2159}}]},
-{"id":18208,"name":"Drape of Benediction","icon":"inv_misc_cape_04","type":4,"stats":[0,0,11,13,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":67,"phase":2,"quality":4,"unique":true,"expansion":1,"sources":[{"drop":{"npcId":6109}}]},
+{"id":18208,"name":"Drape of Benediction","icon":"inv_misc_cape_04","type":4,"stats":[0,0,11,13,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":67,"phase":2,"quality":4,"unique":true,"expansion":1,"sources":[{"drop":{"npcId":6109,"zoneId":16}}]},
 {"id":18238,"name":"Shadowskin Gloves","icon":"inv_gauntlets_32","type":7,"armorType":2,"stats":[0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,76,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":40,"phase":1,"quality":3,"expansion":1,"sources":[{"crafted":{"profession":8,"spellId":22711}}]},
 {"id":18263,"name":"Flarecore Wraps","icon":"inv_bracer_09","type":6,"armorType":1,"stats":[0,0,0,8,0,0,0,0,0,0,0,0,9,0,0,0,0,0,0,0,0,0,0,0,0,0,43,0,0,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":64,"phase":1,"quality":4,"expansion":1,"sources":[{"crafted":{"profession":11,"spellId":22759}}]},
 {"id":18282,"name":"Core Marksman Rifle","icon":"inv_weapon_rifle_05","type":14,"rangedWeaponType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":64,"weaponDamageMax":120,"weaponSpeed":2.5,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":65,"phase":1,"quality":4,"expansion":1,"sources":[{"crafted":{"profession":4,"spellId":22795}}]},
@@ -5734,13 +5734,13 @@
 {"id":18536,"name":"Milli's Lexicon","icon":"inv_misc_book_06","type":13,"weaponType":5,"handType":3,"stats":[0,0,6,7,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":59,"phase":1,"quality":3,"sources":[{"quest":{"id":5526,"name":"Shards of the Felvine"}}]},
 {"id":18537,"name":"Counterattack Lodestone","icon":"inv_stone_02","type":12,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,22,0,0,0,0,0,0,0,0,0,22,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":63,"phase":2,"quality":3,"expansion":1,"sources":[{"drop":{"zoneId":2557}},{"drop":{"difficulty":1,"npcId":14324,"zoneId":2557}}]},
 {"id":18538,"name":"Treant's Bane","icon":"inv_axe_10","type":13,"weaponType":1,"handType":4,"stats":[25,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":128,"weaponDamageMax":193,"weaponSpeed":2.7,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":63,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":179564,"zoneId":2557}},{"drop":{"difficulty":1,"npcId":14324,"zoneId":2557}},{"drop":{"difficulty":1,"npcId":14324,"zoneId":2557}}]},
-{"id":18541,"name":"Puissant Cape","icon":"inv_misc_cape_06","type":4,"stats":[0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,40,1,0,0,0,0,0,0,0,54,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":70,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":6109}}]},
-{"id":18542,"name":"Typhoon","icon":"inv_sword_41","type":13,"weaponType":9,"handType":4,"stats":[14,20,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":150,"weaponDamageMax":225,"weaponSpeed":2.9,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":68,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":6109}}]},
+{"id":18541,"name":"Puissant Cape","icon":"inv_misc_cape_06","type":4,"stats":[0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,40,1,0,0,0,0,0,0,0,54,40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":70,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":6109,"zoneId":16}}]},
+{"id":18542,"name":"Typhoon","icon":"inv_sword_41","type":13,"weaponType":9,"handType":4,"stats":[14,20,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":150,"weaponDamageMax":225,"weaponSpeed":2.9,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":68,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":6109,"zoneId":16}}]},
 {"id":18543,"name":"Ring of Entropy","icon":"inv_jewelry_ring_20","type":11,"stats":[0,0,11,13,8,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":66,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":12397,"zoneId":4}}]},
 {"id":18544,"name":"Doomhide Gauntlets","icon":"inv_gauntlets_22","type":7,"armorType":2,"stats":[0,14,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,0,0,0,0,0,0,0,0,133,42,0,0,0,0,0,0,0,0,8,0,0,8,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":71,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":12397,"zoneId":4}}]},
-{"id":18545,"name":"Leggings of Arcane Supremacy","icon":"inv_pants_08","type":9,"armorType":1,"stats":[0,0,14,24,14,0,36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,0,0,0,0,0,0,0,0,10,0,10,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":69,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":6109}}]},
+{"id":18545,"name":"Leggings of Arcane Supremacy","icon":"inv_pants_08","type":9,"armorType":1,"stats":[0,0,14,24,14,0,36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,0,0,0,0,0,0,0,0,10,0,10,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":69,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":6109,"zoneId":16}}]},
 {"id":18546,"name":"Infernal Headcage","icon":"inv_helmet_18","type":1,"armorType":3,"stats":[0,0,24,25,14,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,358,0,0,0,0,0,0,0,0,0,10,0,0,10,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":69,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":12397,"zoneId":4}}]},
-{"id":18547,"name":"Unmelting Ice Girdle","icon":"inv_belt_31","type":8,"armorType":4,"stats":[14,14,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,452,0,8,0,0,0,0,0,0,0,0,16,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":71,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":6109}}]},
+{"id":18547,"name":"Unmelting Ice Girdle","icon":"inv_belt_31","type":8,"armorType":4,"stats":[14,14,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,452,0,8,0,0,0,0,0,0,0,0,16,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":71,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":6109,"zoneId":16}}]},
 {"id":18585,"name":"Band of Allegiance","icon":"inv_jewelry_ring_09","type":11,"stats":[9,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":35,"phase":1,"quality":3,"sources":[{"quest":{"id":7541,"name":"Service to the Horde"}}],"factionRestriction":2},
 {"id":18586,"name":"Lonetree's Circle","icon":"inv_jewelry_ring_13","type":11,"stats":[0,0,6,6,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":35,"phase":1,"quality":3,"sources":[{"quest":{"id":7541,"name":"Service to the Horde"}}],"factionRestriction":2},
 {"id":18602,"name":"Tome of Sacrifice","icon":"inv_misc_book_06","type":13,"weaponType":5,"handType":3,"stats":[0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":60,"phase":1,"quality":3,"unique":true,"classAllowlist":[8],"sources":[{"quest":{"id":7583,"name":"Suppression"}}]},
@@ -5947,9 +5947,9 @@
 {"id":19126,"name":"Slagplate Gauntlets","icon":"inv_gauntlets_22","type":7,"armorType":4,"stats":[12,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,295,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":49,"phase":1,"quality":2,"sources":[{"quest":{"id":7723,"name":"Curse These Fat Fingers"}}]},
 {"id":19127,"name":"Charred Leather Tunic","icon":"inv_chest_leather_03","type":5,"armorType":2,"stats":[0,18,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,132,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":50,"phase":1,"quality":2,"sources":[{"quest":{"id":7701,"name":"WANTED: Overseer Maltorius"}}]},
 {"id":19128,"name":"Seared Mail Vest","icon":"inv_chest_chain_13","type":5,"armorType":3,"stats":[0,11,11,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,273,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":50,"phase":1,"quality":2,"sources":[{"quest":{"id":7701,"name":"WANTED: Overseer Maltorius"}}]},
-{"id":19130,"name":"Cold Snap","icon":"inv_wand_01","type":14,"rangedWeaponType":8,"stats":[0,0,0,7,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":101,"weaponDamageMax":189,"weaponSpeed":1.7,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":70,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":6109}}]},
-{"id":19131,"name":"Snowblind Shoes","icon":"inv_boots_cloth_14","type":10,"armorType":1,"stats":[0,0,10,10,0,32,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":69,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":6109}}]},
-{"id":19132,"name":"Crystal Adorned Crown","icon":"inv_crown_01","type":1,"armorType":1,"stats":[0,0,0,14,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,85,0,0,0,0,0,0,0,0,0,0,0,0,0,0,92,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":68,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":6109}}]},
+{"id":19130,"name":"Cold Snap","icon":"inv_wand_01","type":14,"rangedWeaponType":8,"stats":[0,0,0,7,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":101,"weaponDamageMax":189,"weaponSpeed":1.7,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":70,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":6109,"zoneId":16}}]},
+{"id":19131,"name":"Snowblind Shoes","icon":"inv_boots_cloth_14","type":10,"armorType":1,"stats":[0,0,10,10,0,32,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":69,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":6109,"zoneId":16}}]},
+{"id":19132,"name":"Crystal Adorned Crown","icon":"inv_crown_01","type":1,"armorType":1,"stats":[0,0,0,14,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,85,0,0,0,0,0,0,0,0,0,0,0,0,0,0,92,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":68,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":6109,"zoneId":16}}]},
 {"id":19133,"name":"Fel Infused Leggings","icon":"inv_pants_06","type":9,"armorType":1,"stats":[0,0,21,0,0,0,0,0,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,95,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":71,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":12397,"zoneId":4}}]},
 {"id":19134,"name":"Flayed Doomguard Belt","icon":"inv_belt_16","type":8,"armorType":2,"stats":[0,0,18,18,0,14,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,115,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":68,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":12397,"zoneId":4}}]},
 {"id":19135,"name":"Blacklight Bracer","icon":"inv_bracer_07","type":6,"armorType":1,"stats":[0,0,11,13,8,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":66,"phase":2,"quality":4,"expansion":1,"sources":[{"drop":{"npcId":12397,"zoneId":4}}]},
@@ -8742,8 +8742,8 @@
 {"effectId":63,"spellId":13538,"name":"Enchant Chest - Lesser Absorption","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":66,"spellId":7457,"name":"Enchant Bracer - Minor Stamina","type":6,"stats":[0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":66,"spellId":7863,"name":"Enchant Boots - Minor Stamina","type":10,"stats":[0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
-{"effectId":241,"spellId":13503,"name":"Enchant Weapon - Lesser Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":241,"spellId":7745,"name":"Enchant 2H Weapon - Minor Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
+{"effectId":241,"spellId":13503,"name":"Enchant Weapon - Lesser Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":242,"spellId":7748,"name":"Enchant Chest - Lesser Health","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":243,"spellId":7766,"name":"Enchant Bracer - Minor Spirit","type":6,"stats":[0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":246,"spellId":7776,"name":"Enchant Chest - Lesser Mana","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
@@ -8818,8 +8818,8 @@
 {"effectId":929,"itemId":16217,"spellId":20069,"name":"Enchant Shield - Greater Stamina","type":13,"enchantType":2,"stats":[0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":930,"spellId":13947,"name":"Enchant Gloves - Riding Skill","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":931,"spellId":13948,"name":"Enchant Gloves - Minor Haste","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
-{"effectId":943,"spellId":13693,"name":"Enchant Weapon - Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
+{"effectId":943,"spellId":13693,"name":"Enchant Weapon - Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":963,"spellId":13937,"name":"Enchant 2H Weapon - Greater Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":1483,"itemId":11622,"spellId":15340,"name":"Lesser Arcanum of Rumination","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":1503,"itemId":11642,"spellId":15389,"name":"Lesser Arcanum of Constitution","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0],"quality":2},
diff --git a/assets/database/leftover_db.bin b/assets/database/leftover_db.bin
index f646b8e6f..1ca4ee157 100644
Binary files a/assets/database/leftover_db.bin and b/assets/database/leftover_db.bin differ
diff --git a/assets/database/leftover_db.json b/assets/database/leftover_db.json
index 6b2f85cf2..e6175bad8 100644
--- a/assets/database/leftover_db.json
+++ b/assets/database/leftover_db.json
@@ -1511,8 +1511,8 @@
 {"effectId":929,"itemId":16217,"spellId":20069,"name":"Enchant Shield - Greater Stamina","type":13,"enchantType":2,"stats":[0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":930,"spellId":13947,"name":"Enchant Gloves - Riding Skill","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":931,"spellId":13948,"name":"Enchant Gloves - Minor Haste","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
-{"effectId":943,"spellId":13693,"name":"Enchant Weapon - Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
+{"effectId":943,"spellId":13693,"name":"Enchant Weapon - Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":963,"spellId":13937,"name":"Enchant 2H Weapon - Greater Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":1483,"itemId":11622,"spellId":15340,"name":"Lesser Arcanum of Rumination","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":1503,"itemId":11642,"spellId":15389,"name":"Lesser Arcanum of Constitution","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0],"quality":2},
diff --git a/tools/database/gen_db/main.go b/tools/database/gen_db/main.go
index ca6418f60..2e5ee8026 100644
--- a/tools/database/gen_db/main.go
+++ b/tools/database/gen_db/main.go
@@ -570,7 +570,13 @@ func GetPhaseData(item *proto.UIItem) int32 {
 			}
 
 			// Kazzak and Azuregos
-			if slices.Contains([]int32{12397, 6109}, dropSource.NpcId) {
+			if slices.Contains([]int32{12397}, dropSource.NpcId) {
+				return 2
+			}
+
+			// Azzy items don't have a ZoneID. Let's add it for UI filtering, then return phase 1
+			if dropSource.NpcId == 6109 {
+				dropSource.ZoneId = 16
 				return 2
 			}