Renamed facet fields
Fixed facets, don't index complex objects such as superorder