New linq query, adjustments to report