fix search bug
finish situation before final test