Fix suffix_filter v2