search issue fix3