Changed settings to make sync queries customizable refs #18419