Fixing issue referencing wrong headers
Updating forEach to handle non iterable values