Fix searches that used to employ entity matching