Made facet fields more declarative.