Finished adding json queries