diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua
index 0f9751c..0963ba0 100644
--- a/AtlasLoot/Core/AtlasLoot.lua
+++ b/AtlasLoot/Core/AtlasLoot.lua
@@ -453,16 +453,7 @@ function AtlasLoot:ShowItemsFrame(dataID, dataSource, tablenum)
 	Atlasloot_HeaderLabel:Hide();
 
 	local dataSource_backup = dataSource;
-
-	if dataID == "SearchResult" or dataSource == " AtlasLootCharDB" then
-		dataSource = AtlasLootCharDB;
-	elseif dataSource == "AtlasLoot_TokenData" then
-		dataSource = AtlasLoot_TokenData;
-	elseif dataSource == "AtlasLootWishList" then
-		dataSource = AtlasLootWishList;
-	else
-		dataSource = AtlasLoot_Data;
-    end
+	dataSource = _G[dataSource] or AtlasLoot_Data;
 
 	-- Check to see if Atlas is loaded and the table has a map
 	if dataSource[dataID].Map and ATLASLOOT_ATLASLOADED then
diff --git a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua
index bdff4da..eb0c90c 100644
--- a/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua
+++ b/AtlasLoot/DefaultFrame/AtlaslootDefaultFrameCreate.lua
@@ -40,7 +40,7 @@ local AL = LibStub("AceLocale-3.0"):GetLocale("AtlasLoot");
      mainframe.header.txt:SetText(ATLASLOOT_VERSION);
      mainframe.header.notice = mainframe:CreateFontString("AtlasLootDefaultFrame_Notice","ARTWORK","GameFontNormal");
      mainframe.header.notice:SetPoint("BOTTOM",0,17);
- 
+
     --Loot Background
 local lootbground = CreateFrame("Frame", "AtlasLootDefaultFrame_LootBackground",AtlasLootDefaultFrame);
     lootbground:SetSize(540,515);