Fix layout for facets and results refs #21413 refs#21412