Improve Data Query view

The JSON is now pretty formatted so it is easy to understand and change.