diff --git a/C4/Matcher.pm b/C4/Matcher.pm
index e8a8ec3f74..77716f736c 100644
--- a/C4/Matcher.pm
+++ b/C4/Matcher.pm
@@ -838,10 +838,12 @@ sub _get_match_keys {
}
elsif ( $field->is_control_field() ) {
$string = $field->data();
- } else {
+ } elsif ( defined $component->{subfields} && keys %{$component->{subfields}} ){
$string = $field->as_string(
join('', keys %{ $component->{ subfields } }), ' ' # ' ' as separator
);
+ } else {
+ $string = $field->as_string();
}
if ($component->{'length'}>0) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-item-action.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-item-action.inc
index 27fb6dadbd..e58f05f551 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-item-action.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-item-action.inc
@@ -1,5 +1,6 @@
[% IF item_action_ignore AND num_items == 0 %]
No items were found during staging
+
[% ELSE %]