Use new eager loading
Fix group_by logic