Add smal pack of fixes. Add new function for search.