diff --git a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml
index eb62dd503f..de577816a9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml
+++ b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml
@@ -824,7 +824,7 @@
     </Position>
     <Position pos="20"><name>Format of music</name><description>One-character code that indicates the format of a musical composition (e.g., piano-conductor score). "Staff notation" in this element refers to music written using staves. "Musical notation" refers to music written using staves or graphic, symbolic, or word-based notation.</description>
       <Value code="a"><description>Full score</description></Value>
-      <Value code="b"><description>Full score, miniature or study size</description></Value>
+      <Value code="b"><description>Miniature or study size</description></Value>
       <Value code="c"><description>Accompaniment reduced for keyboard</description></Value>
       <Value code="d"><description>Voice score with accompaniment omitted</description></Value>
       <Value code="e"><description>Condensed score or piano-conductor score</description></Value>
@@ -836,6 +836,7 @@
       <Value code="l"><description>Score</description></Value>
       <Value code="m"><description>Multiple score formats</description></Value>
       <Value code="n"><description>Not applicable</description></Value>
+      <Value code="p"><description>Piano score</description></Value>
       <Value code="u"><description>Unknown</description></Value>
       <Value code="z"><description>Other</description></Value>
       <Value code="|"><description>No attempt to code</description></Value>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-widgets-marc21.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-widgets-marc21.inc
index 6db5d7e5ca..ba049d5239 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-widgets-marc21.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-widgets-marc21.inc
@@ -57,6 +57,7 @@
             <option value="a">a - AACR 2</option>
             <option value="c">c - ISBD punctuation omitted</option>
             <option value="i">i - ISBD punctuation included</option>
+            <option value="n">n - Non-ISBD punctuation omitted</option>
             <option value="u">u - Unknown</option>
         </select>
         <select name="f19" title="Multipart record resource level">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tt
index 76a4070097..feb2e7e4e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tt
@@ -806,6 +806,15 @@ function RedrawChoices(typ){
                                   _("r- Remote") +
                               '</option> \
                              [% END %] \
+                 [% IF ( f1s ) %] \
+                              <option value="s" selected="selected">' +
+                                  _("s- Standalone device") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="s">' +
+                                  _("s- Standalone device") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f1u ) %] \
                               <option value="u" selected="selected">' +
                                   _("u- Unspecified") +
@@ -7546,6 +7555,15 @@ function RedrawChoices(typ){
                                   _("q- Roll") +
                               '</option> \
                              [% END %] \
+                [% IF ( f1r ) %] \
+                              <option value="r" selected="selected">' +
+                                  _("r- Remote") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="r">' +
+                                  _("r- Remote") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f1s ) %] \
                               <option value="s" selected="selected">' +
                                   _("s- Sound cassette") +
@@ -7726,6 +7744,15 @@ function RedrawChoices(typ){
                                   _("m- 3/34 ips (tapes)") +
                               '</option> \
                              [% END %] \
+                             [% IF ( f3n ) %] \
+                              <option value="n" selected="selected">' +
+                                  _("n- Not applicable") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="n">' +
+                                  _("n- Not applicable") +
+                              '</option> \
+                             [% END %] \
                              [% IF ( f3o ) %] \
                               <option value="o" selected="selected">' +
                                   _("o- 7 1/2 ips (tapes)") +
@@ -8410,6 +8437,15 @@ function RedrawChoices(typ){
                                   _("m- Plastic with metal") +
                               '</option> \
                              [% END %] \
+                             [% IF ( f10n ) %] \
+                              <option value="n" selected="selected">' +
+                                  _("n- Not applicable") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="n">' +
+                                  _("n- Not applicable") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f10p ) %] \
                               <option value="p" selected="selected">' +
                                   _("p- Plastic") +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tt
index a02a93eafa..e958d42e1e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tt
@@ -272,6 +272,11 @@
 				[% ELSE %]
 					<option value="i">i- ISBD punctuation included</option>
 				[% END %]
+                [% IF ( f18n ) %]
+                    <option value="n" selected="selected">n- Non-ISBD punctuation omitted</option>
+                [% ELSE %]
+                    <option value="n">n- Non-ISBD punctuation omitted</option>
+                [% END %]
 				[% IF ( f18u ) %]
 					<option value="u" selected="selected">u- Unknown</option>
 				[% ELSE %]