Improving :facet_fields_to_add_to_solr flexibility