correct selection handling
Merge branch 'select_task_role'