Fixed #158. Improve .json and .html