Updated facet processing to properly proess range facets