Make shallow searches less dependent on TT