Improving the individual deliverables query