Adjust properties in Query validator