Fix scrape bugs and duplication