Vinay | #845 | Add search functionality to client