DDBEASY 246 - Merge fix for facets.