diff --git a/Data/BagScanner.lua b/Data/BagScanner.lua
index 8d16f7c..a92b566 100644
--- a/Data/BagScanner.lua
+++ b/Data/BagScanner.lua
@@ -75,6 +75,7 @@ function BagScanner:ScanSlot(bagID, slot)
         quality = quality or itemQuality or 0,
         name = name,
         iLevel = iLevel,
+        type = itemType,
         class = itemCategory,      -- Category (e.g., "Consumable", "Armor")
         subclass = itemSubType,    -- SubType (e.g., "Potion", "Cloth")
         equipSlot = itemEquipLoc,  -- Equipment slot (e.g., "INVTYPE_HEAD") - correct now!
diff --git a/Guda.toc b/Guda.toc
index f942d4e..2902f4c 100644
--- a/Guda.toc
+++ b/Guda.toc
@@ -2,7 +2,7 @@
 ## Title: Guda
 ## Notes: All-in-one bag and bank addon for Turtle WoW
 ## Author: Vati
-## Version: 1.4.6
+## Version: 1.4.7
 ## SavedVariables: Guda_DB
 ## SavedVariablesPerCharacter: Guda_CharDB
 
diff --git a/Sorting/SortEngine.lua b/Sorting/SortEngine.lua
index f43b1a4..f3dadc8 100644
--- a/Sorting/SortEngine.lua
+++ b/Sorting/SortEngine.lua
@@ -753,6 +753,7 @@ local function CollectItems(bagIDs)
 							quality = quality or 0,
 							name = name,
 							iLevel = iLevel,
+							type = itemType,
 							class = category,
 							subclass = subType,  -- NOW INCLUDED!
 							locked = locked,
diff --git a/UI/BagFrame.lua b/UI/BagFrame.lua
index cc4f034..3e30964 100644
--- a/UI/BagFrame.lua
+++ b/UI/BagFrame.lua
@@ -433,7 +433,7 @@ function BagFrame:DisplayItemsByCategory(bagData, isOtherChar, charName)
                     if itemData then
                         local cat = "Miscellaneous"
                         local itemName = itemData.name or ""
-
+						local itemType = itemData.type or ""
                         -- Detect consumable restore/eat/drink tag for current character only
                         if not isOtherChar and addon.Modules.Utils and addon.Modules.Utils.GetConsumableRestoreTag then
                             local tag = addon.Modules.Utils:GetConsumableRestoreTag(bagID, slotID)
@@ -448,7 +448,7 @@ function BagFrame:DisplayItemsByCategory(bagData, isOtherChar, charName)
                         elseif addon.Modules.SortEngine and addon.Modules.SortEngine.IsMount and addon.Modules.SortEngine.IsMount(itemData.texture) then
                              table.insert(specialItems.Mount, {bagID = bagID, slotID = slotID, itemData = itemData})
                         elseif string.find(itemName, "Runed .* Rod") or
-                           string.find(itemName, "Fishing Pole") or
+                           itemType == "Fishing Pole" or
                            string.find(itemName, "Mining Pick") or
                            string.find(itemName, "Blacksmith Hammer") or
                            itemName == "Arclight Spanner" or
@@ -1105,7 +1105,7 @@ function BagFrame:PassesSearchFilter(itemData)
 	-- Advanced search (pfUI style categories)
 	if string.sub(search, 1, 1) == "~" then
 		local category = string.sub(search, 2)
-		local itemType = itemData.type or ""
+		local itemType = itemData.class or ""
 		local itemQuality = itemData.quality or -1
 
 		if category == "equipment" or category == "armor" or category == "weapon" then
diff --git a/UI/BankFrame.lua b/UI/BankFrame.lua
index 6575ad9..446fa21 100644
--- a/UI/BankFrame.lua
+++ b/UI/BankFrame.lua
@@ -281,6 +281,7 @@ function BankFrame:DisplayItemsByCategory(bankData, isOtherChar, charName)
     -- Helper to assign category
     local function CategorizeItem(itemData, bagID, slotID)
         local itemName = itemData.name or ""
+        local itemType = itemData.type or ""
         local cat = "Miscellaneous"
 
         -- Priority 1: Special items (Hearthstone, Mounts, Tools)
@@ -291,7 +292,7 @@ function BankFrame:DisplayItemsByCategory(bankData, isOtherChar, charName)
             table.insert(specialItems.Mount, {bagID = bagID, slotID = slotID, itemData = itemData})
             return
         elseif string.find(itemName, "Runed .* Rod") or
-           string.find(itemName, "Fishing Pole") or
+           itemType == "Fishing Pole" or
            string.find(itemName, "Mining Pick") or
            string.find(itemName, "Blacksmith Hammer") or
            itemName == "Arclight Spanner" or
@@ -1045,7 +1046,7 @@ function BankFrame:PassesSearchFilter(itemData)
     -- Advanced search (pfUI style categories)
     if string.sub(search, 1, 1) == "~" then
         local category = string.sub(search, 2)
-        local itemType = itemData.type or ""
+        local itemType = itemData.class or ""
         local itemQuality = itemData.quality or -1
 
         if category == "equipment" or category == "armor" or category == "weapon" then