diff --git a/ElvUI_MerathilisUI/Modules/Maps/EventTracker.lua b/ElvUI_MerathilisUI/Modules/Maps/EventTracker.lua
index 171fc2724..41389e5fa 100644
--- a/ElvUI_MerathilisUI/Modules/Maps/EventTracker.lua
+++ b/ElvUI_MerathilisUI/Modules/Maps/EventTracker.lua
@@ -1298,7 +1298,6 @@ function module:GetPlayerDB(key)
 end
 
 function module:UpdateTrackers()
-	self:UnhookAll()
 	self:ConstructFrame()
 
 	self.frame:ClearAllPoints()
@@ -1407,8 +1406,8 @@ function module:Initialize()
 	EventRegistry:RegisterCallback("WorldMapOnShow", self.UpdateTrackers, self)
 	EventRegistry:RegisterCallback("WorldMapMinimized", E.Delay, E, 0.1, self.UpdateTrackers, self)
 	EventRegistry:RegisterCallback("WorldMapMaximized", E.Delay, E, 0.1, self.UpdateTrackers, self)
-	self:SecureHook(_G.QuestMapFrame, "Show", "UpdateTrackers")
-	self:SecureHook(_G.QuestMapFrame, "Hide", "UpdateTrackers")
+	-- self:SecureHook(_G.QuestMapFrame, "Show", "UpdateTrackers")
+	-- self:SecureHook(_G.QuestMapFrame, "Hide", "UpdateTrackers")
 end
 
 function module:ProfileUpdate()
diff --git a/ElvUI_MerathilisUI/Modules/Maps/WorldMap.lua b/ElvUI_MerathilisUI/Modules/Maps/WorldMap.lua
index 9953cbb68..44957cfb3 100644
--- a/ElvUI_MerathilisUI/Modules/Maps/WorldMap.lua
+++ b/ElvUI_MerathilisUI/Modules/Maps/WorldMap.lua
@@ -2590,7 +2590,6 @@ function module:Initialize()
 		return
 	end
 
-	_G.QuestMapFrame:SetScript("OnHide", nil) -- fix potential toggle taint with HandyNotes or any other WQ AddOn
 	self:Scale()
 	self:Reveal()
 end
diff --git a/ElvUI_MerathilisUI/Options/Misc.lua b/ElvUI_MerathilisUI/Options/Misc.lua
index ce50c703c..845a3c915 100644
--- a/ElvUI_MerathilisUI/Options/Misc.lua
+++ b/ElvUI_MerathilisUI/Options/Misc.lua
@@ -62,37 +62,31 @@ options.general = {
 			name = L["Hide Boss Banner"],
 			desc = L["This will hide the popup, that shows loot, after you kill a boss"],
 		},
-		quickDelete = {
-			order = 7,
-			type = "toggle",
-			name = L["Quick Delete"],
-			desc = L["This will add the 'DELETE' text to the Item Delete Dialog."],
-		},
 		tradeTabs = {
-			order = 8,
+			order = 7,
 			type = "toggle",
 			name = L["Trade Tabs"],
 			desc = L["Enable Tabs on the Profession Frames"],
 		},
 		spacer = {
-			order = 9,
+			order = 8,
 			type = "description",
 			name = " ",
 		},
 		missingStats = {
-			order = 10,
+			order = 9,
 			type = "toggle",
 			name = L["Missing Stats"],
 			desc = L["Show all stats on the Character Frame"],
 		},
 		blockRequest = {
-			order = 11,
+			order = 10,
 			type = "toggle",
 			name = L["Block Join Requests"],
 			desc = L["|nIf checked, only popout join requests from friends and guild members."],
 		},
 		hotKey = {
-			order = 12,
+			order = 11,
 			type = "toggle",
 			name = L["HotKey Above CD"],
 			desc = format(