YH-253: Improved tet search matching