Refactor AvailabilityPolicy to reflect new solr requirement for policy_facet