Pull request for: Facet improvements