Added ordering to data spec and facets, facets collapsed by default