Added searchbar support
Merge