diff --git a/api/unitframes.lua b/api/unitframes.lua
index c327db2e..72876637 100644
--- a/api/unitframes.lua
+++ b/api/unitframes.lua
@@ -1674,6 +1674,12 @@ function pfUI.uf:GetStatusValue(unit, pos)
     config = "unit"
   end
 
+  local mp, mpmax = UnitMana(unitstr), UnitManaMax(unitstr)
+  local hp, hpmax = UnitHealth(unitstr), UnitHealthMax(unitstr)
+  if unit.label == "target" and (MobHealth3 or MobHealthFrame) and MobHealth_GetTargetCurHP() then
+    hp, hpmax = MobHealth_GetTargetCurHP(), MobHealth_GetTargetMaxHP()
+  end
+
   if config == "unit" then
     local name = unit:GetColor("unit") .. UnitName(unitstr)
     local level = unit:GetColor("level") .. pfUI.uf:GetLevelString(unitstr)
@@ -1689,84 +1695,52 @@ function pfUI.uf:GetStatusValue(unit, pos)
 
   -- health
   elseif config == "health" then
-    if unit.label == "target" and MobHealth3 then
-      local hp, hpmax = MobHealth3:GetUnitHealth(unit.label)
-      return unit:GetColor("health") .. pfUI.api.Abbreviate(hp)
-    elseif unit.label == "target" and MobHealthFrame and MobHealth_GetTargetCurHP() then
-      local hp = MobHealth_GetTargetCurHP()
-      return unit:GetColor("health") .. pfUI.api.Abbreviate(hp)
-    end
-    return unit:GetColor("health") .. pfUI.api.Abbreviate(UnitHealth(unitstr))
+    return unit:GetColor("health") .. pfUI.api.Abbreviate(hp)
   elseif config == "healthmax" then
-    if unit.label == "target" and MobHealth3 then
-      local hp, hpmax = MobHealth3:GetUnitHealth(unit.label)
-      return unit:GetColor("health") .. pfUI.api.Abbreviate(hpmax)
-    elseif unit.label == "target" and MobHealthFrame and MobHealth_GetTargetMaxHP() then
-      local hpmax = MobHealth_GetTargetMaxHP()
-      return unit:GetColor("health") .. pfUI.api.Abbreviate(hpmax)
-    end
-    return unit:GetColor("health") .. pfUI.api.Abbreviate(UnitHealthMax(unitstr))
+    return unit:GetColor("health") .. pfUI.api.Abbreviate(hpmax)
   elseif config == "healthperc" then
-    return unit:GetColor("health") .. ceil(UnitHealth(unitstr) / UnitHealthMax(unitstr) * 100)
+    return unit:GetColor("health") .. ceil(hp / hpmax * 100)
   elseif config == "healthmiss" then
-    local health = ceil(UnitHealth(unitstr) - UnitHealthMax(unitstr))
-    if health == 0 or UnitIsDead(unitstr) then
-      return ""
+    local health = ceil(hp - hpmax)
+    if UnitIsDead(unitstr) then
+      return unit:GetColor("health") .. DEAD
+		elseif health == 0 then
+      return unit:GetColor("health") .. "0"
     else
       return unit:GetColor("health") .. pfUI.api.Abbreviate(health)
     end
   elseif config == "healthdyn" then
-    if UnitHealth(unitstr) ~= UnitHealthMax(unitstr) then
-      if unit.label == "target" and MobHealth3 then
-        local hp, hpmax = MobHealth3:GetUnitHealth(unit.label)
-        return unit:GetColor("health") .. pfUI.api.Abbreviate(hp) .. " - " .. ceil(hp / hpmax * 100) .. "%"
-      elseif unit.label == "target" and MobHealthFrame and MobHealth_GetTargetCurHP() then
-        local hp, hpmax = MobHealth_GetTargetCurHP(),MobHealth_GetTargetMaxHP()
-        return unit:GetColor("health") .. pfUI.api.Abbreviate(hp) .. " - " .. ceil(hp / hpmax * 100) .. "%"
-      end
-      return unit:GetColor("health") .. pfUI.api.Abbreviate(UnitHealth(unitstr)) .. " - " .. ceil(UnitHealth(unitstr) / UnitHealthMax(unitstr) * 100) .. "%"
+    if hp ~= hpmax then
+      return unit:GetColor("health") .. pfUI.api.Abbreviate(hp) .. " - " .. ceil(hp / hpmax * 100) .. "%"
     else
-      if unit.label == "target" and MobHealth3 then
-        local hp, hpmax = MobHealth3:GetUnitHealth(unit.label)
-        return unit:GetColor("health") .. pfUI.api.Abbreviate(hp)
-      elseif unit.label == "target" and MobHealthFrame and MobHealth_GetTargetCurHP() then
-        local hp = MobHealth_GetTargetCurHP()
-        return unit:GetColor("health") .. pfUI.api.Abbreviate(hp)
-      end
-      return unit:GetColor("health") .. pfUI.api.Abbreviate(UnitHealth(unitstr))
+      return unit:GetColor("health") .. pfUI.api.Abbreviate(hp)
     end
   elseif config == "healthminmax" then
-    local hp, hpmax = UnitHealth(unitstr), UnitHealthMax(unitstr)
-    if unit.label == "target" and MobHealth3 then
-      hp, hpmax = MobHealth3:GetUnitHealth(unit.label)
-    elseif unit.label == "target" and MobHealthFrame and MobHealth_GetTargetCurHP() then
-      local hp, hpmax = MobHealth_GetTargetCurHP(), MobHealth_GetTargetMaxHP()
-    end
     return unit:GetColor("health") .. pfUI.api.Abbreviate(hp) .. "/" .. pfUI.api.Abbreviate(hpmax)
 
   -- mana/power/focus
   elseif config == "power" then
-    return unit:GetColor("power") .. pfUI.api.Abbreviate(UnitMana(unitstr))
+    return unit:GetColor("power") .. pfUI.api.Abbreviate(mp)
   elseif config == "powermax" then
-    return unit:GetColor("power") .. pfUI.api.Abbreviate(UnitManaMax(unitstr))
+    return unit:GetColor("power") .. pfUI.api.Abbreviate(mpmax)
   elseif config == "powerperc" then
-    local perc = UnitManaMax(unitstr) > 0 and ceil(UnitMana(unitstr) / UnitManaMax(unitstr) * 100) or 0
+    local perc = UnitManaMax(unitstr) > 0 and ceil(mp / mpmax * 100) or 0
     return unit:GetColor("power") .. perc
   elseif config == "powermiss" then
-    local power = ceil(UnitMana(unitstr) - UnitManaMax(unitstr))
+    local power = ceil(mp - mpmax)
     if power == 0 then
-      return ""
+      return unit:GetColor("power") .. "0"
     else
       return unit:GetColor("power") .. pfUI.api.Abbreviate(power)
     end
   elseif config == "powerdyn" then
-    if UnitMana(unitstr) ~= UnitManaMax(unitstr) then
-      return unit:GetColor("power") .. pfUI.api.Abbreviate(UnitMana(unitstr)) .. " - " .. ceil(UnitMana(unitstr) / UnitManaMax(unitstr) * 100) .. "%"
+    if mp ~= mpmax then
+      return unit:GetColor("power") .. pfUI.api.Abbreviate(mp) .. " - " .. ceil(mp / mpmax * 100) .. "%"
     else
-      return unit:GetColor("power") .. pfUI.api.Abbreviate(UnitMana(unitstr))
+      return unit:GetColor("power") .. pfUI.api.Abbreviate(mp)
     end
   elseif config == "powerminmax" then
-    return unit:GetColor("power") .. pfUI.api.Abbreviate(UnitMana(unitstr)) .. "/" .. pfUI.api.Abbreviate(UnitManaMax(unitstr))
+    return unit:GetColor("power") .. pfUI.api.Abbreviate(mp) .. "/" .. pfUI.api.Abbreviate(mpmax)
   else
     return ""
   end
diff --git a/modules/nameplates.lua b/modules/nameplates.lua
index 8de284f1..a19dfad8 100644
--- a/modules/nameplates.lua
+++ b/modules/nameplates.lua
@@ -548,6 +548,9 @@ pfUI:RegisterModule("nameplates", function ()
     if C.nameplates.showhp == "1" and healthbar.hptext then
       local min, max = healthbar:GetMinMaxValues()
       local cur = healthbar:GetValue()
+      if (MobHealth3 or MobHealthFrame) and unitname == UnitName('target') and healthbar:GetAlpha() == 1 and MobHealth_GetTargetCurHP() then
+        cur, max = MobHealth_GetTargetCurHP(), MobHealth_GetTargetMaxHP()
+      end
       healthbar.hptext:SetText(cur .. " / " .. max)
     end
   end