Fix for failing to find names with hyphens, and for not displaying hyphenated names correctly