Improve dealing with ebook names that include "-".