search issue fix2