#8388 refactoring de selects