Late changes due to suggestions partially broke CSV processing such that values were not properly evaluated thus resulting in values not being included in output. Change-Id: I90a29741149d7718175fceb0f77071e4ce13ef03