Further tweaks to JSON response