Updated to new facet JSON format