JSON: Fixed watermark logic