Minor changes to be consistent with the old version. Using QueryIds greater than 1000000