Add search view
Merged search view on dev branch