Updated hand collections to use proper queries.