Fixed more of the JSON query