Fix Query.cs