Improved query.