Temporary fix for ExecutableScenario Query!