SONAR-5012 Change facet style and order