Improve assignee selector