wait, target select is part of this PR as well? Please integrate my comments from the other PR then and close/mark the old one ;)