renaming QuerySolution to Solution