Fix tether helper and use consistent `.select-` prefix