wrap-json: Update and fixes for y/Y