Allow setting the collection strategy on the query.
Update version.