Select View refactoring