Query21 updates; Query3 configuration changes