More Query3 configuration changes