changes in QueryResult implementation