Remove double JSON serialization.
Add more data in JSON response (cf. Osiris).