REVIEW-4292 small improvements to task selectors