Improved query