More tweaks on targetid healthvalues