implemented full search functionallity
Merge branch 'feature-search'