Ironed out some code issues with facet configuration.