Pushed selection fix to other selectors