I'm not entirely sure I follow what the issue is. Wouldn't you just need to add those fields to your Select and Group By?