Replace JSON arrays with JSON objects in VALUES and WHERE clauses in the marshal output