First clean up of #151 - only one match withing target selector supported.