CreateProblem fixes
Add query to Scenarios