Add requests and improve search