Fix QueryIT test failure
Fix QueryCompilerTest