Make Scraper handle email arguments better