Feature/search

merge the search feature set.