Adding some checking in facet branches