repaired search #2