Better fix for issue with multiple-word name facets.