Moved handling of blank field to scraper