Added support for facet sorting