diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authority-information.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/authority-information.inc
index 53e391da2b..9bd43f41ee 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authority-information.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/authority-information.inc
@@ -21,74 +21,90 @@
[% END %]
[% CASE 'activity' %]
-
-
- Field of activity: [% info.field_of_activity | html %]
- [% IF info.start_period || info.end_period %]
- (
- [%~ IF info.start_period %]from: [% info.start_period | html %][% END %]
- [% IF info.end_period %]until: [% info.end_period | html %][% END ~%]
- )
- [% END %]
-
-
+ [% IF info.field_of_activity %]
+
+
+ Field of activity: [% info.field_of_activity | html %]
+ [% IF info.start_period || info.end_period %]
+ (
+ [%~ IF info.start_period %]from: [% info.start_period | html %][% END %]
+ [% IF info.end_period %]until: [% info.end_period | html %][% END ~%]
+ )
+ [% END %]
+
+
+ [% END %]
[% CASE 'address' %]
-
- Address: [% info.address | html %] [% info.postal_code | html %] [% info.city | html %] [% info.country | html %]
-
+ [% IF info.address %]
+
+ Address: [% info.address | html %] [% info.postal_code | html %] [% info.city | html %] [% info.country | html %]
+
+ [% END %]
[% CASE 'associated_group' %]
-
-
- Associated group: [% info.associated_group | html %]
- [% IF info.start_period || info.end_period %]
- (
- [%~ IF info.start_period %]from: [% info.start_period | html %][% END %]
- [% IF info.end_period %]until: [% info.end_period | html %][% END ~%]
- )
- [% END %]
- [% IF info.uri %]URI: [% info.uri | html %]
[% END %]
- [% IF info.source_of_information %]Source of information: [% info.source_of_information | html %]
[% END %]
- [% IF info.authority_record_number %]Authority record control number or standard number: [% info.authority_record_number | html %]
[% END %]
-
-
+ [% IF info.associated_group %]
+
+
+ Associated group: [% info.associated_group | html %]
+ [% IF info.start_period || info.end_period %]
+ (
+ [%~ IF info.start_period %]from: [% info.start_period | html %][% END %]
+ [% IF info.end_period %]until: [% info.end_period | html %][% END ~%]
+ )
+ [% END %]
+ [% IF info.uri %]URI: [% info.uri | html %]
[% END %]
+ [% IF info.source_of_information %]Source of information: [% info.source_of_information | html %]
[% END %]
+ [% IF info.authority_record_number %]Authority record control number or standard number: [% info.authority_record_number | html %]
[% END %]
+
+
+ [% END %]
[% CASE 'email_address' %]
-
-
- Email address: [% info.email_address | html %]
-
-
+ [% IF info.email_address %]
+
+
+ Email address: [% info.email_address | html %]
+
+
+ [% END %]
[% CASE 'occupation' %]
-
-
- Occupation: [% info.occupation | html %]
- [% IF info.start_period || info.end_period %]
- (
- [%~ IF info.start_period %]from: [% info.start_period | html %][% END %]
- [% IF info.end_period %]until: [% info.end_period | html %][% END ~%]
- )
- [% END %]
- [% IF info.uri %]URI: [% info.uri | html %]
[% END %]
- [% IF info.source_of_information %]Source of information: [% info.source_of_information | html %]
[% END %]
- [% IF info.authority_record_number %]Authority record control number or standard number: [% info.authority_record_number | html %]
[% END %]
-
-
+ [% IF info.occupation %]
+
+
+ Occupation: [% info.occupation | html %]
+ [% IF info.start_period || info.end_period %]
+ (
+ [%~ IF info.start_period %]from: [% info.start_period | html %][% END %]
+ [% IF info.end_period %]until: [% info.end_period | html %][% END ~%]
+ )
+ [% END %]
+ [% IF info.uri %]URI: [% info.uri | html %]
[% END %]
+ [% IF info.source_of_information %]Source of information: [% info.source_of_information | html %]
[% END %]
+ [% IF info.authority_record_number %]Authority record control number or standard number: [% info.authority_record_number | html %]
[% END %]
+
+
+ [% END %]
[% CASE 'place_of_birth' %]
-
-
- Place of birth: [% info.place_of_birth | html %]
-
-
+ [% IF info.place_of_birth %]
+
+
+ Place of birth: [% info.place_of_birth | html %]
+
+
+ [% END %]
[% CASE 'place_of_death' %]
-
-
- Place of death: [% info.place_of_death | html %]
-
-
+ [% IF info.place_of_death %]
+
+
+ Place of death: [% info.place_of_death | html %]
+
+
+ [% END %]
[% CASE 'uri' %]
-
-
- URI: [% info.uri | $raw | html %]
-
-
+ [% IF info.uri %]
+
+
+ URI: [% info.uri | $raw | html %]
+
+
+ [% END %]
[% END %]
[% END %]