uses name attribute for watchers selection
Merge pull request #1633 from opf/fix/name_format_on_watchers_selection

uses name attribute for watchers selection