Changed JSON handling a bit in JSON test branch.

Changed "status" response structure.
Changed input query ID to query type name.