Small changes to start to have better JSON responses