HPCC-8817 more changes based on comments on hpcc-8817

Signed-off-by: Kevin Wang <kevin.wang@lexisnexis.com>