Improved the target selector.