Search views refactoring