Improved select query for DiscountReport