ENH speedup for emtpy searches