Fixed some bugs at scrapper and results