added search view
merge