Improvements to domain extraction and filenames