HOTFIX: Cleanup FacetEnum