fix parse_raw_value to handle multiple fields