#4137 Facet tidy up