Fixed up some commenting on the Query method