Minor changes on EntityFacetEnum