diff --git a/C4/Search.pm b/C4/Search.pm
index 3d74adbeb9..8f2681a5e7 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -711,7 +711,7 @@ sub _get_facets_data_from_record {
                 next if $field->indicator(1) eq 'z';
 
                 my $data = $field->as_string( $subfield_letters, $facet->{ sep } );
-                $data =~ s/\s*(?<![A-Z])[.\-,;]*\s*$//;
+                $data =~ s/\s*(?<!\p{Uppercase})[.\-,;]*\s*$//;
 
                 unless ( grep { /^\Q$data\E$/ } @used_datas ) {
                     push @used_datas, $data;
@@ -810,7 +810,7 @@ sub _get_facet_from_result_set {
     my $facets = {};
     foreach my $term ( @terms ) {
         my $facet_value = $term->textContent;
-        $facet_value =~ s/\s*(?<![A-Z])[.\-,;]*\s*$//;
+        $facet_value =~ s/\s*(?<!\p{Uppercase})[.\-,;]*\s*$//;
         $facet_value =~ s/\Q$internal_sep\E/$sep/ if defined $sep;
         $facets->{ $facet_value } =  ( defined $facets->{$facet_value} ) ? $facets->{ $facet_value } + $term->getAttribute( 'occur' ) : $term->getAttribute( 'occur' );
     }
diff --git a/admin/searchengine/elasticsearch/index_config.yaml b/admin/searchengine/elasticsearch/index_config.yaml
index dfae04dd97..e424e92a0b 100644
--- a/admin/searchengine/elasticsearch/index_config.yaml
+++ b/admin/searchengine/elasticsearch/index_config.yaml
@@ -39,6 +39,6 @@ index:
         replacement: ''
       facet:
         type: pattern_replace
-        pattern: '\s*(?<![A-Z])[.\-,;]*\s*$'
+        pattern: '\s*(?<!\p{Lu})[.\-,;]*\s*$'
         replacement: ''
 index.mapping.total_fields.limit: 10000