refs 7044 modified setup facet