search issue fix5