diff --git a/Modules/Expander.lua b/Modules/Expander.lua
index 92bd0d0..84fc4ac 100755
--- a/Modules/Expander.lua
+++ b/Modules/Expander.lua
@@ -63,6 +63,14 @@ function Expander:Refresh(fromCombat)
 			end
 		end
 		
+		MiniMapInstanceDifficulty:Hide()
+		GuildInstanceDifficulty:Hide()
+		MiniMapChallengeMode:Hide()
+		
+		if((Chinchilla:GetModule("Location", true) and Chinchilla:GetModule("Location"):IsEnabled())) then
+			Chinchilla:GetModule("Location"):Hide()
+		end
+			
 		if(self.db.profile.hideCombat) then
 			MinimapBackdrop:RegisterEvent('PLAYER_REGEN_DISABLED')
 			MinimapBackdrop:RegisterEvent('PLAYER_REGEN_ENABLED')
@@ -111,6 +119,12 @@ function Expander:Refresh(fromCombat)
 			end
 		end
 		
+		if((Chinchilla:GetModule("Location", true) and Chinchilla:GetModule("Location"):IsEnabled())) then
+			Chinchilla:GetModule("Location"):Show()
+		end
+		
+		MiniMapInstanceDifficulty_Update()
+
 		if(self.db.profile.hideCombat and fromCombat ~= true) then
 			MinimapBackdrop:UnregisterEvent('PLAYER_REGEN_DISABLED')
 			MinimapBackdrop:UnregisterEvent('PLAYER_REGEN_ENABLED')
diff --git a/Modules/Location.lua b/Modules/Location.lua
index fb1beff..ed59b18 100755
--- a/Modules/Location.lua
+++ b/Modules/Location.lua
@@ -216,6 +216,13 @@ function Location:SetMovable(value)
 	else frame:RegisterForDrag() end
 end
 
+function Location:Hide()
+	frame:Hide()
+end
+
+function Location:Show()
+	frame:Show()
+end
 
 function Location:GetOptions()
 	return {