diff --git a/Core/AtlasLoot.lua b/Core/AtlasLoot.lua
index 3796b58..cf9b4af 100644
--- a/Core/AtlasLoot.lua
+++ b/Core/AtlasLoot.lua
@@ -3243,23 +3243,6 @@ function AtlasLoot_ContainerItem_OnClick(arg1)
 	end
 end
 
---[[
-AtlasLoot_QueryLootPage()
-Querys all valid items on the current loot page.
-]]
-function AtlasLoot_QueryLootPage()
-	for i = 1, 30 do
-		local button = _G["AtlasLootItem_"..i];
-		local queryitem = button.itemID;
-		if ( (queryitem) and (queryitem ~= "") and (queryitem ~= 0) and
-			(string.sub(queryitem, 1, 1) ~= "s") and (string.sub(queryitem, 1, 1) ~= "e") ) then
-			if ( not GetItemInfo(queryitem) ) then
-				AtlasLootCacheTooltip:SetHyperlink("item:"..queryitem..":0:0:0");
-			end
-		end
-	end
-end
-
 local function idFromLink(itemlink)
 	if ( itemlink ) then
 		local _,_,id = string.find(itemlink, "|Hitem:([^:]+)%:")
diff --git a/Core/AtlasLoot.xml b/Core/AtlasLoot.xml
index fbeb64e..fa2b857 100644
--- a/Core/AtlasLoot.xml
+++ b/Core/AtlasLoot.xml
@@ -253,7 +253,7 @@
 				<FontString name="AtlasLootDefaultFrameSearchString" inherits="GameFontNormal"/>
 			</EditBox>
 			<Button name="AtlasLootDefaultFrameSearchButton" inherits="UIPanelButtonTemplate2" parent="AtlasLootDefaultFrameSearchBox">
-				<Size x="69" y="32"/>
+				<Size x="69" y="21"/>
 				<Anchors>
 					<Anchor point="LEFT" relativePoint="RIGHT"/>
 				</Anchors>
@@ -291,7 +291,7 @@
 				</Scripts>
 			</Button>
 			<Button name="AtlasLootDefaultFrameSearchClearButton" inherits="UIPanelButtonTemplate2" parent="AtlasLootDefaultFrameSearchBox">
-				<Size x="58" y="32"/>
+				<Size x="58" y="21"/>
 				<Anchors>
 					<Anchor point="LEFT" relativeTo="AtlasLootDefaultFrameSearchOptionsButton" relativePoint="RIGHT">
 						<Offset x="-2" y="0"/>
@@ -311,7 +311,7 @@
 				</Scripts>
 			</Button>
 			<Button name="AtlasLootDefaultFrameLastResultButton" inherits="UIPanelButtonTemplate2" parent="AtlasLootDefaultFrameSearchBox">
-				<Size x="100" y="32"/>
+				<Size x="100" y="21"/>
 				<Anchors>
 					<Anchor point="LEFT" relativeTo="AtlasLootDefaultFrameSearchClearButton" relativePoint="RIGHT"/>
 				</Anchors>
@@ -328,7 +328,7 @@
 				</Scripts>
 			</Button>
 			<Button name="AtlasLootDefaultFrameWishListButton" inherits="UIPanelButtonTemplate2" parent="AtlasLootDefaultFrame">
-				<Size x="100" y="32"/>
+				<Size x="100" y="21"/>
 				<Anchors>
 					<Anchor point="RIGHT" relativeTo="AtlasLootDefaultFrameSearchBox" relativePoint="LEFT">
 						<Offset x="-7" y="0"/>
@@ -618,7 +618,7 @@
 		<Size x="128" y="75"/>
 		<Frames>
 			<Button name="$parentHidePanel" inherits="UIPanelButtonTemplate2">
-				<Size x="80" y="32"/>
+				<Size x="80" y="21"/>
 				<Anchors>
 					<Anchor point="BOTTOMLEFT" relativeTo="$parent" relativePoint="BOTTOMLEFT">
 						<Offset x="-7" y="-3"/>
@@ -642,7 +642,7 @@
 				</Scripts>
 			</Button>
 			<Button name="$parent_AtlasLoot" inherits="UIPanelButtonTemplate2">
-				<Size x="80" y="32"/>
+				<Size x="80" y="21"/>
 				<Anchors>
 					<Anchor point="BOTTOMLEFT" relativeTo="$parentHidePanel" relativePoint="BOTTOMRIGHT"/>
 				</Anchors>
@@ -1065,40 +1065,6 @@
 					</OnShow>
 				</Scripts>
 			</Button>
-			<Button name="AtlasLootServerQueryButton" inherits="OptionsButtonTemplate" hidden="true">
-				<Size x="100" y="23"/>
-				<Anchors>
-					<Anchor point="BOTTOM">
-						<Offset x="100" y="6"/>
-					</Anchor>
-				</Anchors>
-				<Scripts>
-					<OnShow>
-						local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
-						this:SetText(AL["Query Server"]);
-						this:SetFrameLevel((this:GetParent()):GetFrameLevel() + 1);
-					</OnShow>
-					<OnEnter>
-						local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot");
-						GameTooltip:ClearLines();
-						GameTooltip:SetOwner(this, "ANCHOR_RIGHT", -(this:GetWidth() / 2), 5);
-						GameTooltip:AddLine("|cffff0000"..AL["Query Server"]);
-						GameTooltip:AddLine(AL["Queries the server for all items"]);
-						GameTooltip:AddLine(AL["on this page. The items will be"]);
-						GameTooltip:AddLine(AL["refreshed when you next mouse"]);
-						GameTooltip:AddLine(AL["over them."]);
-						GameTooltip:Show();
-					</OnEnter>
-					<OnLeave>
-						GameTooltip:Hide();
-					</OnLeave>
-					<OnClick>
-						GameTooltip:Hide();
-						AtlasLoot_QueryLootPage();
-						CloseDropDownMenus();
-					</OnClick>
-				</Scripts>
-			</Button>
 			<Button name="AtlasLootQuickLooksButton">
 				<Size x="25" y="25"/>
 				<Anchors>
@@ -1484,7 +1450,7 @@
 				</Scripts>
 			</Slider>
 			<Button name="$parentDone" inherits="UIPanelButtonTemplate2">
-				<Size x="80" y="20"/>
+				<Size x="80" y="21"/>
 				<Anchors>
 					<Anchor point="BOTTOM">
 						<Offset x="0" y="20"/>
@@ -1501,7 +1467,7 @@
 				</Scripts>
 			</Button>
 			<Button name="$ParentResetPosition" inherits="UIPanelButtonTemplate2">
-				<Size x="160" y="20"/>
+				<Size x="160" y="21"/>
 				<Anchors>
 					<Anchor point="BOTTOM">
 						<Offset x="168" y="20"/>
@@ -1518,7 +1484,7 @@
 				</Scripts>
 			</Button>
 			<Button name="$ParentDefaultSettings" inherits="UIPanelButtonTemplate2">
-				<Size x="160" y="20"/>
+				<Size x="160" y="21"/>
 				<Anchors>
 					<Anchor point="BOTTOM">
 						<Offset x="-168" y="20"/>
@@ -1813,7 +1779,7 @@
 				<FontString inherits="GameFontNormal"/>
 			</EditBox>
 			<Button name="AtlasLootSearchButton" inherits="UIPanelButtonTemplate2" parent="AtlasLootSearchBox">
-				<Size x="69" y="32"/>
+				<Size x="69" y="21"/>
 				<Anchors>
 					<Anchor point="LEFT" relativePoint="RIGHT"/>
 				</Anchors>
@@ -1850,7 +1816,7 @@
 				</Scripts>
 			</Button>
 			<Button name="AtlasLootSearchClearButton" inherits="UIPanelButtonTemplate2" parent="AtlasLootSearchBox">
-				<Size x="58" y="32"/>
+				<Size x="58" y="21"/>
 				<Anchors>
 					<Anchor point="LEFT" relativeTo="AtlasLootSearchOptionsButton" relativePoint="RIGHT">
 						<Offset x="-2" y="0"/>
diff --git a/Core/Sets.lua b/Core/Sets.lua
index abfef48..d6a88e7 100644
--- a/Core/Sets.lua
+++ b/Core/Sets.lua
@@ -41,7 +41,6 @@ function AtlasLoot_PrepMenu(backPage, title)
 	end
 	AtlasLootItemsFrame_NEXT:Hide();
 	AtlasLootItemsFrame_PREV:Hide();
-	AtlasLootServerQueryButton:Hide();
 	for i = 1, 30, 1 do
 		_G["AtlasLootMenuItem_" .. i .. "_Extra"]:Show();
 	end
diff --git a/Locale/locale.cn.lua b/Locale/locale.cn.lua
index c8e687f..95dc478 100644
--- a/Locale/locale.cn.lua
+++ b/Locale/locale.cn.lua
@@ -377,8 +377,6 @@ AL:RegisterTranslations("zhCN", function() return {
     ["Qiraji Ornate Hilt"] = "其拉装饰刀柄",
     ["Qiraji Regal Drape"] = "其拉帝王披风",
     ["Qiraji Spiked Hilt"] = "其拉尖刺刀柄",
-    ["Queries the server for all items"] = "向服务器查询本页",
-    ["Query Server"] = "查询物品",
     ["Quest Item"] = "任务物品",
     ["Quest Reward"] = "任务奖励",
     ["QuickLook"] = "快捷浏览",
@@ -605,10 +603,7 @@ AL:RegisterTranslations("zhCN", function() return {
     ["Zelemar the Wrathful"] = "愤怒者塞雷玛尔",
     ["Zul'Gurub Rings"] = "祖尔格拉布戒指",
     ["Zul'Gurub Sets"] = "祖尔格拉布职业套装",
-    ["on this page. The items will be"] = "中的所有物品链接",
     ["options"] = "options",
-    ["over them."] = "下次滑过时刷新",
-    ["refreshed when you next mouse"] = "物品将会在鼠标",
     ["reset"] = "reset",
     ["sucessfully loaded."] = "已成功载入",
     ["|cff1eff00Left-Click|r Browse Loot Tables"] = "|cff1eff00单击|r 浏览掉落表",
diff --git a/Locale/locale.de.lua b/Locale/locale.de.lua
index 0b468c4..8b366b6 100644
--- a/Locale/locale.de.lua
+++ b/Locale/locale.de.lua
@@ -348,7 +348,6 @@ AL:RegisterTranslations("deDE", function() return {
     ["Qiraji Ornate Hilt"] = "Verschnörkelter Griff",
     ["Qiraji Regal Drape"] = "Hoheitstuch",
     ["Qiraji Spiked Hilt"] = "Stachelgriff",
-    ["Queries the server for all items"] = "Fragt den Server nach allen Items",
     ["Quest Item"] = "Questgegenstand",
     ["Quest Reward"] = "Questbelohnung",
     ["Raging Skeleton"] = "Tobendes Skelett",
@@ -556,9 +555,6 @@ AL:RegisterTranslations("deDE", function() return {
     ["Zelemar the Wrathful"] = "Zelemar the Wrathful",
     ["Zul'Gurub Rings"] = "Zul'Gurub Ringe",
     ["Zul'Gurub Sets"] = "Zul'Gurub Sets",
-    ["on this page. The items will be"] = "auf dieser Seite. Die Items werden",
-    ["over them."] = "mit der Maus drüber fahrt.",
-    ["refreshed when you next mouse"] = "geladen, sobald ihr das nächste Mal",
     ["sucessfully loaded."] = "erfogreich geladen.",
     ["|cff1eff00Left-Click|r Browse Loot Tables"] = "|cff1eff00Linksklick|r Loot-Tabellen durchsuchen",
     ["|cff9d9d9dItemSync Tooltips|r"] = "|cff9d9d9dItemSync Tooltips|r",
diff --git a/Locale/locale.en.lua b/Locale/locale.en.lua
index 2805c52..3e96f8f 100644
--- a/Locale/locale.en.lua
+++ b/Locale/locale.en.lua
@@ -1129,8 +1129,6 @@ AL:RegisterTranslations("enUS", function() return {
     ["Qiraji Regal Drape"] = true,
     ["Qiraji Spiked Hilt"] = true,
     ["Quartermaster Zigris"] = true,
-    ["Queries the server for all items"] = true,
-    ["Query Server"] = true,
     ["Quest Item"] = ITEM_BIND_QUEST,
     ["Quest Reward"] = true,
     ["QuickLook"] = true,
@@ -1640,14 +1638,11 @@ AL:RegisterTranslations("enUS", function() return {
 	["Zuluhed the Whacked"] = true,
     ["default"] = true,
     ["has been reset!"] = true,
-    ["on this page. The items will be"] = true,
     ["options"] = true,
-    ["over them."] = true,
     ["panel"] = true,
     ["random colour"] = true,
     ["random resistance"] = true,
     ["random stats"] = true,
-    ["refreshed when you next mouse"] = true,
     ["reset"] = true,
     ["sucessfully loaded."] = true,
     ["|cff1eff00Left-Click|r Browse Loot Tables"] = true,
diff --git a/Locale/locale.es.lua b/Locale/locale.es.lua
index 1345217..a2d6867 100644
--- a/Locale/locale.es.lua
+++ b/Locale/locale.es.lua
@@ -367,8 +367,6 @@ AL:RegisterTranslations("esES", function() return {
     ["Qiraji Ornate Hilt"] = "Empuñadura Qiraji ornamentada",
     ["Qiraji Regal Drape"] = "Mantón Qiraji real",
     ["Qiraji Spiked Hilt"] = "Puño con pinchos Qiraji",
-    ["Queries the server for all items"] = "Pregunta al servidor por todos los objectos",
-    ["Query Server"] = "Pregunta al Servidor",
     ["Quest Item"] = "Objeto de misión",
     ["Quest Reward"] = "Recompensa de misión",
     ["QuickLook"] = "VistaRápida",
@@ -586,10 +584,7 @@ AL:RegisterTranslations("esES", function() return {
     ["Zelemar the Wrathful"] = "Zelemar el Colérico",
     ["Zul'Gurub Rings"] = "Anillos de Zul'Gurub",
     ["Zul'Gurub Sets"] = "Conjuntos de Zul'Gurub",
-    ["on this page. The items will be"] = "de esta página, Los objectos serán",
     ["options"] = "Opciones",
-    ["over them."] = "sobre ellos",
-    ["refreshed when you next mouse"] = "refrescados al pasar el ratón",
     ["reset"] = "Reiniciar",
     ["sucessfully loaded."] = "cargado satisfactoriamente.",
     ["|cff1eff00Left-Click|r Browse Loot Tables"] = "|cff1eff00Click-izdo|r Navegar por las tablas de botines",
diff --git a/Locale/locale.fr.lua b/Locale/locale.fr.lua
index 8c4e483..575d646 100644
--- a/Locale/locale.fr.lua
+++ b/Locale/locale.fr.lua
@@ -360,7 +360,6 @@ AL:RegisterTranslations("frFR", function() return {
     ["Qiraji Ornate Hilt"] = "Manche orné qiraji",
     ["Qiraji Regal Drape"] = "Drapé royal qiraji",
     ["Qiraji Spiked Hilt"] = "Manche à pointes qiraji",
-    ["Queries the server for all items"] = "Interroge le serveur pour les objets",
     ["Quest Item"] = "Objet de Quête",
     ["Quest Reward"] = "Récompense de quête",
     ["Raging Skeleton"] = "Squelette déchaîné",
@@ -567,9 +566,6 @@ AL:RegisterTranslations("frFR", function() return {
     ["Zelemar the Wrathful"] = "Zelemar le Courroucé",
     ["Zul'Gurub Rings"] = "Anneaux Zul'Gurub",
     ["Zul'Gurub Sets"] = "Sets Zul'Gurub",
-    ["on this page. The items will be"] = "de cette page. Les objets seront",
-    ["over them."] = "votre souris dessus.",
-    ["refreshed when you next mouse"] = "mis à jour une fois que vous aurez passé",
     ["reset"] = "Réinitialiser",
     ["sucessfully loaded."] = "chargement réussi.",
     ["|cff1eff00Left-Click|r Browse Loot Tables"] = "|cff1eff00Clic-Gauche|r Parcours des Listes d'Objets",