adding property watermark.default.expression + businessLogic flow fixes