Fixed 404
Improvements to JSON conversion.