changed QueryResult implementation
minor changes