tightening up search