diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua
index 7c75443..2d92843 100644
--- a/AtlasLoot/Core/AtlasLoot.lua
+++ b/AtlasLoot/Core/AtlasLoot.lua
@@ -63,8 +63,8 @@ local BLUE = "|cff0070dd";
 local ORANGE = "|cffFF8400";
 
 --Search panel open and close save variables
---dataID, dataSource, boss, pFrame, tablenumber
-SearchPrevData = {"", "", "", "", ""};
+--dataID, dataSource, pFrame, tablenumber
+SearchPrevData = {"", "", "", ""};
 
 AtlasLootCharDB = {};
 AtlasLoot_TokenData = {};
@@ -447,7 +447,7 @@ function AtlasLoot:CreateToken(dataID)
 					end
 				end)
 				if #AtlasLoot_Data[dataID] == n and #t == c then
-					AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4], AtlasLootItemsFrame.refresh[5]);
+					AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4]);
 				end
 			end
 		end
@@ -455,15 +455,15 @@ function AtlasLoot:CreateToken(dataID)
 end
 
 --[[
-AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame):
+AtlasLoot_ShowItemsFrame(dataID, dataSource, pFrame, tablenum):
 dataID - Name of the loot table
 dataSource - Table in the database where the loot table is stored
-boss - Text string to use as a title for the loot page
 pFrame - Data structure describing how and where to anchor the item frame (more details, see the function AtlasLoot_SetItemInfoFrame)
+tablenum - Number of the table with the loot in it
 tablenum - Table number of the loot table being displayed
 It is the workhorse of the mod and allows the loot tables to be displayed any way anywhere in any mod.
 ]]
-function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame, tablenum)
+function AtlasLoot_ShowItemsFrame(dataID, dataSource, pFrame, tablenum)
 	--Set up local variables needed for GetItemInfo, etc
 	local itemName, itemLink, itemQuality, itemLevel, itemType, itemSubType, itemCount, itemEquipLoc, itemTexture, itemColor;
 	local iconFrame, nameFrame, extraFrame, itemButton;
@@ -471,7 +471,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame, tablenum)
 	local isValid, isItem, toShow, IDfound;
 	local spellName, spellIcon;
 
-	SearchPrevData = {dataID, dataSource, boss, pFrame, tablenum};
+	SearchPrevData = {dataID, dataSource, pFrame, tablenum};
 
     --If the loot table name has not been passed, throw up a debugging statement
 	if dataID == nil then
@@ -485,7 +485,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame, tablenum)
     --Ditch the Quicklook selector
     AtlasLoot_QuickLooks:Hide();
     AtlasLootQuickLooksButton:Hide();
-	
+
 	--Hide Map and reshow lootbackground
 	AtlasLootDefaultFrame_Map:Hide();
     AtlasLootDefaultFrame_LootBackground:Show();
@@ -522,6 +522,18 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame, tablenum)
 		AtlasLootDefaultFrame_MapSelectButton:SetText("No Map");
 	end
 
+	-- Checks to see if type is the same
+	if ATLASLOOT_CURRENTTYPE ~= dataSource[dataID].Type then
+		if dataSource[dataID].Type == "Crafting" then
+			ItemindexID = "Pattern";
+		elseif ItemindexID == "Pattern" and dataSource[dataID].Type ~= "Crafting" then
+			ItemindexID = 2;
+		else
+			ItemindexID = 2;
+		end
+	end
+	
+	-- Set current type
 	ATLASLOOT_CURRENTTYPE = dataSource[dataID].Type or "Default";
 	AtlasLoot:ScrollFrameUpdate();
 	AtlasLoot_BossName:SetText(dataSource[dataID][tablenum].Name);
@@ -623,10 +635,10 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame, tablenum)
 				end
 
 				--Store data about the state of the items frame to allow minor tweaks or a recall of the current loot page
-				AtlasLootItemsFrame.refresh = {dataID, dataSource_backup, boss, pFrame, tablenum};
+				AtlasLootItemsFrame.refresh = {dataID, dataSource_backup, pFrame, tablenum};
 				--and dataSource[dataID].Back ~= true
 				if dataID ~= "WishList" and dataID ~= "FilterList"  and dataSource[dataID].Back ~= true then
-					AtlasLootItemsFrame.refreshOri = {dataID, dataSource_backup, boss, pFrame, tablenum};
+					AtlasLootItemsFrame.refreshOri = {dataID, dataSource_backup, pFrame, tablenum};
 				end
 
 				--Insert the item description
@@ -735,11 +747,11 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame, tablenum)
 			end
 		end
 
-        AtlasLootItemsFrame.refresh = {dataID, dataSource, boss, pFrame, tablenum};
+        AtlasLootItemsFrame.refresh = {dataID, dataSource, pFrame, tablenum};
 
 		if dataID ~= "WishList" and dataID ~= "FilterList"  and dataSource[dataID].Back ~= true then
-			AtlasLootItemsFrame.refreshOri = {dataID, dataSource, boss, pFrame, tablenum};
-			AtlasLoot.db.profile.LastBoss = {dataID, dataSource, boss, pFrame, tablenum, ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE};
+			AtlasLootItemsFrame.refreshOri = {dataID, dataSource, pFrame, tablenum};
+			AtlasLoot.db.profile.LastBoss = {dataID, dataSource, pFrame, tablenum, ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE};
 		end
 
         --This is a valid QuickLook, so show the UI objects
@@ -770,7 +782,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame, tablenum)
 		local tablebase = {dataID, dataSource};
 		if dataID == "FilterList" then
 			tablebase = {AtlasLootItemsFrame.refreshOri[1],AtlasLootItemsFrame.refreshOri[2]};
-			tablenum = AtlasLootItemsFrame.refreshOri[5];
+			tablenum = AtlasLootItemsFrame.refreshOri[4];
 		end
 		if tablenum ~= #tablebase[2][tablebase[1]] then
 			getglobal("AtlasLootItemsFrame_NEXT"):Show();
@@ -826,7 +838,7 @@ Called when <-, -> are pressed and calls up the appropriate loot page
 ]]
 function AtlasLoot_NavButton_OnClick(self)
 	local tablenum, dataID, dataSource = self.tablenum, self.tablebase[1], self.tablebase[2];
-	AtlasLoot_ShowItemsFrame(dataID, dataSource, AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4], tablenum);
+	AtlasLoot_ShowItemsFrame(dataID, dataSource, AtlasLootItemsFrame.refresh[3], tablenum);
 end
 
 --[[
@@ -834,7 +846,7 @@ AtlasLoot_NavButton_OnClick:
 Called when 'Back'Button is pressed and calls up the appropriate loot page
 ]]
 function AtlasLoot_BackButton_OnClick()
-	AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], AtlasLootItemsFrame.refreshOri[4], AtlasLootItemsFrame.refreshOri[5]);
+	AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], AtlasLootItemsFrame.refreshOri[4]);
 end
 
 --[[
@@ -956,7 +968,7 @@ function AtlasLoot_ShowQuickLooks(button)
 				"tooltipTitle", AL["QuickLook"].." 1",
 				"tooltipText", AL["Assign this loot table\n to QuickLook"].." 1",
 				"func", function()
-                    AtlasLootCharDB["QuickLooks"][1]={AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], AtlasLootItemsFrame.refreshOri[4], AtlasLootItemsFrame.refreshOri[5], ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE};
+                    AtlasLootCharDB["QuickLooks"][1]={AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], AtlasLootItemsFrame.refreshOri[4], ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE};
                     AtlasLoot_RefreshQuickLookButtons();
                     dewdrop:Close(1);
 				end
@@ -966,7 +978,7 @@ function AtlasLoot_ShowQuickLooks(button)
 				"tooltipTitle", AL["QuickLook"].." 2",
 				"tooltipText", AL["Assign this loot table\n to QuickLook"].." 2",
 				"func", function()
-					AtlasLootCharDB["QuickLooks"][2]={AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], AtlasLootItemsFrame.refreshOri[4], AtlasLootItemsFrame.refreshOri[5], ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE};
+					AtlasLootCharDB["QuickLooks"][2]={AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], AtlasLootItemsFrame.refreshOri[4], ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE};
                     AtlasLoot_RefreshQuickLookButtons();
                     dewdrop:Close(1);
 				end
@@ -976,7 +988,7 @@ function AtlasLoot_ShowQuickLooks(button)
 				"tooltipTitle", AL["QuickLook"].." 3",
 				"tooltipText", AL["Assign this loot table\n to QuickLook"].." 3",
 				"func", function()
-					AtlasLootCharDB["QuickLooks"][3]={AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], AtlasLootItemsFrame.refreshOri[4], AtlasLootItemsFrame.refreshOri[5], ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE};
+					AtlasLootCharDB["QuickLooks"][3]={AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], AtlasLootItemsFrame.refreshOri[4], ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE};
                     AtlasLoot_RefreshQuickLookButtons();
                     dewdrop:Close(1);
 				end
@@ -986,7 +998,7 @@ function AtlasLoot_ShowQuickLooks(button)
 				"tooltipTitle", AL["QuickLook"].." 4",
 				"tooltipText", AL["Assign this loot table\n to QuickLook"].." 4",
 				"func", function()
-					AtlasLootCharDB["QuickLooks"][4]={AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], AtlasLootItemsFrame.refreshOri[4], AtlasLootItemsFrame.refreshOri[5], ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE};
+					AtlasLootCharDB["QuickLooks"][4]={AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], AtlasLootItemsFrame.refreshOri[4], ATLASLOOT_LASTMODULE, ATLASLOOT_CURRENTTABLE};
                     AtlasLoot_RefreshQuickLookButtons();
                     dewdrop:Close(1);
 				end
@@ -1039,7 +1051,7 @@ function AtlasLoot_QueryLootPage()
 					COUNTED = COUNTED + 1;
 					if not REFRESHED and (COUNTED == MAX_BUTTONS) then
 						REFRESHED = true;
-						AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4], AtlasLootItemsFrame.refresh[5]);
+						AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4]);
 					end
 				end)
 			else
@@ -1075,7 +1087,7 @@ local lastitem
 			if not (item:GetInfo()) then
 				item:ContinueOnLoad(function(itemId)
 					if i == lastitem then
-						AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4], AtlasLootItemsFrame.refresh[5]);
+						AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4]);
 					end
 				end)
 			end
diff --git a/AtlasLoot/Core/Atlasloot_Maps.lua b/AtlasLoot/Core/Atlasloot_Maps.lua
index aecc495..9478141 100644
--- a/AtlasLoot/Core/Atlasloot_Maps.lua
+++ b/AtlasLoot/Core/Atlasloot_Maps.lua
@@ -55,6 +55,7 @@ function AtlasLoot:MapOnShow()
                 AtlasLootDefaultFrame_Map:Show();
                 Atlasloot_HeaderLabel:Show();
                 AtlasLoot:ScrollFrameUpdate(true);
+                AtlasLootDefaultFrameScroll:Hide();
                 AtlasLoot:SubTableScrollFrameUpdate(ATLASLOOT_CURRENT_MAP, AtlasLoot_MapData);
         end
     end
diff --git a/AtlasLoot/Core/Filter.lua b/AtlasLoot/Core/Filter.lua
index b49fda2..8298177 100644
--- a/AtlasLoot/Core/Filter.lua
+++ b/AtlasLoot/Core/Filter.lua
@@ -106,9 +106,8 @@ end
 function AtlasLoot_HideNoUsableItems()
 	local dataID = AtlasLootItemsFrame.refreshOri[1]
 	local dataSource = AtlasLootItemsFrame.refreshOri[2]
-	local boss = AtlasLootItemsFrame.refreshOri[3]
-	local pFrame = AtlasLootItemsFrame.refreshOri[4]
-	local tablenum = AtlasLootItemsFrame.refreshOri[5]
+	local pFrame = AtlasLootItemsFrame.refreshOri[3]
+	local tablenum = AtlasLootItemsFrame.refreshOri[4]
 	local tablebase = AtlasLoot_Data[dataID][tablenum]
 	if not tablebase or dataID == "WishList" or dataID == "SearchResult" then return end
 	local itemCount = 0
@@ -209,13 +208,13 @@ function AtlasLoot_HideNoUsableItems()
 		end		
 	end
 	
-	AtlasLoot_ShowItemsFrame("FilterList", AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4], AtlasLootItemsFrame.refresh[5])
+	AtlasLoot_ShowItemsFrame("FilterList", AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4])
 end
 
 function AtlasLoot_FilterEnableButton()
 	if ATLASLOOT_FILTER_ENABLE == true then
 		ATLASLOOT_FILTER_ENABLE = false;
-		AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], AtlasLootItemsFrame.refreshOri[4], AtlasLootItemsFrame.refreshOri[5]);
+		AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refreshOri[1], AtlasLootItemsFrame.refreshOri[2], AtlasLootItemsFrame.refreshOri[3], AtlasLootItemsFrame.refreshOri[4]);
 	else
 		ATLASLOOT_FILTER_ENABLE = true
 		AtlasLoot_HideNoUsableItems();
diff --git a/AtlasLoot/Core/LootButtons.lua b/AtlasLoot/Core/LootButtons.lua
index b825bb2..7376ff5 100644
--- a/AtlasLoot/Core/LootButtons.lua
+++ b/AtlasLoot/Core/LootButtons.lua
@@ -248,7 +248,7 @@ function AtlasLootItem_OnClick(arg1)
         elseif((AtlasLootItemsFrame.refresh[1] == "SearchResult") and this.sourcePage) then
             local dataID, dataSource = strsplit("|", this.sourcePage);
             if(dataID and dataSource) then
-                AtlasLoot_ShowItemsFrame(dataID, AtlasLoot_Data, dataID, AtlasLootItemsFrame.refresh[4], 1);
+                AtlasLoot_ShowItemsFrame(dataID, AtlasLoot_Data, AtlasLootItemsFrame.refresh[3], 1);
             end
         elseif (arg1=="LeftButton") and this.sourcePage ~= nil then
            --Create token table if there isnt one
@@ -256,7 +256,7 @@ function AtlasLootItem_OnClick(arg1)
                 AtlasLoot:CreateToken(this.sourcePage)
             end
             --Show token table
-            AtlasLoot_ShowItemsFrame(this.sourcePage, AtlasLoot_TokenData, "", AtlasLootItemsFrame.refresh[4], 1);
+            AtlasLoot_ShowItemsFrame(this.sourcePage, AtlasLoot_TokenData, AtlasLootItemsFrame.refresh[3], 1);
         end
     else
         if IsShiftKeyDown() then
@@ -268,14 +268,14 @@ function AtlasLootItem_OnClick(arg1)
             else
                 spellName, _, _, _, _, _, _, _, _ = GetSpellInfo(string.sub(this.itemID, 2));
                 --spellIcon = GetItemIcon(this.dressingroomID);
-                AtlasLoot_ShowWishListDropDown(this.itemID, this.dressingroomID, "=ds="..spellName, "=ds="..AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[1].."|"..AtlasLootItemsFrame.refresh[2],this);
+                AtlasLoot_ShowWishListDropDown(this.itemID, this.dressingroomID, "=ds="..spellName, AtlasLootItemsFrame.refresh[1].."|"..AtlasLootItemsFrame.refresh[2],this);
             end
         elseif(IsControlKeyDown()) then
             DressUpItemLink("item:"..this.dressingroomID..":0:0:0:0:0:0:0");
         elseif((AtlasLootItemsFrame.refresh[1] == "SearchResult" or AtlasLootItemsFrame.refresh[1] == "WishList") and this.sourcePage) then
             local dataID, dataSource = strsplit("|", this.sourcePage);
             if(dataID and dataSource and AtlasLoot_IsLootTableAvailable(dataID)) then
-                AtlasLoot_ShowItemsFrame(dataID, dataSource, AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4]);
+                AtlasLoot_ShowItemsFrame(dataID, dataSource, AtlasLootItemsFrame.refresh[3]);
             end
         end
     end
diff --git a/AtlasLoot/Core/Options.lua b/AtlasLoot/Core/Options.lua
index 103e336..cffd49e 100644
--- a/AtlasLoot/Core/Options.lua
+++ b/AtlasLoot/Core/Options.lua
@@ -288,7 +288,7 @@ function AtlasLoot_CraftingLink_OnClick()
     UIDropDownMenu_SetSelectedID(AtlasLoot_CraftingLink, thisID);
     AtlasLoot.db.profile.CraftingLink = thisID;
     if AtlasLootItemsFrame:IsVisible() and AtlasLootItemsFrame.refresh then
-        AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4], AtlasLootItemsFrame.refresh[5]);
+        AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4]);
     end
     AtlasLoot_OptionsOnShow();
 end
diff --git a/AtlasLoot/Core/Search.lua b/AtlasLoot/Core/Search.lua
index 1595fdd..c79ed7c 100644
--- a/AtlasLoot/Core/Search.lua
+++ b/AtlasLoot/Core/Search.lua
@@ -623,7 +623,7 @@ local function GetSpellName(itemId, atlasName)
 end
 
 local function DoSearch(searchText)
-    AtlasLootCharDB["SearchResult"] = {Name = "Search Result" , Type = "ClassicDungeonExt", Back = true};
+    AtlasLootCharDB["SearchResult"] = {Name = "Search Result" , Type = "Search", Back = true};
     AtlasLootCharDB.LastSearchedText = searchText;
     local count = 1;
     local tablenum = 1;
@@ -693,7 +693,7 @@ local function DoSearch(searchText)
 end
 
 function AtlasLoot:ShowSearchResult()
-    AtlasLoot_ShowItemsFrame("SearchResult", AtlasLootCharDB, (AL["Search Result: %s"]):format(AtlasLootCharDB.LastSearchedText or ""), pFrame, 1);
+    AtlasLoot_ShowItemsFrame("SearchResult", AtlasLootCharDB, pFrame, 1);
 end
 
 function AtlasLoot:Search(Text)
@@ -745,7 +745,7 @@ function AtlasLoot:Search(Text)
         DEFAULT_CHAT_FRAME:AddMessage(RED .. AL["AtlasLoot"] .. ": " .. WHITE .. AL["No match found for"] .. " \"" .. Text .. "\"." .. itemFilterErrorMessage);
     else
         --SearchResult = AtlasLoot_CategorizeWishList(AtlasLootCharDB["SearchResult"]);
-        AtlasLoot_ShowItemsFrame("SearchResult", AtlasLootCharDB, (AL["Search Result: %s"]):format(AtlasLootCharDB.LastSearchedText or ""), pFrame, 1);
+        AtlasLoot_ShowItemsFrame("SearchResult", AtlasLootCharDB, pFrame, 1);
     end
 end
 
diff --git a/AtlasLoot/Core/SearchAdvanced.lua b/AtlasLoot/Core/SearchAdvanced.lua
index 71d1122..c2e2d88 100644
--- a/AtlasLoot/Core/SearchAdvanced.lua
+++ b/AtlasLoot/Core/SearchAdvanced.lua
@@ -236,14 +236,13 @@ function AtlasLoot_AdvancedSearchShow()
 
     ATLASLOOT_CURRENTTYPE = "Search";
 	AtlasLoot:ScrollFrameUpdate();
-    AtlasLoot:SubTableScrollFrameUpdate("EmptyTable", AtlasLoot_Data, pFrame);
 end
 
 function AtlasLoot_AdvancedSearchClose()
     AtlasLootDefaultFrame_AdvancedSearchPanel:Hide();
 
     if (SearchPrevData[1] ~= "") then
-        AtlasLoot_ShowItemsFrame(SearchPrevData[1], SearchPrevData[2], SearchPrevData[3], SearchPrevData[4], SearchPrevData[5]);
+        AtlasLoot_ShowItemsFrame(SearchPrevData[1], SearchPrevData[2], SearchPrevData[4], SearchPrevData[5]);
     end
 end
 
diff --git a/AtlasLoot/Core/WishList.lua b/AtlasLoot/Core/WishList.lua
index 4c5690a..1a210b9 100644
--- a/AtlasLoot/Core/WishList.lua
+++ b/AtlasLoot/Core/WishList.lua
@@ -68,21 +68,21 @@ function AtlasLoot_ShowWishList()
 		AtlasLootWishList["WishList"].Name = "Wish List";
 		AtlasLootWishList["WishList"].Back = true;
 		AtlasLootWishList["WishList"][1].Name = AtlasLootWishList["Own"][playerName][lastWishListarg2]["info"][1];
-		AtlasLoot_ShowItemsFrame("WishList", AtlasLootWishList, AtlasLootWishList["Own"][playerName][lastWishListarg2]["info"][1], pFrame, 1);
+		AtlasLoot_ShowItemsFrame("WishList", AtlasLootWishList, pFrame, 1);
 	elseif lastWishListtyp == "addOther" then
 		AtlasLootWishList["WishList"] = AtlasLootWishList["Own"][lastWishListarg2];
 		sort();
 		AtlasLootWishList["WishList"].Name = "Wish List";
 		AtlasLootWishList["WishList"].Back = true;
 		AtlasLootWishList["WishList"][1].Name = AtlasLootWishList["Own"][lastWishListarg2][lastWishListarg3]["info"][1];
-		AtlasLoot_ShowItemsFrame("WishList", AtlasLootWishList, AtlasLootWishList["Own"][lastWishListarg2][lastWishListarg3]["info"][1], pFrame, 1);
+		AtlasLoot_ShowItemsFrame("WishList", AtlasLootWishList, pFrame, 1);
 	elseif lastWishListtyp == "addShared" then
 		AtlasLootWishList["WishList"] = AtlasLootWishList["Shared"][lastWishListarg2];
 		sort();
 		AtlasLootWishList["WishList"].Name = "Wish List";
 		AtlasLootWishList["WishList"].Back = true;
 		AtlasLootWishList["WishList"][1].Name = AtlasLootWishList["Shared"][lastWishListarg2][lastWishListarg3]["info"][1];
-		AtlasLoot_ShowItemsFrame("WishList", AtlasLootWishList, AtlasLootWishList["Shared"][lastWishListarg2][lastWishListarg3]["info"][1], pFrame, 1);
+		AtlasLoot_ShowItemsFrame("WishList", AtlasLootWishList, pFrame, 1);
 	end
 end
 
diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua
index 1741ea6..c3f874f 100644
--- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua
+++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua
@@ -51,11 +51,11 @@ function AtlasLootDefaultFrame_OnShow()
         ATLASLOOT_CURRENTTABLE = lastboss[7];
         ATLASLOOT_LASTMODULE = lastboss[6];
         AtlasLoot_IsLootTableAvailable(lastboss[6]);
-        AtlasLoot_ShowItemsFrame(lastboss[1], AtlasLoot_Data, AtlasLoot_Data[lastboss[1]][lastboss[5]].Name, pFrame, lastboss[5]);
+        AtlasLoot_ShowItemsFrame(lastboss[1], AtlasLoot_Data, pFrame, lastboss[5]);
         AtlasLoot_DewdropSubMenu:Unregister(AtlasLootDefaultFrame_SubMenu);
         AtlasLoot_DewdropSubMenuRegister(AtlasLoot_SubMenus[lastboss[7]]);
     else
-        AtlasLoot_ShowItemsFrame("EmptyTable", AtlasLoot_Data, AtlasLoot_Data["EmptyTable"].Name,pFrame,1);
+        AtlasLoot_ShowItemsFrame("EmptyTable", AtlasLoot_Data, pFrame,1);
     end
 end
 
@@ -103,16 +103,8 @@ function AtlasLoot_DewDropSubMenuClick(tablename)
     --Show the select loot table
     local tablenum = AtlasLoot_Data[tablename].Loadfirst or 1;
 
-    if AtlasLoot_Data[tablename].Type == "Crafting" then
-        ItemindexID = "Pattern";
-    elseif ItemindexID == "Pattern" and AtlasLoot_Data[tablename].Type ~= "Crafting" then
-        ItemindexID = 2;
-    else
-        ItemindexID = ItemindexID or 2;
-    end
-
     --Show the table that has been selected
-    AtlasLoot_ShowItemsFrame(tablename, AtlasLoot_Data, AtlasLoot_Data[tablename][tablenum].Name, pFrame, tablenum);
+    AtlasLoot_ShowItemsFrame(tablename, AtlasLoot_Data, pFrame, tablenum);
     AtlasLoot_DewdropSubMenu:Close(1);
 end
 
diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua
index 9d1b377..c4adaff 100644
--- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua
+++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua
@@ -178,7 +178,7 @@ local function presetcreate(preset,num)
             pFrame = { "TOPLEFT", "AtlasLootDefaultFrame_LootBackground", "TOPLEFT", "2", "-2" };
             ATLASLOOT_LASTMODULE = AtlasLootCharDB["QuickLooks"][num][6];
             ATLASLOOT_CURRENTTABLE = AtlasLootCharDB["QuickLooks"][num][7];
-            AtlasLoot_ShowItemsFrame(AtlasLootCharDB["QuickLooks"][num][1], AtlasLootCharDB["QuickLooks"][num][2], AtlasLootCharDB["QuickLooks"][num][3], pFrame, AtlasLootCharDB["QuickLooks"][num][5]);
+            AtlasLoot_ShowItemsFrame(AtlasLootCharDB["QuickLooks"][num][1], AtlasLootCharDB["QuickLooks"][num][2], pFrame, AtlasLootCharDB["QuickLooks"][num][5]);
         end
     end);
     preset:SetScript("OnShow", function(self)
@@ -331,13 +331,13 @@ scrollFrame.scrollBar = scrollSlider
 
 local rows = setmetatable({}, { __index = function(t, i)
 	local row = CreateFrame("CheckButton", "$parentRow"..i, scrollFrame)
-	row:SetSize(150, ROW_HEIGHT);
+	row:SetSize(230, ROW_HEIGHT);
 	row:SetNormalFontObject(GameFontHighlightLeft);
     row:SetCheckedTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD");
     row:SetScript("OnClick", function()
         ItemindexID = row.itemIndex;
         if not AtlasLootDefaultFrame_AdvancedSearchPanel:IsVisible() then
-        AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4], AtlasLootItemsFrame.refresh[5]);
+        AtlasLoot_ShowItemsFrame(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4]);
         end
         AtlasLoot:ScrollFrameUpdate();
     end)
@@ -384,7 +384,7 @@ function AtlasLoot:SubTableScrollFrameUpdate(tablename, dataSource, pFrame, tabl
                     row.tablenum = value;
                     row.pFrame = pFrame;
                 if dataSource == AtlasLoot_MapData then
-                    row:SetText(string.sub(tostring(dataSource[tablename][value][1]),0,50));
+                    row:SetText(string.sub(dataSource[tablename][value][1],0,48));
                 else
                     row:SetText("|cffFFd200"..dataSource[tablename][value].Name);
                     if tablenum == value and dataSource ~= AtlasLoot_MapData then
@@ -410,12 +410,12 @@ local scrollSlider2 = CreateFrame("ScrollFrame","AtlasLootDefaultFrameSubTableSc
 
 local rows2 = setmetatable({}, { __index = function(t, i)
     local row = CreateFrame("CheckButton", "$parentRow"..i, subtableFrame)
-    row:SetSize(150, ROW_HEIGHT)
+    row:SetSize(230, ROW_HEIGHT)
     row:SetNormalFontObject(GameFontHighlightLeft)
     row:SetCheckedTexture("Interface\\QuestFrame\\UI-QuestTitleHighlight", "ADD");
     row:SetScript("OnClick", function()
         if row.dataSource ~= AtlasLoot_MapData then
-            AtlasLoot_ShowItemsFrame(row.tablename, row.dataSource, row.dataSource[row.tablename][row.tablenum].Name, row.pFrame, row.tablenum);
+            AtlasLoot_ShowItemsFrame(row.tablename, row.dataSource, row.pFrame, row.tablenum);
         else
             row:SetChecked(false);
         end