Fixes for the contact and watcher selectors so that they properly handle
empty selections.