Refs #15669; Updated facets and columns according to latest version of data