HPCC-11452 Ensure control:queries does not split lines

Additioanl fixes needed for 5.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>