Added multiple facet types (checkbox and range)