Refactor facet highlighting and fix all field query