Fix for facet names with spaces