search issue fix7