revert select-all fix pending further code review