Implement search functionality
Use quotes for search
Merge branch 'client' into develop