fit search bug and add some info