[#11] change order of facet fields to match mockup