--- a/QuestPOI.lua	Thu May 18 16:44:05 2017 -0400
+++ b/QuestPOI.lua	Thu May 25 17:24:00 2017 -0400
@@ -40,8 +40,8 @@
 local dprint = DEVIAN_WORKSPACE and function(...) _G.print('WQData', ...) end or nop
 local QuestPOI = WorldPlanPOIMixin
 
-local pinBaseIndex = 1520
-local overlayBaseIndex = 1580
+local pinBaseIndex = 1400
+local overlayBaseIndex = 1450
 local previousHighlight
 
 local FADE_TIMING_MULTIPLIER = 3
@@ -530,15 +530,11 @@
     return
   end
 
-  if self.maxAlertLevel then
+  if self.isStale then
+    self:Refresh()
+  elseif self.maxAlertLevel then
     self:UpdateStatus()
   end
-
-
-  if self.isStale then
-    self:Refresh()
-  end
-
 end
 
 
@@ -936,8 +932,10 @@
     print('queued for Refresh')
     self.isStale = true
     return nil
+  elseif IsQuestComplete(self.questID) then
+    self:Release()
+    return nil
   end
-
   if self.checkCriteria then
     self:OnCriteria()
   end
@@ -1071,21 +1069,21 @@
   self.tagIcon:SetAtlas(self.tagAtlas)
   self.EliteBorder:SetShown(self.isElite and not self.filtered)
 
-  self:UpdateStatus()
 
   if self.isBounty then
-    --print('is bounty')
+    print('is bounty')
     iconBorder:SetVertexColor(trackingBorder:GetVertexColor())
     trackingBorder:SetVertexColor(unpack(BORDER_SELECTED_BOUNTY))
   elseif self.isCriteria then
-    --print('is criteria of a bounty')
+    print('is criteria of a bounty')
     iconBorder:SetVertexColor(trackingBorder:GetVertexColor())
     trackingBorder:SetVertexColor(unpack(BORDER_CRITERIA))
   else
-
+    print('is nothing')
     iconBorder:SetVertexColor(unpack(borderColor))
     trackingBorder:SetVertexColor(0,0,0,.5)
   end
+  self:UpdateStatus()
 
   if SpellCanTargetQuest() then
     if self.isSpellTarget then
@@ -1125,9 +1123,6 @@
         tl = timeState
         self.timeLabel:SetText(text)
       end
-      if style then
-        self.RewardBorder:SetVertexColor(style.r, style.g, style.b, style.a)
-      end
     end
 
     self.alertLevel = tl