Minor Update to Target Selection.  Refer to comments on #2128.