Chunked query fix

see: SYNR-574