Added module names + Format query to JSON output.