Initial adaptation of the batch validator (dynamic queries need fixing).