Target Selector update

4.21 Target Selector