Fix bug in facet matcher