Improving team and individual deliverables SQL queries