Fixed some selector to be more effective