Model changes to deal with scraping problems associated with issue #372