add search bar
Merge