Improved query performance