Only insert values depending on heb type affinitic refs #5838