--- a/WorldQuests.lua	Sun Dec 25 13:04:57 2016 -0500
+++ b/WorldQuests.lua	Sun Dec 25 15:17:35 2016 -0500
@@ -98,6 +98,7 @@
     db.QuestsByZone[areaID] = {}
   end
 
+  -- WORLD_MAP_UPDATE and PLAYER_ENTERING_WORLD are passed down from a higher level
   self:RegisterEvent('WORLD_QUEST_COMPLETED_BY_SPELL')
   self:RegisterEvent('SKILL_LINES_CHANGED')
 
@@ -105,10 +106,14 @@
 
 end
 
+function WorldQuests:OnMapInfo()
+  self:Refresh(true)
+end
+
 function WorldQuests:OnEvent (event, ...)
 
   print('|cFFFFFF00'..self:GetName()..':OnEvent() '..event..'|r', GetTime(), ...)
-  if event == 'QUEST_LOG_UPDATE' or event == 'PLAYER_LOGIN' then
+  if event == 'QUEST_LOG_UPDATE' then
     local questID, added = ...
     if questID and added then
       local questPOI = self:AcquirePin(questID)
@@ -119,8 +124,6 @@
       self:Refresh(true)
     end
     print('WorldMapFrame', WorldMapFrame:IsVisible(), 'hasUpdates:', self.isStale)
-  elseif event == 'WORLD_MAP_UPDATE' then
-    self:Refresh(true)
   elseif event == 'WORLD_QUEST_COMPLETED_BY_SPELL' then
     local questID = ...
     if questID and db.QuestsByID[questID] then