search issue fix6