Fixed CDI Facet detection logic