Fix to json parsing
Applying json parse fix to all functions