Replaced QueryResponse/QueryResult by new versions.