[neh] Use entire report number, including type