Fix select-all extension regression and refactoring