Change SimpleTS to TargetSelector (4.21 update)