Improved facet processing.