Got passage term matching into a working(?) state