diff --git a/AtlasLoot/Core/AtlasDifficulty.lua b/AtlasLoot/Core/AtlasDifficulty.lua
index 794b991..5797b65 100644
--- a/AtlasLoot/Core/AtlasDifficulty.lua
+++ b/AtlasLoot/Core/AtlasDifficulty.lua
@@ -167,6 +167,10 @@ AtlasLoot_Difficulty = {
     };
     
 
+    ["Search"] = {"Bloodforged", "Normal", "Heroic", "Mythic", "Mythic 1", "Mythic 2","Mythic 3","Mythic 4","Mythic 5", "Mythic 6","Mythic 7",
+    "Mythic 8","Mythic 9", "Mythic 10", "Mythic 11", "Mythic 12","Mythic 13","Mythic 14","Mythic 15", "Mythic 16","Mythic 17","Mythic 18",
+    "Mythic 19", "Mythic 20",};
+
     --Enums for comparisons in code
     Bloodforged = 1;
     Normal = 2;
@@ -175,7 +179,8 @@ AtlasLoot_Difficulty = {
 
     MythicPlus = {5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24}; --Usage AtlasLoot_Difficulty.MythicPlus[1-20];
 
+    DIF_SEARCH = 16;
     DUPLICATE = 17;
     MIN_DIF = 18;
     MAX_DIF = 19;
-}
\ No newline at end of file
+}
diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua
index 260c1dd..2b8aa7a 100644
--- a/AtlasLoot/Core/AtlasLoot.lua
+++ b/AtlasLoot/Core/AtlasLoot.lua
@@ -86,6 +86,9 @@ SelectedTable2TextSet = true
 isTablereference = false
 notPattern = false
 
+--Search panel open and close save variables
+--dataID, dataSource, boss, pFrame
+SearchPrevData = {"", "", "", ""};
 
 AtlasLootCharDB={};
 
@@ -506,6 +509,8 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
 	local isItem;
 	local spellName, spellIcon;
 
+	SearchPrevData = {dataID, dataSource, boss, pFrame};
+
     --If the loot table name has not been passed, throw up a debugging statement
 	if dataID==nil then
 		DEFAULT_CHAT_FRAME:AddMessage("No dataID!");
@@ -516,6 +521,9 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
 		HideUIPanel(AtlasQuestInsideFrame);
 	end
 
+	--Hide Advanced search if it is up
+	AtlasLootAdvancedSearch:Hide();
+
     --Ditch the Quicklook selector
     AtlasLoot_QuickLooks:Hide();
     AtlasLootQuickLooksButton:Hide();
@@ -544,6 +552,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
     else
         dataSource = AtlasLoot_Data;
     end
+
 	if dataID == "FilterList" then
 		Type = lastType;
 	else
@@ -621,6 +630,9 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
 
 			if(toShow) then
 				IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5), ItemindexID) or dataSource[dataID][i][2];
+				if ((dataID == "SearchResult") or (dataID == "WishList")) then
+					IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5), dataSource[dataID][i][AtlasLoot_Difficulty.DIF_SEARCH]) or dataSource[dataID][i][2];
+				end
 
 				if string.sub(IDfound, 1, 1) == "s" then
 					isItem = false;
@@ -640,9 +652,16 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
 					if dataSource[dataID][i][AtlasLoot_Difficulty.DUPLICATE] then
 						--Used if an item has more then 1 version with the same name eg Atiesh
 						IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5) .. " " .. dataSource[dataID][i][AtlasLoot_Difficulty.DUPLICATE], ItemindexID) or dataSource[dataID][i][2];
+						if ((dataID == "SearchResult") or (dataID == "WishList")) then
+							IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5), dataSource[dataID][i][AtlasLoot_Difficulty.DIF_SEARCH]) or dataSource[dataID][i][2];
+						end
 					else	
 						--If something was found in itemID database show that if not show default table item
 						IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5), ItemindexID) or dataSource[dataID][i][2];
+						if ((dataID == "SearchResult") or (dataID == "WishList")) then
+							IDfound = AL_FindId(string.sub(dataSource[dataID][i][4], 5), dataSource[dataID][i][AtlasLoot_Difficulty.DIF_SEARCH]) or dataSource[dataID][i][2];
+						end
+
 					end
 
 					itemName, itemLink, itemQuality, itemLevel, itemMinLevel, itemType, itemSubType, itemCount, itemEquipLoc, itemTexture = GetItemInfo(IDfound);
@@ -777,6 +796,10 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
                 if (dataID == "SearchResult" or dataID == "WishList") and dataSource[dataID][i][8] then
                     itemButton.sourcePage = dataSource[dataID][i][8];
                 end
+				if (dataID == "SearchResult" or dataID == "WishList") and dataSource[dataID][i][AtlasLoot_Difficulty.DIF_SEARCH] then
+					itemButton.difficulty = dataSource[dataID][i][AtlasLoot_Difficulty.DIF_SEARCH];
+				end
+
 				itemButton.i = 1;
 				itemButton:Show();
                 
@@ -786,7 +809,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
 		end
 
 		if dataID ~= "FilterList" then
-		lastType = dataSource[dataID].Type
+			lastType = dataSource[dataID].Type
 		end
 
 		if SelectedTableTextSet then
diff --git a/AtlasLoot/Core/AtlasLoot.xml b/AtlasLoot/Core/AtlasLoot.xml
index 7183b76..b7472e8 100644
--- a/AtlasLoot/Core/AtlasLoot.xml
+++ b/AtlasLoot/Core/AtlasLoot.xml
@@ -16,6 +16,7 @@
     <Script file="Launchers.lua"/>
 	<Script file="AtlasLoot.lua"/>
 	<Script file="WishList.lua"/>
+	<Script file="SearchAdvanced.lua"/>
     <Script file="Search.lua"/>
 	
     
@@ -1627,7 +1628,7 @@
 				</Scripts>
             </Button>
             
-            <EditBox name="AtlasLootSearchBox" inherits="InputBoxTemplate" letters="100">
+            <EditBox name="AtlasLootSearchBox" inherits="InputBoxTemplate" letters="100" hidden="true">
 				<Size>
 					<AbsDimension x="240" y="35"></AbsDimension>
 				</Size>
@@ -1650,14 +1651,14 @@
 				</Scripts>
 				<FontString name="AtlasLootSearchString" inherits="GameFontNormal"></FontString>
 			</EditBox>
-            <Button name="AtlasLootSearchButton" inherits="UIPanelButtonTemplate2" parent="AtlasLootSearchBox">
+            <Button name="AtlasLootSearchButton" inherits="UIPanelButtonTemplate2">
 				<Size>
 					<AbsDimension x="69" y="32"/>
 				</Size>
 				<Anchors>
-					<Anchor point="LEFT" relativePoint="RIGHT">
+					<Anchor point="BOTTOM" relativeTo="$parent" relativePoint="BOTTOM">
 						<Offset>
-							<AbsDimension x="0" y="0"/>
+							<AbsDimension x="-123" y="20"/>
 						</Offset>
 					</Anchor>
 				</Anchors>
@@ -1668,7 +1669,7 @@
 				        this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
 			        </OnShow>
 					<OnClick>
-						AtlasLoot:Search(AtlasLootSearchBox:GetText());
+						AtlasLoot_AdvancedSearchShow();
 						AtlasLootSearchBox:ClearFocus();
 					</OnClick>
 				</Scripts>
@@ -1742,5 +1743,335 @@
         </Frames>
     </Frame>
 
+	<Frame name="AtlasLootAdvancedSearch" parent="UIParent" hidden="true">
+		<Size>
+			<AbsDimension x="510" y="510"/>
+		</Size>
+		<Anchors>
+			<Anchor point="CENTER"/>
+		</Anchors>
+		<Layers>
+			<Layer level="OVERLAY">
+				<FontString name="$parent_QualityText" inherits="GameFontNormal" text="Quality: ">
+					<Anchors>
+						<Anchor point="TOPLEFT" relativeTo="$parent" relativePoint="TOPLEFT">
+							<Offset>
+								<AbsDimension x="30" y="-20"/>
+							</Offset>
+						</Anchor>
+					</Anchors>
+				</FontString>
+				<FontString name="$parent_EquipText" inherits="GameFontNormal" text="Equip Type Info: ">
+					<Anchors>
+						<Anchor point="TOPLEFT" relativeTo="$parent_QualityText" relativePoint="BOTTOMLEFT">
+							<Offset>
+								<AbsDimension y="-50"/>
+							</Offset>
+						</Anchor>
+					</Anchors>
+				</FontString>
+				<FontString name="$parent_DifficultyText" inherits="GameFontNormal" text="Difficulty: ">
+					<Anchors>
+						<Anchor point="TOPLEFT" relativeTo="$parent_EquipText" relativePoint="BOTTOMLEFT">
+							<Offset>
+								<AbsDimension y="-50"/>
+							</Offset>
+						</Anchor>
+					</Anchors>
+				</FontString>
+			</Layer>
+		</Layers>
+		<Frames>
+			<Button name="$parent_CloseButton" inherits="UIPanelCloseButton">
+				<Anchors>
+					<Anchor point="TOPRIGHT" relativeTo="$parent" relativePoint="TOPRIGHT">
+						<Offset>
+							<AbsDimension x="-5" y="-5"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+                <Scripts>
+                    <OnClick>
+						AtlasLoot_AdvancedSearchClose();
+                    </OnClick>
+                    <OnShow>
+				        this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
+			        </OnShow>
+                </Scripts>
+			</Button>
+			<Button name="$parent_Quality" inherits="OptionsButtonTemplate">
+				<Size>
+					<AbsDimension x="130" y="20"/>
+				</Size>
+				<Anchors>
+					<Anchor point="TOP" relativeTo="$parent" relativePoint="TOP">
+						<Offset>
+							<AbsDimension x="-160" y="-40"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+				<Scripts>
+					<OnClick>
+						if AtlasLoot_QualityMenu:IsOpen() then
+							AtlasLoot_QualityMenu:Close();
+						else
+							AtlasLoot_QualityMenu:Open(this);
+						end
+					</OnClick>
+					<OnShow>
+						local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
+						this:SetText("Select Quality");
+						this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
+					</OnShow>
+				</Scripts>
+			</Button>
+			<Button name="$parent_Equip" inherits="OptionsButtonTemplate">
+				<Size>
+					<AbsDimension x="130" y="20"/>
+				</Size>
+				<Anchors>
+					<Anchor point="TOP" relativeTo="$parent_Quality" relativePoint="BOTTOM">
+						<Offset>
+							<AbsDimension y="-40"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+				<Scripts>
+					<OnClick>
+						if AtlasLoot_EquipMenu:IsOpen() then
+							AtlasLoot_EquipMenu:Close();
+						else
+							AtlasLoot_EquipMenu:Open(this);
+						end
+					</OnClick>
+					<OnShow>
+						local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
+						this:SetText("Select Item Type");
+						this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
+					</OnShow>
+				</Scripts>
+			</Button>
+			<Button name="$parent_EquipSub" inherits="OptionsButtonTemplate">
+				<Size>
+					<AbsDimension x="130" y="20"/>
+				</Size>
+				<Anchors>
+					<Anchor point="LEFT" relativeTo="$parent_Equip" relativePoint="RIGHT">
+						<Offset>
+							<AbsDimension x="15"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+				<Scripts>
+					<OnClick>
+						if AtlasLoot_EquipSubMenu:IsOpen() then
+							AtlasLoot_EquipSubMenu:Close();
+						else
+							AtlasLoot_EquipSubMenu:Open(this);
+						end
+					</OnClick>
+					<OnShow>
+						local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
+						this:SetText("Select Option");
+						this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
+					</OnShow>
+				</Scripts>
+			</Button>
+			<Button name="$parent_WeaponSub" inherits="OptionsButtonTemplate">
+				<Size>
+					<AbsDimension x="130" y="20"/>
+				</Size>
+				<Anchors>
+					<Anchor point="LEFT" relativeTo="$parent_EquipSub" relativePoint="RIGHT">
+						<Offset>
+							<AbsDimension x="15"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+				<Scripts>
+					<OnClick>
+						if AtlasLoot_WeaponSubMenu:IsOpen() then
+							AtlasLoot_WeaponSubMenu:Close();
+						else
+							AtlasLoot_WeaponSubMenu:Open(this);
+						end
+					</OnClick>
+					<OnShow>
+						local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
+						this:SetText("Select Weapon Type");
+						this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
+					</OnShow>
+				</Scripts>
+			</Button>
+			<Button name="$parent_Difficulty" inherits="OptionsButtonTemplate">
+				<Size>
+					<AbsDimension x="130" y="20"/>
+				</Size>
+				<Anchors>
+					<Anchor point="TOP" relativeTo="$parent_Equip" relativePoint="BOTTOM">
+						<Offset>
+							<AbsDimension y="-40"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+				<Scripts>
+					<OnClick>
+						if AtlasLoot_DifficultyMenu:IsOpen() then
+							AtlasLoot_DifficultyMenu:Close();
+						else
+							AtlasLoot_DifficultyMenu:Open(this);
+						end
+					</OnClick>
+					<OnShow>
+						local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
+						this:SetText("Select Difficulty");
+						this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
+					</OnShow>
+				</Scripts>
+			</Button>
+			<Button name="$parent_MythicSub" inherits="OptionsButtonTemplate">
+				<Size>
+					<AbsDimension x="130" y="20"/>
+				</Size>
+				<Anchors>
+					<Anchor point="LEFT" relativeTo="$parent_Difficulty" relativePoint="RIGHT">
+						<Offset>
+							<AbsDimension x="15"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+				<Scripts>
+					<OnClick>
+						if AtlasLoot_DiffSubMenu:IsOpen() then
+							AtlasLoot_DiffSubMenu:Close();
+						else
+							AtlasLoot_DiffSubMenu:Open(this);
+						end
+					</OnClick>
+					<OnShow>
+						local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
+						this:SetText("Mythic+ 1");
+						this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
+					</OnShow>
+				</Scripts>
+			</Button>
+			<EditBox name="$parent_SearchBox" inherits="InputBoxTemplate" letters="100">
+				<Size>
+					<AbsDimension x="240" y="35"></AbsDimension>
+				</Size>
+				<Anchors>
+					<Anchor point="BOTTOM" relativeTo="$parent" relativePoint="BOTTOM">
+						<Offset>
+							<AbsDimension x="-120" y="20"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+				<Scripts>
+					<OnLoad>
+						this:SetAutoFocus(false);
+						this:SetTextInsets(0, 8, 0, 0);
+					</OnLoad>
+					<OnEnterPressed>
+						AtlasLoot:AdvancedSearch(AtlasLootAdvancedSearch_SearchBox:GetText());
+						this:ClearFocus();
+					</OnEnterPressed>
+				</Scripts>
+				<FontString name="$parent_SearchString" inherits="GameFontNormal"></FontString>
+			</EditBox>
+            <Button name="$parent_SearchButton" inherits="UIPanelButtonTemplate2">
+				<Size>
+					<AbsDimension x="69" y="32"/>
+				</Size>
+				<Anchors>
+					<Anchor point="LEFT" relativeTo="$parent_SearchBox" relativePoint="RIGHT">
+						<Offset>
+							<AbsDimension x="0" y="0"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+				<Scripts>
+                    <OnShow>
+                        local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
+                        this:SetText(AL["Search"]);
+				        this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
+			        </OnShow>
+					<OnClick>
+						AtlasLoot:AdvancedSearch(AtlasLootAdvancedSearch_SearchBox:GetText());
+						AtlasLootAdvancedSearch_SearchBox:ClearFocus();
+					</OnClick>
+				</Scripts>
+			</Button>
+			<Button name="$parent_SearchOptionsButton">
+				<Size>
+					<AbsDimension x="28" y="28" />
+				</Size>
+				<Anchors>
+					<Anchor point="LEFT" relativeTo="$parent_SearchButton" relativePoint="RIGHT">
+						<Offset>
+							<AbsDimension x="-6" y="0"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+				<NormalTexture file="Interface\Buttons\UI-SpellbookIcon-NextPage-Up"/>
+				<PushedTexture file="Interface\Buttons\UI-SpellbookIcon-NextPage-Down"/>
+				<DisabledTexture file="Interface\Buttons\UI-SpellbookIcon-NextPage-Disabled"/>
+				<HighlightTexture file="Interface\Buttons\UI-Common-MouseHilight" alphaMode="ADD"/>
+				<Scripts>
+					<OnShow>
+						this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
+					</OnShow>
+					<OnClick>
+						AtlasLoot:ShowSearchOptions(this);
+					</OnClick>
+				</Scripts>
+			</Button>
+			<Button name="$parent_SearchClearButton" inherits="UIPanelButtonTemplate2">
+				<Size>
+					<AbsDimension x="58" y="32"/>
+				</Size>
+				<Anchors>
+					<Anchor point="LEFT" relativeTo="$parent_SearchOptionsButton" relativePoint="RIGHT">
+						<Offset>
+							<AbsDimension x="-2" y="0"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+				<Scripts>
+					<OnShow>
+						local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
+						this:SetText(AL["Clear"]);
+						this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
+					</OnShow>
+					<OnClick>
+						AtlasLoot_AdvancedSearchReset();
+						AtlasLootAdvancedSearch_SearchBox:SetText("");
+						AtlasLootAdvancedSearch_SearchBox:ClearFocus();
+					</OnClick>
+				</Scripts>
+			</Button>
+			<Button name="$parent_LastResultButton" inherits="UIPanelButtonTemplate2">
+				<Size>
+					<AbsDimension x="100" y="32"/>
+				</Size>
+				<Anchors>
+					<Anchor point="LEFT" relativeTo="$parent_SearchClearButton" relativePoint="RIGHT">
+						<Offset>
+							<AbsDimension x="0" y="0"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+				<Scripts>
+					<OnShow>
+						local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
+						this:SetText(AL["Last Result"]);
+						this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
+					</OnShow>
+					<OnClick>
+						AtlasLoot:ShowSearchResult();
+					</OnClick>
+				</Scripts>
+			</Button>
+		</Frames>
+	</Frame>
 </Ui>
 
diff --git a/AtlasLoot/Core/LootButtons.lua b/AtlasLoot/Core/LootButtons.lua
index 237a1c2..5ecede9 100644
--- a/AtlasLoot/Core/LootButtons.lua
+++ b/AtlasLoot/Core/LootButtons.lua
@@ -255,6 +255,19 @@ function AtlasLootItem_OnClick(arg1)
         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
+                if (this.difficulty) then
+                    if(AtlasLoot_Data[dataID].Type) then
+                        AtlasLoot_DifficultyEnable(dataID, AtlasLoot_Data);
+                        lastType = AtlasLoot_Data[dataID].Type
+                        local dif_color  = "";
+                        if this.difficulty == 1 or this.difficulty == 2 then
+                            dif_color = "";
+                        else
+                            dif_color = "=q4="
+                        end 
+                        AtlasLoot_DewDropSubMenu2Click(dataID, this.difficulty, dif_color);
+                    end
+                end
                 AtlasLoot_ShowItemsFrame(dataID, dataSource, AtlasLoot_TableNames[dataID][1], AtlasLootItemsFrame.refresh[4]);
             end
         end
diff --git a/AtlasLoot/Core/Search.lua b/AtlasLoot/Core/Search.lua
index 4749059..e844341 100644
--- a/AtlasLoot/Core/Search.lua
+++ b/AtlasLoot/Core/Search.lua
@@ -8,15 +8,15 @@ local ORANGE = "|cffFF8400";
 
 local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
 local modules = { "AtlasLoot_BurningCrusade", "AtlasLoot_Crafting", "AtlasLoot_OriginalWoW", "AtlasLoot_WorldEvents", "AtlasLoot_WrathoftheLichKing" };
-local currentPage = 1;
-local SearchResult = nil;
+currentPage = 1;
+SearchResult = nil;
 
 -- Supported Operators
-local BINARYOPERATORS = { "&" };
-local OPERATORS = { "<>", "<=", ">=", "=", "<", ">" };
+BINARYOPERATORS = { "&" };
+OPERATORS = { "<>", "<=", ">=", "=", "<", ">" };
 
 -- Supported Stat Filters
-local STATFILTERS = {
+STATFILTERS = {
 	-- Base Stats
 	["stamina"] = "ITEM_MOD_STAMINA_SHORT",
 	["stam"] = "ITEM_MOD_STAMINA_SHORT",
diff --git a/AtlasLoot/Core/SearchAdvanced.lua b/AtlasLoot/Core/SearchAdvanced.lua
new file mode 100644
index 0000000..3ebc205
--- /dev/null
+++ b/AtlasLoot/Core/SearchAdvanced.lua
@@ -0,0 +1,991 @@
+local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
+local modules = { "AtlasLoot_BurningCrusade", "AtlasLoot_Crafting", "AtlasLoot_OriginalWoW", "AtlasLoot_WorldEvents", "AtlasLoot_WrathoftheLichKing" };
+
+AtlasLoot_QualityMenu = AceLibrary("Dewdrop-2.0");
+AtlasLoot_DifficultyMenu = AceLibrary("Dewdrop-2.0");
+AtlasLoot_DiffSubMenu = AceLibrary("Dewdrop-2.0");
+AtlasLoot_EquipMenu = AceLibrary("Dewdrop-2.0");
+AtlasLoot_EquipSubMenu = AceLibrary("Dewdrop-2.0");
+AtlasLoot_WeaponSubMenu = AceLibrary("Dewdrop-2.0");
+
+local GREY = "|cff999999";
+local RED = "|cffff0000";
+local WHITE = "|cffFFFFFF";
+local GREEN = "|cff1eff00";
+local PURPLE = "|cff9F3FFF";
+local BLUE = "|cff0070dd";
+local ORANGE = "|cffFF8400";
+
+-- Supported Operators
+local BINARYOPERATORS = { "&" };
+local OPERATORS = { "<>", "<=", ">=", "=", "<", ">" };
+
+-- Supported Stat Filters
+local STATFILTERS = {
+	-- Base Stats
+	["stamina"] = "ITEM_MOD_STAMINA_SHORT",
+	["stam"] = "ITEM_MOD_STAMINA_SHORT",
+	["sta"] = "ITEM_MOD_STAMINA_SHORT",
+	
+	["strength"] = "ITEM_MOD_STRENGTH_SHORT",
+	["str"] = "ITEM_MOD_STRENGTH_SHORT",
+	
+	["agility"] = "ITEM_MOD_AGILITY_SHORT",
+	["agi"] = "ITEM_MOD_AGILITY_SHORT",
+	
+	["intellect"] = "ITEM_MOD_INTELLECT_SHORT",
+	["int"] = "ITEM_MOD_INTELLECT_SHORT",
+	
+	["spirit"] = "ITEM_MOD_SPIRIT_SHORT",
+	["spir"] = "ITEM_MOD_SPIRIT_SHORT",
+	["spi"] = "ITEM_MOD_SPIRIT_SHORT",
+	
+	["health"] = "ITEM_MOD_HEALTH_SHORT",
+	["mana"] = "ITEM_MOD_MANA_SHORT",
+	
+	["mp5"] = "ITEM_MOD_POWER_REGEN0_SHORT",
+	["mpr"] = "ITEM_MOD_POWER_REGEN0_SHORT",
+	
+	["hp5"] = "ITEM_MOD_HEALTH_REGEN_SHORT",
+	["hpr"] = "ITEM_MOD_HEALTH_REGEN_SHORT",
+	
+	--Sockets
+	["socketblue"] = "EMPTY_SOCKET_BLUE",
+	["socketred"] = "EMPTY_SOCKET_RED",
+	["socketyellow"] = "EMPTY_SOCKET_YELLOW",
+	
+	["socketnocolor"] = "EMPTY_SOCKET_NO_COLOR",
+	["socketwhite"] = "EMPTY_SOCKET_NO_COLOR",
+	
+	["socketmeta"] = "EMPTY_SOCKET_META",
+	["meta"] = "EMPTY_SOCKET_META",
+	
+	--Secondary Stats
+	["attackpowerferal"] = "ITEM_MOD_FERAL_ATTACK_POWER_SHORT",
+	["attackpowferal"] = "ITEM_MOD_FERAL_ATTACK_POWER_SHORT",
+	["apferal"] = "ITEM_MOD_FERAL_ATTACK_POWER_SHORT",
+	
+	["attackpower"] = "ITEM_MOD_ATTACK_POWER_SHORT",
+	["attackpow"] = "ITEM_MOD_ATTACK_POWER_SHORT",
+	["ap"] = "ITEM_MOD_ATTACK_POWER_SHORT",
+	
+	["spellpower"] = "ITEM_MOD_SPELL_POWER_SHORT",
+	["spellpow"] = "ITEM_MOD_SPELL_POWER_SHORT",
+	["sp"] = "ITEM_MOD_SPELL_POWER_SHORT",
+	
+	["spellpenetration"] = "ITEM_MOD_SPELL_PENETRATION_SHORT",
+	["spellpen"] = "ITEM_MOD_SPELL_PENETRATION_SHORT",
+	["spp"] = "ITEM_MOD_SPELL_PENETRATION_SHORT",
+	
+	["crit"] = "ITEM_MOD_CRIT_RATING_SHORT",
+	["haste"] = "ITEM_MOD_HASTE_RATING_SHORT",
+	
+	["hit"] = "ITEM_MOD_HIT_RATING_SHORT",
+	
+	["armorpenetration"] = "ITEM_MOD_ARMOR_PENETRATION_RATING_SHORT",
+	["armourpenetration"] = "ITEM_MOD_ARMOR_PENETRATION_RATING_SHORT",
+	["armorpen"] = "ITEM_MOD_ARMOR_PENETRATION_RATING_SHORT",
+	["armourpen"] = "ITEM_MOD_ARMOR_PENETRATION_RATING_SHORT",
+	["arp"] = "ITEM_MOD_ARMOR_PENETRATION_RATING_SHORT",
+	
+	["expertise"] = "ITEM_MOD_EXPERTISE_RATING_SHORT",
+	["exp"] = "ITEM_MOD_EXPERTISE_RATING_SHORT",
+	
+	["dps"] = "ITEM_MOD_DAMAGE_PER_SECOND_SHORT",
+	
+	["resilience"] = "ITEM_MOD_RESILIENCE_RATING",
+	["resil"] = "ITEM_MOD_RESILIENCE_RATING",
+	["res"] = "ITEM_MOD_RESILIENCE_RATING",
+	
+	["defense"] = "ITEM_MOD_DEFENSE_SKILL_RATING_SHORT",
+	["def"] = "ITEM_MOD_DEFENSE_SKILL_RATING_SHORT",
+	
+	["dodge"] = "ITEM_MOD_DODGE_RATING_SHORT",
+	["dod"] = "ITEM_MOD_DODGE_RATING_SHORT",
+	
+	["block"] = "ITEM_MOD_BLOCK_RATING_SHORT",
+	
+	["blockvalue"] = "ITEM_MOD_BLOCK_VALUE_SHORT",
+	["blockval"] = "ITEM_MOD_BLOCK_VALUE_SHORT",
+	["bv"] = "ITEM_MOD_BLOCK_VALUE_SHORT",
+	
+	["parry"] = "ITEM_MOD_PARRY_RATING_SHORT",
+	
+	--Resistances
+	["armor"] = "RESISTANCE0_NAME",
+	["armour"] = "RESISTANCE0_NAME",
+	["arm"] = "RESISTANCE0_NAME",
+	["resistancephysical"] = "RESISTANCE0_NAME",
+	["resistancephys"] = "RESISTANCE0_NAME",
+	["resphys"] = "RESISTANCE0_NAME",
+	
+	["resistanceholy"] = "RESISTANCE1_NAME",
+	["resholy"] = "RESISTANCE1_NAME",
+	
+	["resistancefire"] = "RESISTANCE2_NAME",
+	["resfire"] = "RESISTANCE2_NAME",
+	
+	["resistancenature"] = "RESISTANCE3_NAME",
+	["resnature"] = "RESISTANCE3_NAME",
+	["resnat"] = "RESISTANCE3_NAME",
+	
+	["resistanceforst"] = "RESISTANCE4_NAME",
+	["resfrost"] = "RESISTANCE4_NAME",
+	
+	["resistanceshadow"] = "RESISTANCE5_NAME",
+	["resshadow"] = "RESISTANCE5_NAME",
+	["resshad"] = "RESISTANCE5_NAME",
+	
+	["resistancearcane"] = "RESISTANCE6_NAME",
+	["resarcane"] = "RESISTANCE6_NAME",
+	["resarc"] = "RESISTANCE6_NAME"
+};
+
+local ITEMSOCKETSTATFILTERS = {
+	"EMPTY_SOCKET_BLUE",
+	"EMPTY_SOCKET_RED",
+	"EMPTY_SOCKET_YELLOW",
+	"EMPTY_SOCKET_META",
+	"EMPTY_SOCKET_NO_COLOR"
+};
+
+local ITEMINFOFILTERS = {
+	["ilvl"] = "ilvl",
+	["minlvl"] = "minlvl",
+	["type"] = "type",
+	["subtype"] = "subtype",
+	["quality"] = "quality"
+};
+
+local ITEMLEVELGEAREQUIPFILTER = {
+	["INVTYPE_NON_EQUIP"] = "INVTYPE_NON_EQUIP",
+	["INVTYPE_BODY"] = "INVTYPE_BODY",
+	["INVTYPE_BAG"] = "INVTYPE_BAG",
+	["INVTYPE_AMMO"] = "INVTYPE_AMMO",
+	["INVTYPE_QUIVER"] = "INVTYPE_QUIVER"
+};
+
+AtlasLoot_FrameMenuList = {
+    ["EquipSubMenu"] = {AtlasLoot_EquipSubMenu, "AtlasLootAdvancedSearch_EquipSub", "Select Option", "equipType", "", "AtlasLootAdvancedSearch_WeaponSub"};
+    ["MythicSubMenu"] = {AtlasLoot_DiffSubMenu, "AtlasLootAdvancedSearch_MythicSub", "Mythic+ 1", "difficulty", 5};
+	["WeaponSubMenu"] = {AtlasLoot_WeaponSubMenu, "AtlasLootAdvancedSearch_WeaponSub", "Select Weapon Type", "equipType", ""};
+}
+
+AtlasLoot_AdvancedSearchMenus = {
+    ["Difficulty"] ={
+        [1] = {
+            {"Normal", "difficulty", 2, "MythicSubMenu", "Disable"},
+        },
+        [2] = {
+            {"Heroic", "difficulty", 3, "MythicSubMenu", "Disable"},
+        },
+        [3] = {
+            {"Mythic/Ascended", "difficulty", 4, "MythicSubMenu", "Disable"},
+        },
+        [4] = {
+            {"Mythic Plus", "difficulty", 5, "MythicSubMenu", "MythicPlus"},
+        },
+        [5] = {
+            {"Bloodforged", "difficulty", 1, "MythicSubMenu", "Disable"},
+        }, 
+    };
+
+    ["MythicPlus"] = {
+
+    };
+
+    ["Quality"] = { 
+        [1] = {
+            {AtlasLoot_FixText("=q0=").."Poor", "quality", "=q0="}, 
+        }, 
+        [2] = {
+            {AtlasLoot_FixText("=q1=").."Normal", "quality", "=q1="}, 
+        }, 
+        [3] = {
+            {AtlasLoot_FixText("=q2=").."Uncommon", "quality", "=q2="}, 
+        }, 
+        [4] = {
+            {AtlasLoot_FixText("=q3=").."Rare", "quality", "=q3="}, 
+        }, 
+        [5] = {
+            {AtlasLoot_FixText("=q4=").."Epic", "quality", "=q4="}, 
+        }, 
+        [6] = {
+            {AtlasLoot_FixText("=q5=").."Legendary", "quality", "=q5="}, 
+        }, 
+        [7] = {
+            {AtlasLoot_FixText("=q6=").."Artifact", "quality", "=q6="}, 
+        }, 
+    };
+
+    ["Equip"] = { 
+        [1] = {
+            {"Head", "equip", "#s1#", "EquipSubMenu", "ArmorType"}, 
+        }, 
+        [2] = {
+            {"Shoulder", "equip", "#s3#", "EquipSubMenu", "ArmorType"}, 
+        }, 
+        [3] = {
+            {"Chest", "equip", "#s5#", "EquipSubMenu", "ArmorType"}, 
+        }, 
+        [4] = {
+            {"Wrist", "equip", "#s8#", "EquipSubMenu", "ArmorType"}, 
+        }, 
+        [5] = {
+            {"Hands", "equip", "#s9#", "EquipSubMenu", "ArmorType"}, 
+        }, 
+        [6] = {
+            {"Waist", "equip", "#s10#", "EquipSubMenu", "ArmorType"}, 
+        }, 
+        [7] = {
+            {"Legs", "equip", "#s11#", "EquipSubMenu", "ArmorType"}, 
+        },
+        [8] = {
+            {"Feet", "equip", "#s12#", "EquipSubMenu", "ArmorType"}, 
+        },
+        [9] = {
+            {"Back", "equip", "#s4#", "EquipSubMenu", "Disable"}, 
+        },
+        [10] = {
+            {"Necklace", "equip", "#s2#", "EquipSubMenu", "Disable"}, 
+        },
+        [11] = {
+            {"Ring", "equip", "#s13#", "EquipSubMenu", "Disable"}, 
+        },
+        [12] = {
+            {"Trinket", "equip", "#s14#", "EquipSubMenu", "Disable"}, 
+        },
+        [13] = {
+            {"Weapon/Shield", "equip", "#w", "EquipSubMenu", "WeaponEquip"}, 
+        },
+        [14] = {
+            {"Relic", "equip", "#s16#", "EquipSubMenu", "RelicType"}, 
+        },
+    };
+
+    ["ArmorType"] = {
+        [1] = {
+            {"Cloth", "equipType", "#a1#"}, 
+        }, 
+        [2] = {
+            {"Leather", "equipType", "#a2#"}, 
+        }, 
+        [3] = {
+            {"Mail", "equipType", "#a3#"}, 
+        }, 
+        [4] = {
+            {"Plate", "equipType", "#a4#"}, 
+        },
+    };
+
+    ["RelicType"] = {
+        [1] = {
+            {"Idols", "equipType", "#w14#"}, 
+        }, 
+        [2] = {
+            {"Libram", "equipType", "#w16#"}, 
+        }, 
+        [3] = {
+            {"Totem", "equipType", "#w15#"}, 
+        }, 
+        [4] = {
+            {"Sigil", "equipType", "#w21#"}, 
+        },
+    };
+
+	["WeaponEquip"] = {
+		[1] = {
+            {"One-Hand", "equip", "#h1#", "WeaponSubMenu", "WeaponType"}, 
+        }, 
+        [2] = {
+            {"Two-Hand", "equip", "#h2#", "WeaponSubMenu", "WeaponType"}, 
+        }, 
+        [3] = {
+            {"Main Hand", "equip", "#h3#", "WeaponSubMenu", "WeaponType"}, 
+        }, 
+        [4] = {
+            {"Off Hand", "equip", "#h4#", "WeaponSubMenu", "WeaponType"}, 
+        },
+		[5] = {
+			{"Ranged", "equip", "ranged", "WeaponSubMenu", "WeaponType"},
+		}
+	};
+
+	["WeaponType"] = {
+		[1] = {
+			{"Axe", "equipType", "#w1#"}
+		},
+		[2] = {
+			{"Mace", "equipType", "#w6#"}
+		},
+		[3] = {
+			{"Sword", "equipType", "#w10#"}
+		},
+		[4] = {
+			{"Polearm", "equipType", "#w7#"}
+		},
+		[5] = {
+			{"Dagger", "equipType", "#w4#"}
+		},
+		[6] = {
+			{"Staff", "equipType", "#w9#"}
+		},
+		[7] = {
+			{"Fist Weapon", "equipType", "#w13#"}
+		},
+		[8] = {
+			{"Bow", "equipType", "#w2#"}
+		},
+		[9] = {
+			{"Gun", "equipType", "#w5#"}
+		},
+		[10] = {
+			{"Crossbow", "equipType", "#w3#"}
+		},
+		[11] = {
+			{"Wand", "equipType", "#w12#"}
+		},
+		[12] = {
+			{"Thrown", "equipType", "#w11#"}
+		},
+		[13] = {
+			{"Shield", "equipType", "#w8#"}
+		},	
+	};
+}
+
+local findByQuality = false;
+local findByEquip = false;
+local findByEquipType = false;
+local findByName = false;
+local findByDifficulty = false;
+
+AdvancedSearchOptions = {
+    ["quality"] = "",
+    ["equip"] = "",
+    ["equipType"] = "",
+    ["difficulty"] = 2
+}
+
+local AtlasLoot_AdvancedSearchQuality = {
+	["=q0="] = "Poor",
+	["=q1="] = "Common",
+	["=q2="] = "Uncoom",
+	["=q3="] = "Rare",
+	["=q4="] = "Epic",
+	["=q5="] = "Legendary",
+	["=q6="] = "Artifact",
+	["=q7="] = "Heirloom"
+};
+
+function AtlasLoot_AdvancedSearchShow()
+	if (AtlasLootAdvancedSearch:IsVisible()) then
+		AtlasLoot_AdvancedSearchClose();
+		return;
+	end
+
+    pFrame = { "TOPLEFT", "AtlasLootDefaultFrame_LootBackground", "TOPLEFT", "2", "-2" };
+
+    AtlasLoot_AdvancedSearchRegister(AtlasLoot_QualityMenu, AtlasLootAdvancedSearch_Quality, AtlasLoot_AdvancedSearchMenus["Quality"]);
+    AtlasLoot_AdvancedSearchRegister(AtlasLoot_EquipMenu, AtlasLootAdvancedSearch_Equip, AtlasLoot_AdvancedSearchMenus["Equip"]);
+    AtlasLoot_AdvancedSearchRegister(AtlasLoot_DifficultyMenu, AtlasLootAdvancedSearch_Difficulty, AtlasLoot_AdvancedSearchMenus["Difficulty"]);
+
+    --Hide all elements that could be in the AtlasTable
+    getglobal("AtlasLootItemsFrame_NEXT"):Hide();
+    getglobal("AtlasLootItemsFrame_PREV"):Hide();
+	getglobal("AtlasLootItemsFrame_BACK"):Hide();
+
+    AtlasLootDefaultFrame_SubMenu2:Disable();
+    AtlasLootDefaultFrame_SelectedTable2:SetText("");
+    AtlasLootDefaultFrame_SelectedTable2:Hide();
+
+    AtlasLootDefaultFrame_SubMenu:Disable();
+    AtlasLootDefaultFrame_SelectedTable:SetText("");
+
+	AtlasLootServerQueryButton:Hide();
+
+    --Ditch the Quicklook selector
+    AtlasLoot_QuickLooks:Hide();
+    AtlasLootQuickLooksButton:Hide();
+	
+	-- Hide the Filter Check-Box
+	AtlasLootFilterCheck:Hide();
+
+    for i = 1, 30, 1 do
+        getglobal("AtlasLootItem_"..i.."_Unsafe"):Hide();
+		getglobal("AtlasLootMenuItem_"..i):Hide();
+        getglobal("AtlasLootItem_"..i):Hide();
+        getglobal("AtlasLootItem_"..i).itemID = 0;
+        getglobal("AtlasLootItem_"..i).spellitemID = 0;
+	end
+
+    --Setup Mythic+ dropdown options;
+    for i = 1, 20, 1 do
+        AtlasLoot_AdvancedSearchMenus["MythicPlus"][i] = {
+            {"Mythic+ "..i, "difficulty", i + 4};
+        }
+    end
+
+	--Reset Search options
+	AdvancedSearchOptions = { }
+	AdvancedSearchOptions = {
+		["quality"] = "",
+		["equip"] = "",
+		["equipType"] = "",
+		["difficulty"] = 2
+	}
+	findByQuality = false;
+	findByEquip = false;
+	findByEquipType = false;
+	findByName = false;
+	findByDifficulty = false;
+
+    AtlasLoot_BossName:SetText("Advanced Search");
+
+    AtlasLootAdvancedSearch_EquipSub:Disable();
+    AtlasLootAdvancedSearch_MythicSub:Disable();
+	AtlasLootAdvancedSearch_WeaponSub:Disable();
+
+    AtlasLootAdvancedSearch:ClearAllPoints();
+	AtlasLootAdvancedSearch:SetParent(pFrame[2]);
+	AtlasLootAdvancedSearch:ClearAllPoints();
+	AtlasLootAdvancedSearch:SetPoint(pFrame[1], pFrame[2], pFrame[3], pFrame[4], pFrame[5]);
+    AtlasLootAdvancedSearch:Show();
+end
+
+function AtlasLoot_AdvancedSearchReset()
+	AdvancedSearchOptions = { }
+	AdvancedSearchOptions = {
+		["quality"] = "",
+		["equip"] = "",
+		["equipType"] = "",
+		["difficulty"] = 2
+	}
+
+	findByQuality = false;
+	findByEquip = false;
+	findByEquipType = false;
+	findByName = false;
+	findByDifficulty = false;
+
+	AtlasLootAdvancedSearch_Quality:SetText("Select Quality");
+	AtlasLootAdvancedSearch_Equip:SetText("Select Item Type");
+	AtlasLootAdvancedSearch_Difficulty:SetText("Select Difficulty");
+
+	AtlasLootAdvancedSearch_EquipSub:Disable();
+	AtlasLootAdvancedSearch_EquipSub:SetText("Select Option")
+    AtlasLootAdvancedSearch_MythicSub:Disable();
+	AtlasLootAdvancedSearch_MythicSub:SetText("Mythic+ 1");
+	AtlasLootAdvancedSearch_WeaponSub:Disable();
+	AtlasLootAdvancedSearch_WeaponSub:SetText("Select Weapon Type")
+end
+
+function AtlasLoot_AdvancedSearchClose() 
+	AtlasLootAdvancedSearch:Hide();
+	AtlasLootServerQueryButton:Show();
+
+	if (SearchPrevData[1] ~= "") then
+		AtlasLoot_ShowItemsFrame(SearchPrevData[1], SearchPrevData[2], SearchPrevData[3], SearchPrevData[4]);
+	end
+end
+
+function AtlasLoot_AdvancedSearchMenuClick(Object, VariableToSet, VariableValue, ChildMenu, ChildMenuRegister)
+	--Setups child menus and sets search options to default
+    if(ChildMenu ~= nil) then
+        if(ChildMenuRegister == "Disable") then
+			AdvancedSearchOptions[AtlasLoot_FrameMenuList[ChildMenu][4]] = AtlasLoot_FrameMenuList[ChildMenu][5];
+            getglobal(AtlasLoot_FrameMenuList[ChildMenu][2]):Disable();
+			--Disable assigned children menus as well
+			if(AtlasLoot_FrameMenuList[ChildMenu][6]) then
+				getglobal(AtlasLoot_FrameMenuList[ChildMenu][6]):Disable();
+			end
+        else 
+            AtlasLoot_AdvancedSearchRegister(AtlasLoot_FrameMenuList[ChildMenu][1], getglobal(AtlasLoot_FrameMenuList[ChildMenu][2]), AtlasLoot_AdvancedSearchMenus[ChildMenuRegister]);
+			AdvancedSearchOptions[AtlasLoot_FrameMenuList[ChildMenu][4]] = AtlasLoot_FrameMenuList[ChildMenu][5];
+            getglobal(AtlasLoot_FrameMenuList[ChildMenu][2]):Enable();
+            getglobal(AtlasLoot_FrameMenuList[ChildMenu][2]):SetText(AtlasLoot_FrameMenuList[ChildMenu][3]);
+			--Disable assigned children menus as well
+			if(AtlasLoot_FrameMenuList[ChildMenu][6]) then
+				getglobal(AtlasLoot_FrameMenuList[ChildMenu][6]):Disable();
+			end
+        end
+    end
+	AdvancedSearchOptions[VariableToSet] = VariableValue;
+    Object[1]:SetText(Object[3]);
+    Object[2]:Close();
+end
+
+function AtlasLoot_AdvancedSearchRegister(DropDown, DropDownObject, MenuOption)
+    DropDown:Register(DropDownObject,
+        'point', function(parent)
+            return "TOP", "BOTTOM"
+        end,
+		'children', function(level, value)
+			if level == 1 then
+				if AtlasLoot_AdvancedSearchMenus then
+                    for k,v in ipairs(MenuOption) do
+                        --If a link to show a submenu
+                        if (type(v[1]) == "table") and (type(v[1][1]) == "string") then
+                            if v[1][1] ~= "" then
+                                DropDown:AddLine(
+                                    'text', v[1][1],
+                                    'textR', 1,
+                                    'textG', 0.82,
+                                    'textB', 0,
+                                    'func', AtlasLoot_AdvancedSearchMenuClick,
+                                    'arg1', {DropDownObject, DropDown, v[1][1]},
+                                    'arg2', v[1][2],
+                                    'arg3', v[1][3],
+                                    'arg4', v[1][4],
+                                    'arg5', v[1][5],
+                                    'notCheckable', true
+                                )
+                            end
+                        else
+                            local lock=0;
+                            --If an entry linked to a subtable
+                            for i,j in pairs(v) do
+                                if lock==0 then
+                                    DropDown:AddLine(
+                                        'text', i,
+                                        'textR', 1,
+                                        'textG', 0.82,
+                                        'textB', 0,
+                                        'hasArrow', true,
+                                        'value', j,
+                                        'notCheckable', true
+                                    )
+                                    lock=1;
+                                end
+                            end
+                        end
+                    end
+                end
+                --Close button
+				DropDown:AddLine(
+					'text', AL["Close Menu"],
+                    'textR', 0,
+                    'textG', 1,
+                    'textB', 1,
+					'func', function() DropDown:Close() end,
+					'notCheckable', true
+				)
+			end
+		end,
+		'dontHook', true
+	)
+end
+
+
+
+function AtlasLoot:AdvancedSearch(Text)
+	if not Text then return end
+	Text = strtrim(Text);
+	if Text == "" then findByName = false else findByName = true end
+	local searchTitleString = Text
+	
+
+    local dif = AdvancedSearchOptions["difficulty"];
+	searchTitleString = searchTitleString.." "..WHITE..AtlasLoot_Difficulty.Search[dif];
+
+    if dif ~= 2 then
+        findByDifficulty = true;
+    end
+
+    if AdvancedSearchOptions["quality"] ~= "" then
+        findByQuality = true;
+		searchTitleString = searchTitleString.." "..AtlasLoot_FixText(AdvancedSearchOptions["quality"])..AtlasLoot_AdvancedSearchQuality[AdvancedSearchOptions["quality"]];
+    end
+
+	if AdvancedSearchOptions["equipType"] ~= "" then
+        findByEquipType = true;
+		searchTitleString = searchTitleString.." "..WHITE..AtlasLoot_FixText(AdvancedSearchOptions["equipType"]);
+    end
+
+	if AdvancedSearchOptions["equip"] ~= "" then
+        findByEquip = true;
+		searchTitleString = searchTitleString.." "..WHITE..AtlasLoot_FixText(AdvancedSearchOptions["equip"]);
+    end
+
+	
+	
+	-- Decide if we need load all modules or just specified ones
+	local allDisabled = not self.db.profile.SearchOn.All;
+	if allDisabled then
+		for _, module in ipairs(modules) do
+			if self.db.profile.SearchOn[module] == true then
+				allDisabled = false;
+				break;
+			end
+		end
+	end
+	if allDisabled then
+		DEFAULT_CHAT_FRAME:AddMessage(RED..AL["AtlasLoot"]..": "..WHITE..AL["You don't have any module selected to search on."]);
+		return;
+	end
+	if self.db.profile.SearchOn.All then
+		AtlasLoot_LoadAllModules();
+	else
+		for k, v in pairs(self.db.profile.SearchOn) do
+			if k ~= "All" and v == true and not IsAddOnLoaded(k) and LoadAddOn(k) and self.db.profile.LoDNotify then
+				DEFAULT_CHAT_FRAME:AddMessage(GREEN..AL["AtlasLoot"]..": "..ORANGE..k..WHITE.." "..AL["sucessfully loaded."]);
+			end
+		end
+	end
+	
+    AtlasLootCharDB["SearchResult"] = {};
+	AtlasLootCharDB.LastSearchedText = searchTitleString;
+    
+	local text = string.lower(Text);
+    --[[if not self.db.profile.SearchOn.All then
+        local module = AtlasLoot_GetLODModule(dataSource);
+        if not module or self.db.profile.SearchOn[module] ~= true then return end
+    end]]
+	
+	local function HaveBinaryOperator (textValue)
+		for index, operator in ipairs(BINARYOPERATORS) do
+			if string.find(textValue, operator) then
+				return operator;
+			end
+		end
+		return nil;
+	end
+	
+	local function HaveOperator (textValue)
+		for index, operator in ipairs(OPERATORS) do
+			if string.find(textValue, operator) then
+				return operator;
+			end
+		end
+		return nil;
+	end
+	
+	local function SplitString(str, delimiter)
+		result = {};
+		for match in (str..delimiter):gmatch("(.-)"..delimiter) do
+			table.insert(result, match);
+		end
+		return result;
+	end
+	
+	local function CompareNumbersByOperator (operator, baseValue, valueToCompare)
+		if baseValue ~= nil and valueToCompare ~= nil
+			and ((operator == "<>") and (baseValue ~= valueToCompare)
+				or (operator == "<=") and (baseValue <= valueToCompare)
+				or (operator == ">=") and (baseValue >= valueToCompare)
+				or (operator == "=") and (baseValue == valueToCompare)
+				or (operator == "<") and (baseValue < valueToCompare)
+				or (operator == ">") and (baseValue > valueToCompare))
+		then
+			return true;
+		end
+		return false;
+	end
+	
+	-- Region: Stat Filter
+	local function IsSocketTermInSearchText(searchText)
+		if string.find(searchText, "socket")
+			or string.find(searchText, "sockets")
+			or string.find(searchText, "gem")
+			or string.find(searchText, "gems")
+		then
+			return true;
+		end
+		return false;
+	end
+	
+	local function IsSocketTermEqualsSearchText(searchText)
+		if searchText == "socket"
+			or searchText == "sockets"
+			or searchText == "gem"
+			or searchText == "gems"
+		then
+			return true;
+		end
+		return false;
+	end
+	
+	local function FilterSockets(searchTextItem, stats, operator)
+		if stats then
+			if IsSocketTermInSearchText(searchTextItem) then
+				local searchedStatValue = tonumber(string.match(searchTextItem, "%d+"));
+				local searchTerm = string.gsub(searchTextItem, tostring(searchedStatValue), "");
+				searchTerm = string.gsub(searchTerm, operator, "");
+
+				if IsSocketTermEqualsSearchText(searchTerm) then
+					local socketCount = 0;
+					for _, socketType in pairs(ITEMSOCKETSTATFILTERS) do
+						if socketType then
+							local statValue = tonumber(stats[socketType]);
+							if statValue then
+								socketCount = socketCount + statValue;
+							end
+						end
+					end
+					if CompareNumbersByOperator(operator, socketCount, searchedStatValue) then
+						return true;
+					end
+				end
+			end
+		end
+		return false;
+	end
+	
+	local function HaveStat (textValue)
+		for index, statItem in pairs(STATFILTERS) do
+			if textValue == index then
+				return STATFILTERS[index];
+			end
+		end
+		return nil;
+	end
+	
+	local function IsItemStatMatch(searchTextItem, stats, operator)
+		if stats then
+			local searchedStat = tonumber(string.match(searchTextItem, "%d+"));
+			local searchTerm = searchTextItem.gsub(searchTextItem, tostring(searchedStat), "");
+			searchTerm = string.gsub(searchTerm, operator, "");
+		
+			local statFilterFound = HaveStat(searchTerm);
+			if statFilterFound then
+				local statValue = tonumber(stats[statFilterFound]);
+				if CompareNumbersByOperator(operator, statValue, searchedStat) then
+					return true;
+				end
+			else
+				return FilterSockets(searchTextItem, stats, operator);
+			end
+		end
+		return false;
+	end
+	-- EndRegion
+	
+	-- Region: Item Level Filter
+	local function HaveItemInfoFilter (textValue)
+		for index, itemInfoFilter in pairs(ITEMINFOFILTERS) do
+			if textValue == index then
+				return index;
+			end
+		end
+		return nil;
+	end
+	
+	local function IsEquipableGear (textValue)
+		if textValue == nil or textValue == "" then
+			return false;
+		end
+		for index, equipLoc in ipairs(ITEMLEVELGEAREQUIPFILTER) do
+			if string.find(textValue, equipLoc) then
+				return false;
+			end
+		end
+		return true;
+	end
+	
+	local function IsItemLevelFilter (textValue)
+		local itemLevelFilter = ITEMINFOFILTERS["ilvl"];
+		if string.match(textValue, itemLevelFilter) then
+			return true;
+		end
+		return false;
+	end
+	
+	local function IsItemLevelFilterMatch(searchText, itemLvl, itemEquipLoc, operator)
+		local searchedItemLevel = tonumber(string.match(searchText, "%d+"));
+		local searchTerm = searchText.gsub(searchText, tostring(searchedItemLevel), "");
+		searchTerm = string.gsub(searchTerm, operator, "");
+		
+		local itemInfoFilter = HaveItemInfoFilter(searchTerm);
+		if itemInfoFilter and itemLvl ~= nil and itemLvl > 0
+			--TODO Equipment filter patch
+			--and IsEquipableGear(itemEquipLoc)
+			and IsItemLevelFilter(itemInfoFilter)
+		then
+			if CompareNumbersByOperator(operator, itemLvl, searchedItemLevel) then
+				return true;
+			end
+		end
+		return false;
+	end
+	-- EndRegion
+	
+	-- Add item to Search Result
+	local function AddItemToSearchResult(itemId, itemType, itemName, lootPage, dataId)
+        table.insert(AtlasLootCharDB["SearchResult"], { 0, itemId, itemType, itemName, lootPage, "", "", dataId.."|".."\"\"" });
+    end
+	
+	-- Checks for Partial Matching
+    local partial = self.db.profile.PartialMatching;
+	
+	-- Checks for Item Filters by searching for an Operator in the search text
+	local operator = HaveOperator(text);
+
+    for dataID, data in pairs(AtlasLoot_Data) do
+        for _, v in ipairs(data) do
+            local _id;
+            local found = true;
+
+			local dup = "";
+			if v[AtlasLoot_Difficulty.DUPLICATE] then
+				dup = " "..v[AtlasLoot_Difficulty.DUPLICATE]
+			end
+
+            if findByDifficulty then
+                _id = AL_FindId(string.sub(v[4]..dup, 5), dif);
+                if _id == nil then found = false; end
+            else
+                _id = v[2];
+            end
+
+            if _id ~= nil and type(_id) == "number" and _id > 0 then
+                -- Name, Link, Quality(num), iLvl(num), minLvl(num), itemType(localized string), itemSubType(localized string), stackCount(num), itemEquipLoc(enum), texture(link to a local file), displayId(num)
+                local itemName, _, itemQuality, itemLvl, minLvl, _, _, _, itemEquipLoc, tex = GetItemInfo(_id);
+                
+                if GetItemIcon(_id) == nil then
+                    found = false;
+                end
+
+				if(dif > 4 and (data.Type ~= "ClassicDungeonExt" --[[or data.Type ~= "BCDungeon"]])) then
+					found = false;
+				end
+				
+                itemName = string.sub(v[4], 5)
+
+                local quality = string.sub(v[4], 3, -(string.len(v[4]) - 2));
+				if dif > 2 and tonumber(quality) then
+					if tonumber(quality) < 4 then
+						quality = 4;
+					end
+				end
+
+                if findByQuality then
+                    if not (AdvancedSearchOptions["quality"] == "=q"..quality.."=") then
+                        found = false;
+                    end
+                end
+
+				--v[5] contains equip data
+				if findByEquip then
+					if v[5] then
+						if string.find(v[5], AdvancedSearchOptions["equip"]) then
+							if findByEquipType then
+								if not (string.find(v[5], AdvancedSearchOptions["equipType"])) then
+									found = false;
+								end
+							end
+						else
+							found = false
+						end
+					else
+						found = false;
+					end
+				end
+
+                if operator ~= nil and found then
+					local stats = GetItemStats("item:"..tostring(_id));
+					
+					 -- Currently only supports "&"
+					local binaryOperator = HaveBinaryOperator(text);
+					if binaryOperator ~= nil then
+						local searchConditionsMet = true;
+						local searchItems = SplitString(text, binaryOperator);
+						
+						if searchItems then
+							for _, searchTextItem in ipairs(searchItems) do
+								local localOperator = HaveOperator(searchTextItem);
+								if not localOperator
+									or not (
+										-- Stat Filter
+										IsItemStatMatch(searchTextItem, stats, localOperator)
+										-- Item Level Filter
+										or IsItemLevelFilterMatch(searchTextItem, itemLvl, itemEquipLoc, localOperator)
+									)
+								then
+									searchConditionsMet = false;
+									break;
+								end
+							end
+							
+							if searchConditionsMet then
+								itemName = "=q"..quality.."="..itemName
+								if AtlasLoot_TableNames[dataID] then lootpage = AtlasLoot_TableNames[dataID][1]; else lootpage = "Argh!"; end
+								table.insert(AtlasLootCharDB["SearchResult"], { 0, _id, v[3], itemName, lootpage.." ("..GREEN..AtlasLoot_Difficulty.Search[dif]..WHITE..")", "", "", dataID.."|".."\"\"", [AtlasLoot_Difficulty.DUPLICATE] = dup, [AtlasLoot_Difficulty.DIF_SEARCH] = dif});
+							end
+						end
+					else
+						-- Stat Filter
+						if IsItemStatMatch(text, stats, operator)
+							-- Item Level Filter
+							or IsItemLevelFilterMatch(text, itemLvl, itemEquipLoc, operator)
+						then
+							itemName = "=q"..quality.."="..itemName
+							if AtlasLoot_TableNames[dataID] then lootpage = AtlasLoot_TableNames[dataID][1]; else lootpage = "Argh!"; end
+							table.insert(AtlasLootCharDB["SearchResult"], { 0, _id, v[3], itemName, lootpage.." ("..GREEN..AtlasLoot_Difficulty.Search[dif]..WHITE..")", "", "", dataID.."|".."\"\"", [AtlasLoot_Difficulty.DUPLICATE] = dup, [AtlasLoot_Difficulty.DIF_SEARCH] = dif});
+						end
+						-- TODO itemQuality
+						-- TODO minLvl
+						-- TODO itemEquipLoc
+					end
+					
+					-- Stat Table Cleanup
+					if stats then
+						table.wipe(stats);
+					end
+                end
+
+                
+                if findByName and found then
+                    if partial then
+                        found = string.find(string.lower(itemName), text);
+                    else
+                        found = string.lower(itemName) == text;
+                    end
+                end
+
+                if found and operator == nil then
+					itemName = "=q"..quality.."="..itemName
+                    if AtlasLoot_TableNames[dataID] then lootpage = AtlasLoot_TableNames[dataID][1]; else lootpage = "Argh!"; end
+                    table.insert(AtlasLootCharDB["SearchResult"], { 0, _id, v[3], itemName, lootpage.." ("..GREEN..AtlasLoot_Difficulty.Search[dif]..WHITE..")", "", "", dataID.."|".."\"\"", [AtlasLoot_Difficulty.DUPLICATE] = dup, [AtlasLoot_Difficulty.DIF_SEARCH] = dif});
+                end
+
+            --[[elseif (v[2] ~= nil) and (v[2] ~= "") and (string.sub(v[2], 1, 1) == "s") then 
+                local spellName = GetSpellInfo(string.sub(v[2], 2));
+                if not spellName then
+                    if (string.sub(v[4], 1, 2) == "=d") then  
+                        spellName = gsub(v[4], "=ds=", "");
+                    else
+                        spellName = gsub(v[4], "=q%d=", ""); 
+                    end
+                end
+                local found;
+                if partial then
+                    found = string.find(string.lower(spellName), text);
+                else
+                    found = string.lower(spellName) == text;
+                end
+                if found then
+                    spellName = string.sub(v[4], 1, 4)..spellName;
+                    if AtlasLoot_TableNames[dataID][1] then lootpage = AtlasLoot_TableNames[dataID][1]; else lootpage = "Argh!"; end
+                    table.insert(AtlasLootCharDB["SearchResult"], { 0, v[2], v[3], spellName, lootpage, "", "", dataID.."|".."\"\"" });
+                end--]]
+            end
+        end
+    end
+	
+	if #AtlasLootCharDB["SearchResult"] == 0 then
+		local itemFilterErrorMessage = "";
+		if operator then
+			itemFilterErrorMessage = [[
+			Please check if you have a typo in the filter.
+			To check filter keys, type "/atlaslootfilterkeys".
+			To check filter examples, type "/atlaslootfilterexample".
+			You might also have to query the server for item informations to load them into your client's Cache.]];
+		end
+		DEFAULT_CHAT_FRAME:AddMessage(RED..AL["AtlasLoot"]..": "..WHITE..AL["No match found for"].." \""..Text.."\"."..itemFilterErrorMessage);
+	else
+		AtlasLootServerQueryButton:Show();
+		currentPage = 1;
+		SearchResult = AtlasLoot_CategorizeWishList(AtlasLootCharDB["SearchResult"]);
+		AtlasLoot_ShowItemsFrame("SearchResult", "SearchResultPage1", (AL["Search Result: %s"]):format(AtlasLootCharDB.LastSearchedText or ""), pFrame);
+	end
+end
\ No newline at end of file
diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua
index 68a29c4..f25d6f8 100644
--- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua
+++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.lua
@@ -169,6 +169,8 @@ function AtlasLoot_DifficultyDisable() --Disables Difficulty Menu
 end
 
 function AtlasLoot_DifficultyEnable(dataID, dataSource) --Enables Difficulty Menu
+    if not AtlasLoot_Difficulty[dataSource[dataID].Type] then return end
+    
     AtlasLootDefaultFrame_SubMenu2:Enable();
     AtlasLoot_DewdropSubMenu2:Unregister(AtlasLootDefaultFrame_SubMenu2);
     AtlasLoot_DewdropSubMenu2Register(AtlasLoot_Difficulty[dataSource[dataID].Type]);
@@ -668,9 +670,12 @@ function AtlasLoot_SetNewStyle(style)
 		"AtlasLootDefaultFrame_Preset3",
 		"AtlasLootDefaultFrame_Preset4",
 		"AtlasLootDefaultFrameSearchButton",
-		"AtlasLootDefaultFrameSearchClearButton",
-		"AtlasLootDefaultFrameLastResultButton",
-		"AtlasLootDefaultFrameWishListButton"
+		--"AtlasLootDefaultFrameSearchClearButton",
+		--"AtlasLootDefaultFrameLastResultButton",
+		"AtlasLootDefaultFrameWishListButton",
+        "AtlasLootAdvancedSearch_SearchButton",
+        "AtlasLootAdvancedSearch_SearchClearButton",
+        "AtlasLootAdvancedSearch_LastResultButton"
 	}
 	
 	if style == "new" then
diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.xml b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.xml
index 9e3ca90..611b03c 100644
--- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.xml
+++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrame.xml
@@ -44,7 +44,7 @@
 					</OnShow>
 				</Scripts>
 			</Button>
-			  <Button name="$parent_LoadModules" inherits="AtlasLootDefaultFrameButtonTemplate">
+			<Button name="$parent_LoadModules" inherits="AtlasLootDefaultFrameButtonTemplate">
 				<Anchors>
 					<Anchor point="TOPRIGHT" relativeTo="$parent" relativePoint="TOPRIGHT">
 						<Offset>
@@ -335,7 +335,9 @@
 			        </OnShow>
 				</Scripts>
             </Button>
-			<EditBox name="AtlasLootDefaultFrameSearchBox" inherits="InputBoxTemplate" letters="100">
+			
+			<!--
+			<EditBox name="AtlasLootDefaultFrameSearchBox" inherits="InputBoxTemplate" letters="100" hidden="true">
 				<Size>
 					<AbsDimension x="180" y="32" />
 				</Size>
@@ -358,29 +360,31 @@
 				</Scripts>
 				<FontString name="AtlasLootDefaultFrameSearchString" inherits="GameFontNormal"></FontString>
 			</EditBox>
-			<Button name="AtlasLootDefaultFrameSearchButton" inherits="UIPanelButtonTemplate2" parent="AtlasLootDefaultFrameSearchBox">
+			-->
+			<Button name="AtlasLootDefaultFrameSearchButton" inherits="UIPanelButtonTemplate2">
 				<Size>
-					<AbsDimension x="69" y="32"/>
+					<AbsDimension x="105" y="20"/>
 				</Size>
 				<Anchors>
-					<Anchor point="LEFT" relativePoint="RIGHT">
+					<Anchor point="TOP" relativeTo="$parent_Preset4" relativePoint="BOTTOM">
 						<Offset>
-							<AbsDimension x="0" y="0"/>
+							<AbsDimension y="-5"/>
 						</Offset>
 					</Anchor>
 				</Anchors>
 				<Scripts>
 					<OnShow>
 						local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
-						this:SetText(AL["Search"]);
+						this:SetText(AL["Search"].." Panel");
 						this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
 					</OnShow>
 					<OnClick>
-						AtlasLoot:Search(AtlasLootDefaultFrameSearchBox:GetText());
-						AtlasLootDefaultFrameSearchBox:ClearFocus();
+						AtlasLoot_AdvancedSearchShow();
+						--AtlasLootSearchBox:ClearFocus();
 					</OnClick>
 				</Scripts>
 			</Button>
+			<!--
 			<Button name="AtlasLootDefaultFrameSearchOptionsButton" parent="AtlasLootDefaultFrameSearchButton">
 				<Size>
 					<AbsDimension x="28" y="28" />
@@ -450,14 +454,15 @@
 					</OnClick>
 				</Scripts>
 			</Button>
+			-->
 			<Button name="AtlasLootDefaultFrameWishListButton" inherits="UIPanelButtonTemplate2" parent="AtlasLootDefaultFrame">
 				<Size>
-					<AbsDimension x="100" y="32"/>
+					<AbsDimension x="105" y="20"/>
 				</Size>
 				<Anchors>
-					<Anchor point="RIGHT" relativeTo="AtlasLootDefaultFrameSearchBox" relativePoint="LEFT">
+					<Anchor point="TOP" relativeTo="$parent_Preset1" relativePoint="BOTTOM">
 						<Offset>
-							<AbsDimension x="-7" y="0"/>
+							<AbsDimension x="0" y="-5"/>
 						</Offset>
 					</Anchor>
 				</Anchors>