Reworked as discussed. Keeping the optional for now. Perhaps adding the facet name...