Target Selector update

Requested @ http://www.joduska.me/forum/tracker/issue-138-target-selector/