Enum extension + some other scraping fixes

If you remove the KeyError, remove the comment related to it also