Add middleware to handle request/response socket timeouts
Add search