Apply 80_fix_string_search.patch