Prepared YAML and fix scraping