Fixing merge issues in query validator, still one test failure present