Fixing the context passed to the HTML templates, and expanding the JSON result space a bit.