fixes and improvements for new website extractions