fix(selector): fix all the mess