fix for multiple of the same headers and getter for rawFields