HPCC-10930 Better support in regression suite for targeting specific queries

Update after review

Signed-off-by: Attila Vamos <attila.vamos@gmail.com>