386.09 Slight changes to JSON_parser to align with g2 code