Improved performance; Fixed blank field in scrape data