Fix QueryResult's marshaller