Search function working.
Merge branch 'search-function'