And here is how Haimi's numbers correspond to The N.A.F.H. "huge mass grave" numbering system:

Haimi's "grave" #17 = The N.A.F.H. "Huge Mass Grave" #17/78

Haimi's "grave" #18 = The N.A.F.H. "Huge Mass Grave" #18/79

Haimi's "grave" #19 = The N.A.F.H. "Huge Mass Grave" #19/80

Haimi's "grave" #20 = The N.A.F.H. "Huge Mass Grave" #20/81

"Grave" #21 = The N.A.F.H. "Huge Mass Grave" #21/82

"Grave" #22 = The N.A.F.H. "Huge Mass Grave" #22/83

Note: "Graves #21 and #22" are actually labeled by Yoram Haimi as "Objects 6094-6095." However, you cannot see his numbers clearly in the map, so #21 and #22 have used instead. (The numbers are in red, below the orange colored "graves.")