impr(selector): new selector approach