Fix FacetEnum references
Refactoring facets
Merge branch 'APD-503-BOZ' into develop