HPCC-9018 Update based on review and add reporting of invalid queryid

Signed-off-by: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>