diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua
index c79442c..bf0a686 100644
--- a/AtlasLoot/Core/AtlasLoot.lua
+++ b/AtlasLoot/Core/AtlasLoot.lua
@@ -105,7 +105,7 @@ local AtlasLootDBDefaults = {
         AtlasLootVersion = "1",
         AtlasNaggedVersion = "",
         FuBarPosition = 1,
-        AutoQuery = false,
+        AutoQuery = true,
         LoadAllLoDStartup = false,
         PartialMatching = true,
         LootBrowserStyle = 1,
@@ -1409,6 +1409,8 @@ function AtlasLoot_QueryLootPage()
             queryitem = button.itemID;
             if (queryitem) and (queryitem ~= nil) and (queryitem ~= "") and (queryitem ~= 0) and (string.sub(queryitem, 1, 1) ~= "s") then
                 GameTooltip:SetHyperlink("item:"..queryitem..":0:0:0:0:0:0:0");
+                GameTooltip:SetHyperlink("item:60"..queryitem..":0:0:0:0:0:0:0");
+                GameTooltip:SetHyperlink("item:2"..queryitem..":0:0:0:0:0:0:0");
             end
             i=i+1;
         end
diff --git a/AtlasLoot/Core/AtlasLoot.xml b/AtlasLoot/Core/AtlasLoot.xml
index 2d1cb49..2731062 100644
--- a/AtlasLoot/Core/AtlasLoot.xml
+++ b/AtlasLoot/Core/AtlasLoot.xml
@@ -582,6 +582,7 @@
 			        </OnShow>
 					<OnClick>
 						AtlasLoot_10Man25ManToggle();
+						AtlasLoot_QueryLootPage();
 					</OnClick>
 				</Scripts>
 			</Button>
@@ -603,6 +604,7 @@
 					</OnLoad>
 					<OnClick>
 						AtlasLoot_HeroicModeToggle();
+						AtlasLoot_QueryLootPage();
 					</OnClick>
 				</Scripts>
 			</CheckButton>
@@ -626,6 +628,7 @@
                 <Scripts>
                     <OnClick>
                         AtlasLoot_NavButton_OnClick()
+						AtlasLoot_QueryLootPage();
                     </OnClick>
                     <OnShow>
 		                this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
@@ -645,6 +648,7 @@
 				</Anchors>
 				<Scripts>
                     <OnShow>
+						AtlasLoot_QueryLootPage();
                         local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
                         this:SetText(AL["Query Server"]);
 				        this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );
@@ -730,6 +734,7 @@
                 <Scripts>
                     <OnClick>
                         AtlasLoot_NavButton_OnClick()
+						AtlasLoot_QueryLootPage();
                     </OnClick>
                     <OnShow>
 		                this:SetFrameLevel( (this:GetParent()):GetFrameLevel() + 1 );