Added search for client func