Refactor views add search