To-do new js selector fix