#4137 Facet tidying