Updated for 4.21 fully working

just SimpleTs to TargetSelector.