From 67dae3abd4bbd5394c62eaeccfa67d9c0220a627 Mon Sep 17 00:00:00 2001
From: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Date: Mon, 7 Jan 2013 19:10:56 -0300
Subject: [PATCH] Bug 9358 - Fixed field plugins for MARC21 should be updated
 for MARC21 update #15

This patch, together with 9357, fix plugins for leader, 006, 007 and 008 MARC21 fields

Leader18 c and i is fixed on Bug 9357

Added missing/renamed fields on 007

Options 'o' and 'q' already present on 006 and 008,
fixing spaces and removing unnecessary descriptions.

To test:
1) Catalog/edit a record
2) On 007 value builder, check missing values
   on 008, BKS, check for example 33- Literary form,
   i- Letters has a description
3) Apply the patch
4) Clean your browser cache
5) On 007 value builder, new values are present
   On 008/6 descriptions are absent

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
---
 .../value_builder/marc21_field_006.xml        | 198 ++++++------
 .../value_builder/marc21_field_007.tt         | 301 +++++++++++++++++-
 .../value_builder/marc21_field_008.xml        | 292 ++++++++---------
 3 files changed, 544 insertions(+), 247 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.xml b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.xml
index e6cf2f55d7..8613a3c1c6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.xml
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Tagfield tag="006" xmlns="http://koha-community.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= "./marc21_field_CF.xsd">
+<Tagfield tag="006" xmlns="http://koha-community.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="./marc21_field_CF.xsd">
   <Material id="BKS" name="Books" description="">
     <Position pos="00" name="Form of material" description="">
       <Value description="Language material">a</Value>
@@ -51,25 +51,25 @@
     </Position>
     <Position pos="07-10" name="Nature of contents" description="Up to four one-character codes that indicate whether a significant part of the item is or contains certain types of material. If fewer than four codes are assigned, the codes are left justified and unused positions contain blanks (#)">
       <Value description="No specified nature of contents">#</Value>
-      <Value description="Offprints.Publication that originally was published as an article in a monograph or a serial and that is also issued separately and independently. Includes prepints and postprints">2</Value>
+      <Value description="Offprints">2</Value>
       <Value description="Calendars">5</Value>
       <Value description="Comics/graphic novels">6</Value>
-      <Value description="Abstracts/summaries. Abstracts or summaries of other publications. Not used when a publication includes an abstract or summary of its own content.">a</Value>
+      <Value description="Abstracts/summaries">a</Value>
       <Value description="Bibliographies">b</Value>
       <Value description="Catalogs">c</Value>
-      <Value description="Dictionaries. Also used for a glossary or a gazetteer.">d</Value>
+      <Value description="Dictionaries">d</Value>
       <Value description="Encyclopedias">e</Value>
       <Value description="Handbooks">f</Value>
       <Value description="Legal articles">g</Value>
-      <Value description="Indexes. Index to bibliographical material other than itself. Not used when a publication contains an index to its own content.">i</Value>
+      <Value description="Indexes">i</Value>
       <Value description="Patent document">j</Value>
       <Value description="Discographies">k</Value>
-      <Value description="Legislation. Full or partial text of enactments of legislative bodies, published either in statute or in code form, or text of rules and regulations issued by executive or adminitrative agencies.">l</Value>
-      <Value description="Theses. Thesis, dissertation, or work identified as having been created to satisfy the requirements for an academic certification or degree.">m</Value>
-      <Value description="Surveys of literature in a subject area. Composed entirely of authored surveys that summarize what has been published about a subject.">n</Value>
-      <Value description="Reviews. Devoted entirely to critical reviews of published or performed works (e.g., books, films, sound recordings, theater)">o</Value>
+      <Value description="Legislation">l</Value>
+      <Value description="Theses">m</Value>
+      <Value description="Surveys of literature in a subject area">n</Value>
+      <Value description="Reviews">o</Value>
       <Value description="Programmed texts">p</Value>
-      <Value description="Filmographies. Entire item, or a significant part of it, is a filmography or other  bibliografy of moving images.">q</Value>
+      <Value description="Filmographies">q</Value>
       <Value description="Directories">r</Value>
       <Value description="Statistics">s</Value>
       <Value description="Technical reports">t</Value>
@@ -77,14 +77,14 @@
       <Value description="Legal cases and case notes">v</Value>
       <Value description="Law reports and digests">w</Value>
       <Value description="Yearbooks">y</Value>
-      <Value description="Treaties. Treaty or accord negotiated between two or more parties to settle a disagreement, establish a relationship, gran rights,etc.">z</Value>
+      <Value description="Treaties">z</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="11" name="Government publication" description="One-character code that indicates whether or not the item is published or produced by or for an international, national, state, provincial, or local government agency, or by any subdivision of such a body">
       <Value description="Not a government publication">#</Value>
       <Value description="Autonomous or semi-autonomous component">a</Value>
       <Value description="Multilocal">c</Value>
-      <Value description="Federal / National">f</Value>
+      <Value description="Federal/National">f</Value>
       <Value description="International intergovernmental">i</Value>
       <Value description="Local">l</Value>
       <Value description="Multistate">m</Value>
@@ -117,9 +117,9 @@
       <Value description="Essays">e</Value>
       <Value description="Novels">f</Value>
       <Value description="Humor, satires, etc.">h</Value>
-      <Value description="Letters. Single letter or collection of correspondence">i</Value>
-      <Value description="Short stories. Short story or collection of short stories.">j</Value>
-      <Value description="Mixed forms. Represents a variety of literary forms (e.g., poetry and short stories)">m</Value>
+      <Value description="Letters">i</Value>
+      <Value description="Short stories">j</Value>
+      <Value description="Mixed forms">m</Value>
       <Value description="Poetry">p</Value>
       <Value description="Speeches">s</Value>
       <Value description="Unknown">u</Value>
@@ -136,7 +136,7 @@
   </Material>
   <Material id="CF" name="Computer Files" description="">
     <Position pos="00" name="Form of material" description="">
-      <Value description="Computer file/ Electronic resource">m</Value>
+      <Value description="Computer file/Electronic resource">m</Value>
     </Position>
     <Position pos="01-04" name="Undefined" description="Each one contains a blank (#) or a fill character (|)"/>
     <Position pos="05" name="Target audience" description="One- character alphabetic code that describes the intellectual level of the target audience for which the material is intended">
@@ -158,10 +158,10 @@
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="07-08" name="Undefined" description="Two undefined character positions; each contains a blank (#) or a fill character (|)."/>
-    <Position pos="09" name="Type of computer file " description="One-character alphabetic code that indicates the type of computer file described in the bibliographic record">
+    <Position pos="09" name="Type of computer file" description="One-character alphabetic code that indicates the type of computer file described in the bibliographic record">
       <Value description="Numeric data">a</Value>
       <Value description="Computer program">b</Value>
-      <Value description="Representational. Pictorial or graphic information that can be manipulated in conjunction with other types of files to produce graphic patterns that can be used to interpret and give meaning to the information. Does not include a document in image format.">c</Value>
+      <Value description="Representational">c</Value>
       <Value description="Document">d</Value>
       <Value description="Bibliographic data">e</Value>
       <Value description="Font">f</Value>
@@ -179,7 +179,7 @@
       <Value description="Not a government publication">#</Value>
       <Value description="Autonomous or semi-autonomous component">a</Value>
       <Value description="Multilocal">c</Value>
-      <Value description="Federal / National">f</Value>
+      <Value description="Federal/National">f</Value>
       <Value description="International intergovernmental">i</Value>
       <Value description="Local">l</Value>
       <Value description="Multistate">m</Value>
@@ -197,7 +197,7 @@
       <Value description="Manuscript cartographic material">f</Value>
     </Position>
     <Position pos="01-04" name="Relief" description="Up to four one-character alphabetic codes that indicate the relief type specified on the item. Codes are recorded in order of their importance to the described item. If fewer than four codes are assigned, the codes are left justified and each unused position contains a blank (#).">
-      <Value description="No relief shown"># </Value>
+      <Value description="No relief shown">#</Value>
       <Value description="Contours">a</Value>
       <Value description="Shading">b</Value>
       <Value description="Gradient and bathymetric tints">c</Value>
@@ -207,14 +207,14 @@
       <Value description="Spot heights">g</Value>
       <Value description="Pictorially">i</Value>
       <Value description="Land forms">j</Value>
-      <Value description="Bathymetry/ isolines">k</Value>
+      <Value description="Bathymetry/isolines">k</Value>
       <Value description="Rock drawings">m</Value>
       <Value description="Other">z</Value>
       <Value description="No attempt to code">||||</Value>
     </Position>
     <Position pos="05-06" name="Projection" description="Two-character alphabetic code that indicates the projection used in producing the item.">
       <Value description="Projection not specified">##</Value>
-      <Value description="Aitoff ">aa</Value>
+      <Value description="Aitoff">aa</Value>
       <Value description="Gnomic">ab</Value>
       <Value description="Lambert's azimuthal equal area">ac</Value>
       <Value description="Orthographic">ad</Value>
@@ -226,49 +226,49 @@
       <Value description="Polar stereographic">ap</Value>
       <Value description="Azimuthal, specific type unknown">au</Value>
       <Value description="Azimutal, other">az</Value>
-      <Value description="Gall ">ba</Value>
+      <Value description="Gall">ba</Value>
       <Value description="Goode's homolographic">bb</Value>
       <Value description="Lambert's cylindrical equal area">bc</Value>
       <Value description="Mercator">bd</Value>
-      <Value description="Miller ">be</Value>
-      <Value description="Mollweide ">bf</Value>
-      <Value description="Sinusoidal ">bg</Value>
+      <Value description="Miller">be</Value>
+      <Value description="Mollweide">bf</Value>
+      <Value description="Sinusoidal">bg</Value>
       <Value description="Transverse Mercator">bh</Value>
-      <Value description="Gauss-Kruger ">bi</Value>
-      <Value description="Equirectangular ">bj</Value>
+      <Value description="Gauss-Kruger">bi</Value>
+      <Value description="Equirectangular">bj</Value>
       <Value description="Krovak">bk</Value>
       <Value description="Cassini-Soldner">bl</Value>
       <Value description="Oblique Mercator">bo</Value>
-      <Value description="Robinson ">br</Value>
+      <Value description="Robinson">br</Value>
       <Value description="Space oblique Mercator">bs</Value>
       <Value description="Cylindrical, specific type unknown">bu</Value>
       <Value description="Cylindrical, other">bz</Value>
       <Value description="Albers equal area">ca</Value>
-      <Value description="Bonne ">cb</Value>
+      <Value description="Bonne">cb</Value>
       <Value description="Lambert's conformal conic">cc</Value>
       <Value description="Equidistant conic">ce</Value>
       <Value description="Polyconic">cp</Value>
       <Value description="Conic, specific type unknown">cu</Value>
       <Value description="Conic, other">cz</Value>
-      <Value description="Armadillo ">da</Value>
-      <Value description="Butterfly ">db</Value>
-      <Value description="Eckert ">dc</Value>
+      <Value description="Armadillo">da</Value>
+      <Value description="Butterfly">db</Value>
+      <Value description="Eckert">dc</Value>
       <Value description="Goode's homolosine">dd</Value>
       <Value description="Miller's bipolar oblique conformal conic">de</Value>
-      <Value description="Van Der Grinten ">df</Value>
-      <Value description="Dimaxión ">dg</Value>
+      <Value description="Van Der Grinten">df</Value>
+      <Value description="Dimaxión">dg</Value>
       <Value description="Cordiform">dh</Value>
-      <Value description="Lambert conformal ">dl</Value>
+      <Value description="Lambert conformal">dl</Value>
       <Value description="Other">zz</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="07" name="Undefined" description="Undefined; contains a blank (#) or a fill character (|)."/>
     <Position pos="08" name="Type of cartographic material" description="One-character alphabetic code that indicates the type of cartographic item described.">
       <Value description="Single map">a</Value>
-      <Value description="Map Series. Number of related but physically separate and bibliographically distinct cartographic units intended by the producer(s) or issuing body(s) to form a single group.">b</Value>
-      <Value description="Map serial. Issued in successive parts bearing numerical or chronological designations and intended to be continued indefinitely">c</Value>
+      <Value description="Map Series">b</Value>
+      <Value description="Map serial">c</Value>
       <Value description="Globe">d</Value>
-      <Value description="Atlas ">e</Value>
+      <Value description="Atlas">e</Value>
       <Value description="Separate supplement to another work">f</Value>
       <Value description="Bound as part of another work">g</Value>
       <Value description="Unknown">u</Value>
@@ -280,7 +280,7 @@
       <Value description="Not a government publication">#</Value>
       <Value description="Autonomous or semi-autonomous component">a</Value>
       <Value description="Multilocal">c</Value>
-      <Value description="Federal / National">f</Value>
+      <Value description="Federal/National">f</Value>
       <Value description="International intergovernmental">i</Value>
       <Value description="Local">l</Value>
       <Value description="Multistate">m</Value>
@@ -296,11 +296,11 @@
       <Value description="Microfiche">b</Value>
       <Value description="Microopaque">c</Value>
       <Value description="Large print">d</Value>
-      <Value description="Braille ">f</Value>
-      <Value description="Online.  The resource is accessed by means of hardware and software connections to a communications network. If a distinction between types of electronic resources is not necessary, code s can be used as a generic code for any form of electronic resource.">o</Value>
-      <Value description="Direct electronic. Storage on a directly accessible tangible recording medium, e.g. disc, tape, playaway device, flashdrive, portable hard drive, etc. If a distinction between types of electronic resources is not necessary, code s can be used as a generic code for any form of electronic resource.">q</Value>
+      <Value description="Braille">f</Value>
+      <Value description="Online">o</Value>
+      <Value description="Direct electronic">q</Value>
       <Value description="Regular print reproduction">r</Value>
-      <Value description="Electronic. Intended for manipulation by a computer. May reside in a carrier accessed either directly or remotely, in some cases requiring the use of peripheral devices attached to the computer (e.g., a CD-ROM player). Not used for items that do not require the use of a computer (e.g., music compact discs, videodiscs). This code can be used as a generic code for any form of electronic resource. Codes o and q may be used if there is a need to separately identify online and direct electronic resources.">s</Value>
+      <Value description="Electronic">s</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="13" name="Undefined" description="Contains a blank (#) or a fill character (|)."/>
@@ -335,12 +335,12 @@
       <Value description="Anthems">an</Value>
       <Value description="Ballads">bd</Value>
       <Value description="Bluegrass music">bg</Value>
-      <Value description="Blues ">bl</Value>
-      <Value description="Ballets ">bt</Value>
+      <Value description="Blues">bl</Value>
+      <Value description="Ballets">bt</Value>
       <Value description="Chaconnes">ca</Value>
       <Value description="Chants, Other religions">cb</Value>
       <Value description="Chants, Christian">cc</Value>
-      <Value description="Concerti grossi ">cg</Value>
+      <Value description="Concerti grossi">cg</Value>
       <Value description="Chorales">ch</Value>
       <Value description="Chorale preludes">cl</Value>
       <Value description="Canons and rounds">cn</Value>
@@ -356,13 +356,13 @@
       <Value description="Fugues">fg</Value>
       <Value description="Flamenco">fl</Value>
       <Value description="Folk music">fm</Value>
-      <Value description="Fantasias ">ft</Value>
+      <Value description="Fantasias">ft</Value>
       <Value description="Gospel music">gm</Value>
       <Value description="Hymns">hy</Value>
       <Value description="Jazz">jz</Value>
       <Value description="Musical revues and comedies">mc</Value>
       <Value description="Madrigals">md</Value>
-      <Value description="Minuets ">mi</Value>
+      <Value description="Minuets">mi</Value>
       <Value description="Motets">mo</Value>
       <Value description="Motion picture music">mp</Value>
       <Value description="Marches">mr</Value>
@@ -372,7 +372,7 @@
       <Value description="Nocturnes">nc</Value>
       <Value description="Not applicable">nn</Value>
       <Value description="Operas">op</Value>
-      <Value description="Oratorios ">or</Value>
+      <Value description="Oratorios">or</Value>
       <Value description="Overtures">ov</Value>
       <Value description="Program music">pg</Value>
       <Value description="Passion music">pm</Value>
@@ -382,18 +382,18 @@
       <Value description="Passacaglias">ps</Value>
       <Value description="Part-songs">pt</Value>
       <Value description="Pavans">pv</Value>
-      <Value description=" Rock music">rc</Value>
+      <Value description="Rock music">rc</Value>
       <Value description="Rondos">rd</Value>
       <Value description="Ragtime music">rg</Value>
-      <Value description="Ricercars ">ri</Value>
+      <Value description="Ricercars">ri</Value>
       <Value description="Rhapsodies">rp</Value>
-      <Value description="Requiems ">rq</Value>
+      <Value description="Requiems">rq</Value>
       <Value description="Square dance music">sd</Value>
       <Value description="Songs">sg</Value>
-      <Value description="Sonatas ">sn</Value>
+      <Value description="Sonatas">sn</Value>
       <Value description="Symphonic poems">sp</Value>
       <Value description="Studies and exercises">st</Value>
-      <Value description="Suites ">su</Value>
+      <Value description="Suites">su</Value>
       <Value description="Symphonies">sy</Value>
       <Value description="Toccatas">tc</Value>
       <Value description="Teatro lirico">tl</Value>
@@ -449,11 +449,11 @@
       <Value description="Microfiche">b</Value>
       <Value description="Microopaque">c</Value>
       <Value description="Large print">d</Value>
-      <Value description="Braille ">f</Value>
-      <Value description="Online.  The resource is accessed by means of hardware and software connections to a communications network. If a distinction between types of electronic resources is not necessary, code s can be used as a generic code for any form of electronic resource.">o</Value>
-      <Value description="Direct electronic. Storage on a directly accessible tangible recording medium, e.g. disc, tape, playaway device, flashdrive, portable hard drive, etc. If a distinction between types of electronic resources is not necessary, code s can be used as a generic code for any form of electronic resource.">q</Value>
+      <Value description="Braille">f</Value>
+      <Value description="Online">o</Value>
+      <Value description="Direct electronic">q</Value>
       <Value description="Regular print reproduction">r</Value>
-      <Value description="Electronic. Intended for manipulation by a computer. May reside in a carrier accessed either directly or remotely, in some cases requiring the use of peripheral devices attached to the computer (e.g., a CD-ROM player). Not used for items that do not require the use of a computer (e.g., music compact discs, videodiscs). This code can be used as a generic code for any form of electronic resource. Codes o and q may be used if there is a need to separately identify online and direct electronic resources.">s</Value>
+      <Value description="Electronic">s</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="07-12" name="Accompanying matter" description="Up to six one-character alphabetic codes (recorded in alphabetical order) that indicate the contents of program notes and other accompanying material for sound recording, music manuscripts, or notated music. If fewer than six codes are assigned, the codes are left justified and each unused position contains a blank (#).">
@@ -473,12 +473,12 @@
       <Value description="Other">z</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
-    <Position pos="13-14" name="Literary text for sound recordings " description="Up to two one-character codes (recorded in the order of the following list) that indicate the type of literary text contained in a nonmusical sound recording. If only one code is assigned, it is left justified and the unused position contains a blank (#).">
+    <Position pos="13-14" name="Literary text for sound recordings" description="Up to two one-character codes (recorded in the order of the following list) that indicate the type of literary text contained in a nonmusical sound recording. If only one code is assigned, it is left justified and the unused position contains a blank (#).">
       <Value description="Item is a music sound recording">#</Value>
       <Value description="Autobiography">a</Value>
       <Value description="Biography">b</Value>
       <Value description="Conference proceedings">c</Value>
-      <Value description="Drama ">d</Value>
+      <Value description="Drama">d</Value>
       <Value description="Essays">e</Value>
       <Value description="Fiction">f</Value>
       <Value description="Reporting">g</Value>
@@ -511,7 +511,7 @@
   </Material>
   <Material id="CR" name="Continuing Resources" description="">
     <Position pos="00" name="Form of material" description="">
-      <Value description="Serial / Integrating resource">s</Value>
+      <Value description="Serial/Integrating resource">s</Value>
     </Position>
     <Position pos="01" name="Frequency" description="One-character alphabetic code that indicates the frequency of an item; used in conjunction with 008/19 (Regularity).">
       <Value description="No determinable frequency">#</Value>
@@ -537,7 +537,7 @@
     </Position>
     <Position pos="02" name="Regularity" description="One-character alphabetic code that indicates the intended regularity of an item; used in conjunction with 008/18 (Frequency).">
       <Value description="Normalized irregular">n</Value>
-      <Value description="Regular ">r</Value>
+      <Value description="Regular">r</Value>
       <Value description="Unknown">u</Value>
       <Value description="Completely irregular">x</Value>
       <Value description="No attempt to code">|</Value>
@@ -560,10 +560,10 @@
       <Value description="Microopaque">c</Value>
       <Value description="Large print">d</Value>
       <Value description="Newspaper format">e</Value>
-      <Value description="Braille ">f</Value>
-      <Value description="Online.  The resource is accessed by means of hardware and software connections to a communications network. If a distinction between types of electronic resources is not necessary, code s can be used as a generic code for any form of electronic resource.">o</Value>
+      <Value description="Braille">f</Value>
+      <Value description="Online">o</Value>
       <Value description="Direct electronic">q</Value>
-      <Value description="Electronic. Intended for manipulation by a computer. May reside in a carrier accessed either directly or remotely, in some cases requiring the use of peripheral devices attached to the computer (e.g., a CD-ROM player). Not used for items that do not requi">s</Value>
+      <Value description="Electronic">s</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="06" name="Form of item" description="One-character alphabetic code that specifies the form of material for the item being described">
@@ -572,28 +572,28 @@
       <Value description="Microfiche">b</Value>
       <Value description="Microopaque">c</Value>
       <Value description="Large print">d</Value>
-      <Value description="Braille ">f</Value>
-      <Value description="Online.  The resource is accessed by means of hardware and software connections to a communications network. If a distinction between types of electronic resources is not necessary, code s can be used as a generic code for any form of electronic resource.">o</Value>
+      <Value description="Braille">f</Value>
+      <Value description="Online">o</Value>
       <Value description="Direct electronic">q</Value>
       <Value description="Regular print reproduction">r</Value>
-      <Value description="Electronic. Intended for manipulation by a computer. May reside in a carrier accessed either directly or remotely, in some cases requiring the use of peripheral devices attached to the computer (e.g., a CD-ROM player). Not used for items that do not requi">s</Value>
+      <Value description="Electronic">s</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="07" name="Nature of entire work" description="">
       <Value description="Not specified">#</Value>
       <Value description="Calendars">5</Value>
       <Value description="Comics/graphic novels">6</Value>
-      <Value description="Abstracts/ summaries">a</Value>
+      <Value description="Abstracts/summaries">a</Value>
       <Value description="Bibliographies">b</Value>
       <Value description="Catalogs">c</Value>
-      <Value description="Dictionaries. Also used for a glossary or a gazetteer.">d</Value>
+      <Value description="Dictionaries">d</Value>
       <Value description="Encyclopedias">e</Value>
       <Value description="Handbooks">f</Value>
       <Value description="Legal articles">g</Value>
       <Value description="Biography">h</Value>
-      <Value description="Indexes. Index to bibliographical material other than itself. Not used when a publication contains an index to its own content.">i</Value>
+      <Value description="Indexes">i</Value>
       <Value description="Discographies">k</Value>
-      <Value description="Legislation. Full or partial text of enactments of legislative bodies, published either in statute or in code form, or text of rules and regulations issued by executive or adminitrative agencies.">l</Value>
+      <Value description="Legislation">l</Value>
       <Value description="Theses">m</Value>
       <Value description="Survey of literature in a subject area">n</Value>
       <Value description="Reviews">o</Value>
@@ -602,7 +602,7 @@
       <Value description="Directories">r</Value>
       <Value description="Statistics">s</Value>
       <Value description="Technical reports">t</Value>
-      <Value description="Standards/ specifications">u</Value>
+      <Value description="Standards/specifications">u</Value>
       <Value description="Legal cases and case notes">v</Value>
       <Value description="Law reports and digests">w</Value>
       <Value description="Yearbooks">y</Value>
@@ -613,17 +613,17 @@
       <Value description="Not specified">#</Value>
       <Value description="Calendars">5</Value>
       <Value description="Comics/graphic novels">6</Value>
-      <Value description="Abstracts/ summaries">a</Value>
+      <Value description="Abstracts/summaries">a</Value>
       <Value description="Bibliographies">b</Value>
       <Value description="Catalogs">c</Value>
-      <Value description="Dictionaries. Also used for a glossary or a gazetteer.">d</Value>
+      <Value description="Dictionaries">d</Value>
       <Value description="Encyclopedias">e</Value>
       <Value description="Handbooks">f</Value>
       <Value description="Legal articles">g</Value>
       <Value description="Biography">h</Value>
-      <Value description="Indexes. Index to bibliographical material other than itself. Not used when a publication contains an index to its own content.">i</Value>
+      <Value description="Indexes">i</Value>
       <Value description="Discographies">k</Value>
-      <Value description="Legislation. Full or partial text of enactments of legislative bodies, published either in statute or in code form, or text of rules and regulations issued by executive or adminitrative agencies.">l</Value>
+      <Value description="Legislation">l</Value>
       <Value description="Theses">m</Value>
       <Value description="Survey of literature in a subject area">n</Value>
       <Value description="Reviews">o</Value>
@@ -642,7 +642,7 @@
       <Value description="Not a government publication">#</Value>
       <Value description="Autonomous or semi-autonomous component">a</Value>
       <Value description="Multilocal">c</Value>
-      <Value description="Federal / National">f</Value>
+      <Value description="Federal/National">f</Value>
       <Value description="International intergovernmental">i</Value>
       <Value description="Local">l</Value>
       <Value description="Multistate">m</Value>
@@ -659,7 +659,7 @@
     </Position>
     <Position pos="13-15" name="Undefined" description="Undefined; each contains a blank (#) or a fill character (|)."/>
     <Position pos="16" name="Original alphabet or script of title" description="One-character alphabetic code that indicates the original alphabet or script of the language of the title on the source item upon which the key title (field 222) is based.">
-      <Value description="No alphabet or script given / No key title">#</Value>
+      <Value description="No alphabet or script given/No key title">#</Value>
       <Value description="Basic Roman">a</Value>
       <Value description="Extended Roman">b</Value>
       <Value description="Cyrillic">c</Value>
@@ -668,18 +668,18 @@
       <Value description="Arabic">f</Value>
       <Value description="Greek">g</Value>
       <Value description="Hebrew">h</Value>
-      <Value description="Thai ">i</Value>
-      <Value description="Devanagari ">j</Value>
+      <Value description="Thai">i</Value>
+      <Value description="Devanagari">j</Value>
       <Value description="Korean">k</Value>
-      <Value description="Tamil ">l</Value>
+      <Value description="Tamil">l</Value>
       <Value description="Unknown">u</Value>
       <Value description="Other">z</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="17" name="Entry convention" description="One-character numeric code that indicates whether the item was cataloged according to successive entry, latest entry, or integrated entry cataloging conventions.">
-      <Value description="Succesive entry.New bibliographic record is created each time 1) a title changes, or 2) a corporate body used as main entry or uniform title qualifier, changes. The earlier or later title or author/title is recorded in a linking field (field 780/785) on each record.">0</Value>
-      <Value description="Latest entry. Cataloged under its latest (most recent) title or issuing body (pre-AACR cataloging rules). All former titles and/or issuing bodies are given in notes (fields 247, 547, and 550).">1</Value>
-      <Value description="Integrated entry. Cataloged under its latest (most recent) title and/or responsible person or corporate body. Used for integrating resources and electronic serials that do not retain their earlier titles.">2</Value>
+      <Value description="Succesive entry">0</Value>
+      <Value description="Latest entry">1</Value>
+      <Value description="Integrated entry">2</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
   </Material>
@@ -690,7 +690,7 @@
       <Value description="Kit">o</Value>
       <Value description="Tree- dimensional artifact or naturally occurring object">r</Value>
     </Position>
-    <Position pos="01-03" name="Running time for motion pictures and videorecordings " description="Three-digit number that indicates the total running time of the motion picture or videorecording. The number is right justified and each unused position contains a zero.">
+    <Position pos="01-03" name="Running time for motion pictures and videorecordings" description="Three-digit number that indicates the total running time of the motion picture or videorecording. The number is right justified and each unused position contains a zero.">
       <Value description="Running time exceeds three characters">000</Value>
       <Value description="Running time">001-999</Value>
       <Value description="Not applicable">nnn</Value>
@@ -715,7 +715,7 @@
       <Value description="Not a government publication">#</Value>
       <Value description="Autonomous or semi-autonomous component">a</Value>
       <Value description="Multilocal">c</Value>
-      <Value description="Federal / National">f</Value>
+      <Value description="Federal/National">f</Value>
       <Value description="International intergovernmental">i</Value>
       <Value description="Local">l</Value>
       <Value description="Multistate">m</Value>
@@ -731,19 +731,19 @@
       <Value description="Microfiche">b</Value>
       <Value description="Microopaque">c</Value>
       <Value description="Large print">d</Value>
-      <Value description="Braille ">f</Value>
-      <Value description="Online.  The resource is accessed by means of hardware and software connections to a communications network. If a distinction between types of electronic resources is not necessary, code s can be used as a generic code for any form of electronic resource.">o</Value>
-      <Value description="Direct electronic. Storage on a directly accessible tangible recording medium, e.g. disc, tape, playaway device, flashdrive, portable hard drive, etc. If a distinction between types of electronic resources is not necessary, code s can be used as a generic code for any form of electronic resource.">q</Value>
+      <Value description="Braille">f</Value>
+      <Value description="Online">o</Value>
+      <Value description="Direct electronic">q</Value>
       <Value description="Regular print reproduction">r</Value>
-      <Value description="Electronic. Intended for manipulation by a computer. May reside in a carrier accessed either directly or remotely, in some cases requiring the use of peripheral devices attached to the computer (e.g., a CD-ROM player). Not used for items that do not require the use of a computer (e.g., music compact discs, videodiscs). This code can be used as a generic code for any form of electronic resource. Codes o and q may be used if there is a need to separately identify online and direct electronic resources.">s</Value>
+      <Value description="Electronic">s</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="13-15" name="Undefined" description="Undefined; each contains a blank (#) or a fill character (|)."/>
     <Position pos="16" name="Type of visual material" description="One-character alphabetic code that indicates the type of visual material being described.">
-      <Value description="Art original ">a</Value>
-      <Value description="Kit.Mixture of components from two or more categories, that is, sound recording, maps, filmstrips, etc., no one of which is the predominant constituent of the item.">b</Value>
+      <Value description="Art original">a</Value>
+      <Value description="Kit">b</Value>
       <Value description="Art reproduction">c</Value>
-      <Value description="Diorama ">d</Value>
+      <Value description="Diorama">d</Value>
       <Value description="Filmstrip">f</Value>
       <Value description="Game">g</Value>
       <Value description="Picture">i</Value>
@@ -754,7 +754,7 @@
       <Value description="Flash card">o</Value>
       <Value description="Microscope slide">p</Value>
       <Value description="Model">q</Value>
-      <Value description="Realia ">r</Value>
+      <Value description="Realia">r</Value>
       <Value description="Slide">s</Value>
       <Value description="Transparency">t</Value>
       <Value description="Videorecording">v</Value>
@@ -783,11 +783,11 @@
       <Value description="Microfiche">b</Value>
       <Value description="Microopaque">c</Value>
       <Value description="Large print">d</Value>
-      <Value description="Braille ">f</Value>
-      <Value description="Online.  The resource is accessed by means of hardware and software connections to a communications network. If a distinction between types of electronic resources is not necessary, code s can be used as a generic code for any form of electronic resource.">o</Value>
+      <Value description="Braille">f</Value>
+      <Value description="Online">o</Value>
       <Value description="Direct electronic">q</Value>
       <Value description="Regular print reproduction">r</Value>
-      <Value description="Electronic. Intended for manipulation by a computer. May reside in a carrier accessed either directly or remotely, in some cases requiring the use of peripheral devices attached to the computer (e.g., a CD-ROM player). Not used for items that do not requi">s</Value>
+      <Value description="Electronic">s</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="07-17" name="Undefined" description="Undefined; each contains a blank (#) or a fill character (|)."/>
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 62377885dd..b5d22fa413 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
@@ -362,6 +362,15 @@ function RedrawChoices(typ){
                                   _("g- Textiles") +
                               '</option> \
                              [% END %] \
+                             [% IF ( f4i ) %] \
+                              <option value="i" selected="selected">' +
+                                  _("i- Plastic") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="i">' +
+                                  _("i- Plastic") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f4j ) %] \
                               <option value="j" selected="selected">' +
                                   _("j- Glass") +
@@ -371,6 +380,24 @@ function RedrawChoices(typ){
                                   _("j- Glass") +
                               '</option> \
                              [% END %] \
+                             [% IF ( f4l ) %] \
+                              <option value="l" selected="selected">' +
+                                  _("l- Vinyl") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="l">' +
+                                  _("l- Vinyl") +
+                              '</option> \
+                             [% END %] \
+                             [% IF ( f4n ) %] \
+                              <option value="n" selected="selected">' +
+                                  _("n- Vellum") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="n">' +
+                                  _("n- Vellum") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f4p ) %] \
                               <option value="p" selected="selected">' +
                                   _("p- Plaster") +
@@ -425,6 +452,24 @@ function RedrawChoices(typ){
                                   _("u- Unknown") +
                               '</option> \
                              [% END %] \
+                             [% IF ( f4v ) %] \
+                              <option value="v" selected="selected">' +
+                                  _("v- Leather") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="v">' +
+                                  _("v- Leather") +
+                              '</option> \
+                             [% END %] \
+                             [% IF ( f4w ) %] \
+                              <option value="w" selected="selected">' +
+                                  _("w- Parchment") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="w">' +
+                                  _("w- Parchment") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f4y ) %] \
                               <option value="y" selected="selected">' +
                                   _("y- Other photographic medium") +
@@ -680,6 +725,24 @@ function RedrawChoices(typ){
                                   _("c- Computer optical disc cartridge") +
                               '</option> \
                              [% END %] \
+                             [% IF ( f1d ) %] \
+                              <option value="d" selected="selected">' +
+                                  _("d- Computer disc, type unspecified") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="d">' +
+                                  _("d- Computer disc, type unspecified") +
+                              '</option> \
+                             [% END %] \
+                             [% IF ( f1e ) %] \
+                              <option value="e" selected="selected">' +
+                                  _("e- Computer disc cartridge, type unspecified") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="e">' +
+                                  _("e- Computer disc cartridge, type unspecified") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f1f ) %] \
                               <option value="f" selected="selected">' +
                                   _("f- Tape cassette") +
@@ -707,6 +770,15 @@ function RedrawChoices(typ){
                                   _("j- Magnetic disc") +
                               '</option> \
                              [% END %] \
+                             [% IF ( f1k ) %] \
+                              <option value="k" selected="selected">' +
+                                  _("k- Computer card") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="k">' +
+                                  _("k- Computer card") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f1m ) %] \
                               <option value="m" selected="selected">' +
                                   _("m- Magneto-optical disc") +
@@ -1586,6 +1658,33 @@ function RedrawChoices(typ){
                                   _("g- Textile") +
                               '</option> \
                              [% END %] \
+                             [% IF ( f4i ) %] \
+                              <option value="i" selected="selected">' +
+                                  _("i- Plastic") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="i">' +
+                                  _("i- Plastic") +
+                              '</option> \
+                             [% END %] \
+                             [% IF ( f4l ) %] \
+                              <option value="l" selected="selected">' +
+                                  _("l- Vinyl") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="l">' +
+                                  _("l- Vinyl") +
+                              '</option> \
+                             [% END %] \
+                             [% IF ( f4n ) %] \
+                              <option value="n" selected="selected">' +
+                                  _("n- Vellum") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="n">' +
+                                  _("n- Vellum") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f4p ) %] \
                               <option value="p" selected="selected">' +
                                   _("p- Plaster") +
@@ -1604,6 +1703,24 @@ function RedrawChoices(typ){
                                   _("u- Unknown") +
                               '</option> \
                              [% END %] \
+                             [% IF ( f4v ) %] \
+                              <option value="v" selected="selected">' +
+                                  _("v- Leather") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="v">' +
+                                  _("v- Leather") +
+                              '</option> \
+                             [% END %] \
+                             [% IF ( f4w ) %] \
+                              <option value="w" selected="selected">' +
+                                  _("w- Parchment") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="w">' +
+                                  _("w- Parchment") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f4z ) %] \
                               <option value="z" selected="selected">' +
                                   _("z- Other") +
@@ -2654,11 +2771,11 @@ function RedrawChoices(typ){
                              [% END %] \
 			     [% IF ( f1f ) %] \
                               <option value="f" selected="selected">' +
-                                  _("f- Other type of filmstrip") +
+                                  _("f- Filmstrip, type unspecified") +
                               '</option> \
                              [% ELSE %] \
                               <option value="f">' +
-                                  _("f- Other type of filmstrip") +
+                                  _("f- Filmstrip, type unspecified") +
                               '</option> \
                              [% END %] \
 			     [% IF ( f1o ) %] \
@@ -3456,6 +3573,24 @@ function RedrawChoices(typ){
                                   _("g- Microopaque") +
                               '</option> \
                              [% END %] \
+                             [% IF ( f1h ) %] \
+                              <option value="h" selected="selected">' +
+                                  _("h- Microfilm slip") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="h">' +
+                                  _("h- Microfilm slip") +
+                              '</option> \
+                             [% END %] \
+                             [% IF ( f1j ) %] \
+                              <option value="j" selected="selected">' +
+                                  _("j- Microfilm roll") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="j">' +
+                                  _("j- Microfilm roll") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f1u ) %] \
                               <option value="u" selected="selected">' +
                                   _("u- Unspecified") +
@@ -4105,6 +4240,15 @@ function RedrawChoices(typ){
                            '</label></td> \
                            <td> \
                             <select name="f1" id="f1" size="1"> \
+                             [% IF ( f1a ) %] \
+                              <option value="a" selected="selected">' +
+                                  _("a- Activity card") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="a">' +
+                                  _("a- Activity card") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f1c ) %] \
                               <option value="c" selected="selected">' +
                                   _("c- Collage") +
@@ -4177,6 +4321,15 @@ function RedrawChoices(typ){
                                   _("j- Print") +
                               '</option> \
                              [% END %] \
+                             [% IF ( f1k ) %] \
+                              <option value="k" selected="selected">' +
+                                  _("k- Poster") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="k">' +
+                                  _("k- Poster") +
+                              '</option> \
+                             [% END %] \
                              [% IF ( f1l ) %] \
                               <option value="l" selected="selected">' +
                                   _("l- Technical drawing") +
@@ -4204,6 +4357,42 @@ function RedrawChoices(typ){
                                   _("o- Flash card") +
                               '</option> \
                              [% END %] \
+                             [% IF ( f1p ) %] \
+                              <option value="p" selected="selected">' +
+                                  _("p- Postcard") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="p">' +
+                                  _("p- Postcard") +
+                              '</option> \
+                             [% END %] \
+                             [% IF ( f1q ) %] \
+                              <option value="q" selected="selected">' +
+                                  _("q- Icon") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="q">' +
+                                  _("q- Icon") +
+                              '</option> \
+                             [% END %] \
+                             [% IF ( f1r ) %] \
+                              <option value="r" selected="selected">' +
+                                  _("r- Radiograph") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="r">' +
+                                  _("r- Radiograph") +
+                              '</option> \
+                             [% END %] \
+                             [% IF ( f1s ) %] \
+                              <option value="s" selected="selected">' +
+                                  _("s- Study print") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="s">' +
+                                  _("s- Study print") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f1u ) %] \
                               <option value="u" selected="selected">' +
                                   _("u- Unspecified") +
@@ -4213,6 +4402,15 @@ function RedrawChoices(typ){
                                   _("u- Unspecified") +
                               '</option> \
                              [% END %] \
+                             [% IF ( f1v ) %] \
+                              <option value="v" selected="selected">' +
+                                  _("v- Photograph, type unspecified") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="v">' +
+                                  _("v- Photograph, type unspecified") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f1z ) %] \
                               <option value="z" selected="selected">' +
                                   _("z- Other") +
@@ -4411,6 +4609,24 @@ function RedrawChoices(typ){
                                   _("h- Metal") +
                               '</option> \
                              [% END %] \
+                             [% IF ( f4i ) %] \
+                              <option value="i" selected="selected">' +
+                                  _("i- Plastic") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="i">' +
+                                  _("i- Plastic") +
+                              '</option> \
+                             [% END %] \
+                             [% IF ( f4l ) %] \
+                              <option value="l" selected="selected">' +
+                                  _("l- Vinyl") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="l">' +
+                                  _("l- Vinyl") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f4m ) %] \
                               <option value="m" selected="selected">' +
                                   _("m- Mixed collection") +
@@ -4420,6 +4636,15 @@ function RedrawChoices(typ){
                                   _("m- Mixed collection") +
                               '</option> \
                              [% END %] \
+                             [% IF ( f4n ) %] \
+                              <option value="n" selected="selected">' +
+                                  _("n- Vellum") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="n">' +
+                                  _("n- Vellum") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f4o ) %] \
                               <option value="o" selected="selected">' +
                                   _("o- Paper") +
@@ -4483,6 +4708,24 @@ function RedrawChoices(typ){
                                   _("u- Unknown") +
                               '</option> \
                              [% END %] \
+                             [% IF ( f4v ) %] \
+                              <option value="v" selected="selected">' +
+                                  _("v- Leather") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="v">' +
+                                  _("v- Leather") +
+                              '</option> \
+                             [% END %] \
+                             [% IF ( f4w ) %] \
+                              <option value="w" selected="selected">' +
+                                  _("w- Parchment") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="w">' +
+                                  _("w- Parchment") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f4z ) %] \
                               <option value="z" selected="selected">' +
                                   _("z- Other") +
@@ -4591,6 +4834,24 @@ function RedrawChoices(typ){
                                   _("h- Metal") +
                               '</option> \
                              [% END %] \
+                             [% IF ( f5i ) %] \
+                              <option value="i" selected="selected">' +
+                                  _("i- Plastic") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="i">' +
+                                  _("i- Plastic") +
+                              '</option> \
+                             [% END %] \
+                             [% IF ( f5l ) %] \
+                              <option value="l" selected="selected">' +
+                                  _("l- Vinyl") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="l">' +
+                                  _("l- Vinyl") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f5m ) %] \
                               <option value="m" selected="selected">' +
                                   _("m- Mixed collection") +
@@ -4600,6 +4861,15 @@ function RedrawChoices(typ){
                                   _("m- Mixed collection") +
                               '</option> \
                              [% END %] \
+                             [% IF ( f5n ) %] \
+                              <option value="n" selected="selected">' +
+                                  _("n- Vellum") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="n">' +
+                                  _("n- Vellum") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f5o ) %] \
                               <option value="o" selected="selected">' +
                                   _("o- Paper") +
@@ -4663,6 +4933,24 @@ function RedrawChoices(typ){
                                   _("u- Unknown") +
                               '</option> \
                              [% END %] \
+                             [% IF ( f5v ) %] \
+                              <option value="v" selected="selected">' +
+                                  _("v- Leather") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="v">' +
+                                  _("v- Leather") +
+                              '</option> \
+                             [% END %] \
+                              [% IF ( f5w ) %] \
+                              <option value="w" selected="selected">' +
+                                  _("w- Parchment") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="w">' +
+                                  _("w- Parchment") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f5z ) %] \
                               <option value="z" selected="selected">' +
                                   _("z- Other") +
@@ -4720,6 +5008,15 @@ function RedrawChoices(typ){
                                   _("f- Film cassette") +
                               '</option> \
                              [% END %] \
+                             [% IF ( f1o ) %] \
+                              <option value="o" selected="selected">' +
+                                  _("o- Film roll") +
+                              '</option> \
+                             [% ELSE %] \
+                              <option value="o">' +
+                                  _("o- Film roll") +
+                              '</option> \
+                             [% END %] \
 			     [% IF ( f1r ) %] \
                               <option value="r" selected="selected">' +
                                   _("r- Film reel") +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.xml b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.xml
index e4f48699b2..f24ecf5fa6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.xml
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Tagfield tag="008" xmlns="http://koha-community.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation= "./marc21_field_CF.xsd">
+<Tagfield tag="008" xmlns="http://koha-community.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="./marc21_field_CF.xsd">
   <Material id="BKS" name="Books" description="">
     <Position pos="00-05" name="Date entered on file" description=""/>
-    <Position pos="06" name="Type of date/ Publication status" description="">
+    <Position pos="06" name="Type of date/Publication status" description="">
       <Value description="No dates given; B.C. date involved">b</Value>
       <Value description="Continuing resource currently published">c</Value>
       <Value description="Continuing resource ceased publication">d</Value>
@@ -11,15 +11,15 @@
       <Value description="Range of years of bulk of collection">k</Value>
       <Value description="Multiple dates">m</Value>
       <Value description="Dates unknown">n</Value>
-      <Value description="Date of distribution/ release/ issue and production/ recording session when different">p</Value>
+      <Value description="Date of distribution/release/issue and production/recording session when different">p</Value>
       <Value description="Questionable date">q</Value>
-      <Value description="Reprint / reissue date and original date">r</Value>
-      <Value description="Single know date / probable date">s</Value>
+      <Value description="Reprint/reissue date and original date">r</Value>
+      <Value description="Single know date/probable date">s</Value>
       <Value description="Publication date and copyright date">t</Value>
       <Value description="Continuings resource status unknown">u</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
-    <Position pos="07-10" name="Date 1" description="A date specified by the code in 008/06 (Type of date/ Publication status)">
+    <Position pos="07-10" name="Date 1" description="A date specified by the code in 008/06 (Type of date/Publication status)">
       <Value description="Date element is not applicable">#</Value>
       <Value description="Date digit">1</Value>
       <Value description="Date digit">2</Value>
@@ -33,7 +33,7 @@
       <Value description="Date element is totally or partially unknown">u</Value>
       <Value description="No attempt to code">||||</Value>
     </Position>
-    <Position pos="11-14" name="Date 2" description="A date specified by the code in 008/06 (Type of date/ Publication status)">
+    <Position pos="11-14" name="Date 2" description="A date specified by the code in 008/06 (Type of date/Publication status)">
       <Value description="Date element is not applicable">#</Value>
       <Value description="Date digit">1</Value>
       <Value description="Date digit">2</Value>
@@ -48,7 +48,7 @@
       <Value description="No attempt to code">||||</Value>
     </Position>
     <Position pos="15-17" url="http://www.loc.gov/marc/countries/countries_code.html" urltext="MARC Code List for Countries" name="Place of publication, production, or execution" description="">
-      <Value description="Various places">vp# </Value>
+      <Value description="Various places">vp#</Value>
       <Value description="No place, unknown, or undetermined">xx#</Value>
       <Value description="Two-character alphabetic code">[aa#]</Value>
       <Value description="Three-character alphabetic code">[aaa]</Value>
@@ -72,7 +72,7 @@
       <Value description="Illuminations">p</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
-    <Position pos="22" name="Target audience" description="One- character alphabetic code that describes the intellectual level of the target audience for which the material is intended">
+    <Position pos="22" name="Target audience" description="One-character alphabetic code that describes the intellectual level of the target audience for which the material is intended">
       <Value description="Unknown or not specified">#</Value>
       <Value description="Preschool">a</Value>
       <Value description="Primary">b</Value>
@@ -84,7 +84,7 @@
       <Value description="Juvenile">j</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
-    <Position pos="23" name="Form of item" description="One character alphabetic code that specifies the form of material for the item">
+    <Position pos="23" name="Form of item" description="One-character alphabetic code that specifies the form of material for the item">
       <Value description="None of the following">#</Value>
       <Value description="Microfilm">a</Value>
       <Value description="Microfiche">b</Value>
@@ -99,25 +99,25 @@
     </Position>
     <Position pos="24-27" name="Nature of contents" description="Up to four one-character codes that indicate whether a significant part of the item is or contains certain types of material. If fewer than four codes are assigned, the codes are left justified and unused positions contain blanks (#)">
       <Value description="No specified nature of contents">#</Value>
-      <Value description="Offprints.Publication that originally was published as an article in a monograph or a serial and that is also issued separately and independently. Includes prepints and postprints">2</Value>
+      <Value description="Offprints">2</Value>
       <Value description="Calendars">5</Value>
       <Value description="Comics/graphic novels">6</Value>
-      <Value description="Abstracts/summaries. Abstracts or summaries of other publications. Not used when a publication includes an abstract or summary of its own content.">a</Value>
+      <Value description="Abstracts/summaries">a</Value>
       <Value description="Bibliographies">b</Value>
       <Value description="Catalogs">c</Value>
-      <Value description="Dictionaries. Also used for a glossary or a gazetteer.">d</Value>
+      <Value description="Dictionaries">d</Value>
       <Value description="Encyclopedias">e</Value>
       <Value description="Handbooks">f</Value>
       <Value description="Legal articles">g</Value>
-      <Value description="Indexes. Index to bibliographical material other than itself. Not used when a publication contains an index to its own content.">i</Value>
+      <Value description="Indexes">i</Value>
       <Value description="Patent document">j</Value>
       <Value description="Discographies">k</Value>
-      <Value description="Legislation. Full or partial text of enactments of legislative bodies, published either in statute or in code form, or text of rules and regulations issued by executive or adminitrative agencies.">l</Value>
-      <Value description="Theses. Thesis, dissertation, or work identified as having been created to satisfy the requirements for an academic certification or degree.">m</Value>
-      <Value description="Surveys of literature in a subject area. Composed entirely of authored surveys that summarize what has been published about a subject.">n</Value>
-      <Value description="Reviews. Devoted entirely to critical reviews of published or performed works (e.g., books, films, sound recordings, theater)">o</Value>
+      <Value description="Legislation">l</Value>
+      <Value description="Theses">m</Value>
+      <Value description="Surveys of literature in a subject area">n</Value>
+      <Value description="Reviews">o</Value>
       <Value description="Programmed texts">p</Value>
-      <Value description="Filmographies. Entire item, or a significant part of it, is a filmography or other  bibliografy of moving images.">q</Value>
+      <Value description="Filmographies">q</Value>
       <Value description="Directories">r</Value>
       <Value description="Statistics">s</Value>
       <Value description="Technical reports">t</Value>
@@ -125,14 +125,14 @@
       <Value description="Legal cases and case notes">v</Value>
       <Value description="Law reports and digests">w</Value>
       <Value description="Yearbooks">y</Value>
-      <Value description="Treaties. Treaty or accord negotiated between two or more parties to settle a disagreement, establish a relationship, gran rights,etc.">z</Value>
+      <Value description="Treaties">z</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="28" name="Government publication" description="One-character code that indicates whether or not the item is published or produced by or for an international, national, state, provincial, or local government agency, or by any subdivision of such a body">
       <Value description="Not a government publication">#</Value>
       <Value description="Autonomous or semi-autonomous component">a</Value>
       <Value description="Multilocal">c</Value>
-      <Value description="Federal / National">f</Value>
+      <Value description="Federal/National">f</Value>
       <Value description="International intergovernmental">i</Value>
       <Value description="Local">l</Value>
       <Value description="Multistate">m</Value>
@@ -165,9 +165,9 @@
       <Value description="Essays">e</Value>
       <Value description="Novels">f</Value>
       <Value description="Humor, satires, etc.">h</Value>
-      <Value description="Letters. Single letter or collection of correspondence">i</Value>
-      <Value description="Short stories. Short story or collection of short stories.">j</Value>
-      <Value description="Mixed forms. Represents a variety of literary forms (e.g., poetry and short stories)">m</Value>
+      <Value description="Letters">i</Value>
+      <Value description="Short stories">j</Value>
+      <Value description="Mixed forms">m</Value>
       <Value description="Poetry">p</Value>
       <Value description="Speeches">s</Value>
       <Value description="Unknown">u</Value>
@@ -208,7 +208,7 @@
   </Material>
   <Material id="CF" name="Computer Files" description="">
     <Position pos="00-05" name="Date entered on file" description=""/>
-    <Position pos="06" name="Type of date/ Publication status" description="">
+    <Position pos="06" name="Type of date/Publication status" description="">
       <Value description="No dates given; B.C. date involved">b</Value>
       <Value description="Continuing resource currently published">c</Value>
       <Value description="Continuing resource ceased publication">d</Value>
@@ -217,15 +217,15 @@
       <Value description="Range of years of bulk of collection">k</Value>
       <Value description="Multiple dates">m</Value>
       <Value description="Dates unknown">n</Value>
-      <Value description="Date of distribution/ release/ issue and production/ recording session when different">p</Value>
+      <Value description="Date of distribution/release/issue and production/recording session when different">p</Value>
       <Value description="Questionable date">q</Value>
-      <Value description="Reprint / reissue date and original date">r</Value>
-      <Value description="Single know date / probable date">s</Value>
+      <Value description="Reprint/reissue date and original date">r</Value>
+      <Value description="Single know date/probable date">s</Value>
       <Value description="Publication date and copyright date">t</Value>
       <Value description="Continuings resource status unknown">u</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
-    <Position pos="07-10" name="Date 1" description="A date specified by the code in 008/06 (Type of date/ Publication status)">
+    <Position pos="07-10" name="Date 1" description="A date specified by the code in 008/06 (Type of date/Publication status)">
       <Value description="Date element is not applicable">#</Value>
       <Value description="Date digit">1</Value>
       <Value description="Date digit">2</Value>
@@ -239,7 +239,7 @@
       <Value description="Date element is totally or partially unknown">u</Value>
       <Value description="No attempt to code">||||</Value>
     </Position>
-    <Position pos="11-14" name="Date 2" description="A date specified by the code in 008/06 (Type of date/ Publication status)">
+    <Position pos="11-14" name="Date 2" description="A date specified by the code in 008/06 (Type of date/Publication status)">
       <Value description="Date element is not applicable">#</Value>
       <Value description="Date digit">1</Value>
       <Value description="Date digit">2</Value>
@@ -254,7 +254,7 @@
       <Value description="No attempt to code">||||</Value>
     </Position>
     <Position pos="15-17" url="http://www.loc.gov/marc/countries/countries_code.html" urltext="MARC Code List for Countries" name="Place of publication, production, or execution" description="">
-      <Value description="Various places">vp# </Value>
+      <Value description="Various places">vp#</Value>
       <Value description="No place, unknown, or undetermined">xx#</Value>
       <Value description="Two-character alphabetic code">[aa#]</Value>
       <Value description="Three-character alphabetic code">[aaa]</Value>
@@ -279,10 +279,10 @@
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="24-25" name="Undefined" description="Two undefined character positions; each contains a blank (#) or a fill character (|)."/>
-    <Position pos="26" name="Type of computer file " description="One-character alphabetic code that indicates the type of computer file described in the bibliographic record">
+    <Position pos="26" name="Type of computer file" description="One-character alphabetic code that indicates the type of computer file described in the bibliographic record">
       <Value description="Numeric data">a</Value>
       <Value description="Computer program">b</Value>
-      <Value description="Representational. Pictorial or graphic information that can be manipulated in conjunction with other types of files to produce graphic patterns that can be used to interpret and give meaning to the information. Does not include a document in image format.">c</Value>
+      <Value description="Representational">c</Value>
       <Value description="Document">d</Value>
       <Value description="Bibliographic data">e</Value>
       <Value description="Font">f</Value>
@@ -300,7 +300,7 @@
       <Value description="Not a government publication">#</Value>
       <Value description="Autonomous or semi-autonomous component">a</Value>
       <Value description="Multilocal">c</Value>
-      <Value description="Federal / National">f</Value>
+      <Value description="Federal/National">f</Value>
       <Value description="International intergovernmental">i</Value>
       <Value description="Local">l</Value>
       <Value description="Multistate">m</Value>
@@ -338,7 +338,7 @@
   </Material>
   <Material id="MP" name="Maps" description="">
     <Position pos="00-05" name="Date entered on file" description=""/>
-    <Position pos="06" name="Type of date/ Publication status" description="">
+    <Position pos="06" name="Type of date/Publication status" description="">
       <Value description="No dates given; B.C. date involved">b</Value>
       <Value description="Continuing resource currently published">c</Value>
       <Value description="Continuing resource ceased publication">d</Value>
@@ -347,15 +347,15 @@
       <Value description="Range of years of bulk of collection">k</Value>
       <Value description="Multiple dates">m</Value>
       <Value description="Dates unknown">n</Value>
-      <Value description="Date of distribution/ release/ issue and production/ recording session when different">p</Value>
+      <Value description="Date of distribution/release/issue and production/recording session when different">p</Value>
       <Value description="Questionable date">q</Value>
-      <Value description="Reprint / reissue date and original date">r</Value>
-      <Value description="Single know date / probable date">s</Value>
+      <Value description="Reprint/reissue date and original date">r</Value>
+      <Value description="Single know date/probable date">s</Value>
       <Value description="Publication date and copyright date">t</Value>
       <Value description="Continuings resource status unknown">u</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
-    <Position pos="07-10" name="Date 1" description="A date specified by the code in 008/06 (Type of date/ Publication status)">
+    <Position pos="07-10" name="Date 1" description="A date specified by the code in 008/06 (Type of date/Publication status)">
       <Value description="Date element is not applicable">#</Value>
       <Value description="Date digit">1</Value>
       <Value description="Date digit">2</Value>
@@ -369,7 +369,7 @@
       <Value description="Date element is totally or partially unknown">u</Value>
       <Value description="No attempt to code">||||</Value>
     </Position>
-    <Position pos="11-14" name="Date 2" description="A date specified by the code in 008/06 (Type of date/ Publication status)">
+    <Position pos="11-14" name="Date 2" description="A date specified by the code in 008/06 (Type of date/Publication status)">
       <Value description="Date element is not applicable">#</Value>
       <Value description="Date digit">1</Value>
       <Value description="Date digit">2</Value>
@@ -384,13 +384,13 @@
       <Value description="No attempt to code">||||</Value>
     </Position>
     <Position pos="15-17" url="http://www.loc.gov/marc/countries/countries_code.html" urltext="MARC Code List for Countries" name="Place of publication, production, or execution" description="">
-      <Value description="Various places">vp# </Value>
+      <Value description="Various places">vp#</Value>
       <Value description="No place, unknown, or undetermined">xx#</Value>
       <Value description="Two-character alphabetic code">[aa#]</Value>
       <Value description="Three-character alphabetic code">[aaa]</Value>
     </Position>
     <Position pos="18-21" name="Relief" description="Up to four one-character alphabetic codes that indicate the relief type specified on the item. Codes are recorded in order of their importance to the described item. If fewer than four codes are assigned, the codes are left justified and each unused position contains a blank (#).">
-      <Value description="No relief shown"># </Value>
+      <Value description="No relief shown">#</Value>
       <Value description="Contours">a</Value>
       <Value description="Shading">b</Value>
       <Value description="Gradient and bathymetric tints">c</Value>
@@ -400,14 +400,14 @@
       <Value description="Spot heights">g</Value>
       <Value description="Pictorially">i</Value>
       <Value description="Land forms">j</Value>
-      <Value description="Bathymetry/ isolines">k</Value>
+      <Value description="Bathymetry/isolines">k</Value>
       <Value description="Rock drawings">m</Value>
       <Value description="Other">z</Value>
       <Value description="No attempt to code">||||</Value>
     </Position>
     <Position pos="22-23" name="Projection" description="Two-character alphabetic code that indicates the projection used in producing the item.">
       <Value description="Projection not specified">##</Value>
-      <Value description="Aitoff ">aa</Value>
+      <Value description="Aitoff">aa</Value>
       <Value description="Gnomic">ab</Value>
       <Value description="Lambert's azimuthal equal area">ac</Value>
       <Value description="Orthographic">ad</Value>
@@ -419,49 +419,49 @@
       <Value description="Polar stereographic">ap</Value>
       <Value description="Azimuthal, specific type unknown">au</Value>
       <Value description="Azimutal, other">az</Value>
-      <Value description="Gall ">ba</Value>
+      <Value description="Gall">ba</Value>
       <Value description="Goode's homolographic">bb</Value>
       <Value description="Lambert's cylindrical equal area">bc</Value>
       <Value description="Mercator">bd</Value>
-      <Value description="Miller ">be</Value>
-      <Value description="Mollweide ">bf</Value>
-      <Value description="Sinusoidal ">bg</Value>
+      <Value description="Miller">be</Value>
+      <Value description="Mollweide">bf</Value>
+      <Value description="Sinusoidal">bg</Value>
       <Value description="Transverse Mercator">bh</Value>
-      <Value description="Gauss-Kruger ">bi</Value>
-      <Value description="Equirectangular ">bj</Value>
+      <Value description="Gauss-Kruger">bi</Value>
+      <Value description="Equirectangular">bj</Value>
       <Value description="Krovak">bk</Value>
       <Value description="Cassini-Soldner">bl</Value>
       <Value description="Oblique Mercator">bo</Value>
-      <Value description="Robinson ">br</Value>
+      <Value description="Robinson">br</Value>
       <Value description="Space oblique Mercator">bs</Value>
       <Value description="Cylindrical, specific type unknown">bu</Value>
       <Value description="Cylindrical, other">bz</Value>
       <Value description="Albers equal area">ca</Value>
-      <Value description="Bonne ">cb</Value>
+      <Value description="Bonne">cb</Value>
       <Value description="Lambert's conformal conic">cc</Value>
       <Value description="Equidistant conic">ce</Value>
       <Value description="Polyconic">cp</Value>
       <Value description="Conic, specific type unknown">cu</Value>
       <Value description="Conic, other">cz</Value>
-      <Value description="Armadillo ">da</Value>
-      <Value description="Butterfly ">db</Value>
-      <Value description="Eckert ">dc</Value>
+      <Value description="Armadillo">da</Value>
+      <Value description="Butterfly">db</Value>
+      <Value description="Eckert">dc</Value>
       <Value description="Goode's homolosine">dd</Value>
       <Value description="Miller's bipolar oblique conformal conic">de</Value>
-      <Value description="Van Der Grinten ">df</Value>
-      <Value description="Dimaxión ">dg</Value>
+      <Value description="Van Der Grinten">df</Value>
+      <Value description="Dimaxión">dg</Value>
       <Value description="Cordiform">dh</Value>
-      <Value description="Lambert conformal ">dl</Value>
+      <Value description="Lambert conformal">dl</Value>
       <Value description="Other">zz</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="24" name="Undefined" description="Undefined; contains a blank (#) or a fill character (|)."/>
     <Position pos="25" name="Type of cartographic material" description="One-character alphabetic code that indicates the type of cartographic item described.">
       <Value description="Single map">a</Value>
-      <Value description="Map Series. Number of related but physically separate and bibliographically distinct cartographic units intended by the producer(s) or issuing body(s) to form a single group.">b</Value>
-      <Value description="Map serial. Issued in successive parts bearing numerical or chronological designations and intended to be continued indefinitely">c</Value>
+      <Value description="Map Series">b</Value>
+      <Value description="Map serial">c</Value>
       <Value description="Globe">d</Value>
-      <Value description="Atlas ">e</Value>
+      <Value description="Atlas">e</Value>
       <Value description="Separate supplement to another work">f</Value>
       <Value description="Bound as part of another work">g</Value>
       <Value description="Unknown">u</Value>
@@ -473,7 +473,7 @@
       <Value description="Not a government publication">#</Value>
       <Value description="Autonomous or semi-autonomous component">a</Value>
       <Value description="Multilocal">c</Value>
-      <Value description="Federal / National">f</Value>
+      <Value description="Federal/National">f</Value>
       <Value description="International intergovernmental">i</Value>
       <Value description="Local">l</Value>
       <Value description="Multistate">m</Value>
@@ -489,11 +489,11 @@
       <Value description="Microfiche">b</Value>
       <Value description="Microopaque">c</Value>
       <Value description="Large print">d</Value>
-      <Value description="Braille ">f</Value>
-      <Value description="Online.  The resource is accessed by means of hardware and software connections to a communications network. If a distinction between types of electronic resources is not necessary, code s can be used as a generic code for any form of electronic resource.">o</Value>
-      <Value description="Direct electronic. Storage on a directly accessible tangible recording medium, e.g. disc, tape, playaway device, flashdrive, portable hard drive, etc. If a distinction between types of electronic resources is not necessary, code s can be used as a generic code for any form of electronic resource.">q</Value>
+      <Value description="Braille">f</Value>
+      <Value description="Online">o</Value>
+      <Value description="Direct electronic">q</Value>
       <Value description="Regular print reproduction">r</Value>
-      <Value description="Electronic. Intended for manipulation by a computer. May reside in a carrier accessed either directly or remotely, in some cases requiring the use of peripheral devices attached to the computer (e.g., a CD-ROM player). Not used for items that do not require the use of a computer (e.g., music compact discs, videodiscs). This code can be used as a generic code for any form of electronic resource. Codes o and q may be used if there is a need to separately identify online and direct electronic resources.">s</Value>
+      <Value description="Electronic">s</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="30" name="Undefined" description="Contains a blank (#) or a fill character (|)."/>
@@ -543,7 +543,7 @@
   </Material>
   <Material id="MU" name="Music" description="">
     <Position pos="00-05" name="Date entered on file" description=""/>
-    <Position pos="06" name="Type of date/ Publication status" description="">
+    <Position pos="06" name="Type of date/Publication status" description="">
       <Value description="No dates given; B.C. date involved">b</Value>
       <Value description="Continuing resource currently published">c</Value>
       <Value description="Continuing resource ceased publication">d</Value>
@@ -552,15 +552,15 @@
       <Value description="Range of years of bulk of collection">k</Value>
       <Value description="Multiple dates">m</Value>
       <Value description="Dates unknown">n</Value>
-      <Value description="Date of distribution/ release/ issue and production/ recording session when different">p</Value>
+      <Value description="Date of distribution/release/issue and production/recording session when different">p</Value>
       <Value description="Questionable date">q</Value>
-      <Value description="Reprint / reissue date and original date">r</Value>
-      <Value description="Single know date / probable date">s</Value>
+      <Value description="Reprint/reissue date and original date">r</Value>
+      <Value description="Single know date/probable date">s</Value>
       <Value description="Publication date and copyright date">t</Value>
       <Value description="Continuings resource status unknown">u</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
-    <Position pos="07-10" name="Date 1" description="A date specified by the code in 008/06 (Type of date/ Publication status)">
+    <Position pos="07-10" name="Date 1" description="A date specified by the code in 008/06 (Type of date/Publication status)">
       <Value description="Date element is not applicable">#</Value>
       <Value description="Date digit">1</Value>
       <Value description="Date digit">2</Value>
@@ -574,7 +574,7 @@
       <Value description="Date element is totally or partially unknown">u</Value>
       <Value description="No attempt to code">||||</Value>
     </Position>
-    <Position pos="11-14" name="Date 2" description="A date specified by the code in 008/06 (Type of date/ Publication status)">
+    <Position pos="11-14" name="Date 2" description="A date specified by the code in 008/06 (Type of date/Publication status)">
       <Value description="Date element is not applicable">#</Value>
       <Value description="Date digit">1</Value>
       <Value description="Date digit">2</Value>
@@ -589,7 +589,7 @@
       <Value description="No attempt to code">||||</Value>
     </Position>
     <Position pos="15-17" url="http://www.loc.gov/marc/countries/countries_code.html" urltext="MARC Code List for Countries" name="Place of publication, production, or execution" description="">
-      <Value description="Various places">vp# </Value>
+      <Value description="Various places">vp#</Value>
       <Value description="No place, unknown, or undetermined">xx#</Value>
       <Value description="Two-character alphabetic code">[aa#]</Value>
       <Value description="Three-character alphabetic code">[aaa]</Value>
@@ -598,12 +598,12 @@
       <Value description="Anthems">an</Value>
       <Value description="Ballads">bd</Value>
       <Value description="Bluegrass music">bg</Value>
-      <Value description="Blues ">bl</Value>
-      <Value description="Ballets ">bt</Value>
+      <Value description="Blues">bl</Value>
+      <Value description="Ballets">bt</Value>
       <Value description="Chaconnes">ca</Value>
       <Value description="Chants, Other religions">cb</Value>
       <Value description="Chants, Christian">cc</Value>
-      <Value description="Concerti grossi ">cg</Value>
+      <Value description="Concerti grossi">cg</Value>
       <Value description="Chorales">ch</Value>
       <Value description="Chorale preludes">cl</Value>
       <Value description="Canons and rounds">cn</Value>
@@ -619,13 +619,13 @@
       <Value description="Fugues">fg</Value>
       <Value description="Flamenco">fl</Value>
       <Value description="Folk music">fm</Value>
-      <Value description="Fantasias ">ft</Value>
+      <Value description="Fantasias">ft</Value>
       <Value description="Gospel music">gm</Value>
       <Value description="Hymns">hy</Value>
       <Value description="Jazz">jz</Value>
       <Value description="Musical revues and comedies">mc</Value>
       <Value description="Madrigals">md</Value>
-      <Value description="Minuets ">mi</Value>
+      <Value description="Minuets">mi</Value>
       <Value description="Motets">mo</Value>
       <Value description="Motion picture music">mp</Value>
       <Value description="Marches">mr</Value>
@@ -635,7 +635,7 @@
       <Value description="Nocturnes">nc</Value>
       <Value description="Not applicable">nn</Value>
       <Value description="Operas">op</Value>
-      <Value description="Oratorios ">or</Value>
+      <Value description="Oratorios">or</Value>
       <Value description="Overtures">ov</Value>
       <Value description="Program music">pg</Value>
       <Value description="Passion music">pm</Value>
@@ -645,18 +645,18 @@
       <Value description="Passacaglias">ps</Value>
       <Value description="Part-songs">pt</Value>
       <Value description="Pavans">pv</Value>
-      <Value description=" Rock music">rc</Value>
+      <Value description="Rock music">rc</Value>
       <Value description="Rondos">rd</Value>
       <Value description="Ragtime music">rg</Value>
-      <Value description="Ricercars ">ri</Value>
+      <Value description="Ricercars">ri</Value>
       <Value description="Rhapsodies">rp</Value>
-      <Value description="Requiems ">rq</Value>
+      <Value description="Requiems">rq</Value>
       <Value description="Square dance music">sd</Value>
       <Value description="Songs">sg</Value>
-      <Value description="Sonatas ">sn</Value>
+      <Value description="Sonatas">sn</Value>
       <Value description="Symphonic poems">sp</Value>
       <Value description="Studies and exercises">st</Value>
-      <Value description="Suites ">su</Value>
+      <Value description="Suites">su</Value>
       <Value description="Symphonies">sy</Value>
       <Value description="Toccatas">tc</Value>
       <Value description="Teatro lirico">tl</Value>
@@ -712,11 +712,11 @@
       <Value description="Microfiche">b</Value>
       <Value description="Microopaque">c</Value>
       <Value description="Large print">d</Value>
-      <Value description="Braille ">f</Value>
-      <Value description="Online.  The resource is accessed by means of hardware and software connections to a communications network. If a distinction between types of electronic resources is not necessary, code s can be used as a generic code for any form of electronic resource.">o</Value>
-      <Value description="Direct electronic. Storage on a directly accessible tangible recording medium, e.g. disc, tape, playaway device, flashdrive, portable hard drive, etc. If a distinction between types of electronic resources is not necessary, code s can be used as a generic code for any form of electronic resource.">q</Value>
+      <Value description="Braille">f</Value>
+      <Value description="Online">o</Value>
+      <Value description="Direct electronic">q</Value>
       <Value description="Regular print reproduction">r</Value>
-      <Value description="Electronic. Intended for manipulation by a computer. May reside in a carrier accessed either directly or remotely, in some cases requiring the use of peripheral devices attached to the computer (e.g., a CD-ROM player). Not used for items that do not require the use of a computer (e.g., music compact discs, videodiscs). This code can be used as a generic code for any form of electronic resource. Codes o and q may be used if there is a need to separately identify online and direct electronic resources.">s</Value>
+      <Value description="Electronic">s</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="24-29" name="Accompanying matter" description="Up to six one-character alphabetic codes (recorded in alphabetical order) that indicate the contents of program notes and other accompanying material for sound recording, music manuscripts, or notated music. If fewer than six codes are assigned, the codes are left justified and each unused position contains a blank (#).">
@@ -736,12 +736,12 @@
       <Value description="Other">z</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
-    <Position pos="30-31" name="Literary text for sound recordings " description="Up to two one-character codes (recorded in the order of the following list) that indicate the type of literary text contained in a nonmusical sound recording. If only one code is assigned, it is left justified and the unused position contains a blank (#).">
+    <Position pos="30-31" name="Literary text for sound recordings" description="Up to two one-character codes (recorded in the order of the following list) that indicate the type of literary text contained in a nonmusical sound recording. If only one code is assigned, it is left justified and the unused position contains a blank (#).">
       <Value description="Item is a music sound recording">#</Value>
       <Value description="Autobiography">a</Value>
       <Value description="Biography">b</Value>
       <Value description="Conference proceedings">c</Value>
-      <Value description="Drama ">d</Value>
+      <Value description="Drama">d</Value>
       <Value description="Essays">e</Value>
       <Value description="Fiction">f</Value>
       <Value description="Reporting">g</Value>
@@ -798,7 +798,7 @@
   </Material>
   <Material id="CR" name="Continuing Resources" description="">
     <Position pos="00-05" name="Date entered on file" description=""/>
-    <Position pos="06" name="Type of date/ Publication status" description="">
+    <Position pos="06" name="Type of date/Publication status" description="">
       <Value description="No dates given; B.C. date involved">b</Value>
       <Value description="Continuing resource currently published">c</Value>
       <Value description="Continuing resource ceased publication">d</Value>
@@ -807,15 +807,15 @@
       <Value description="Range of years of bulk of collection">k</Value>
       <Value description="Multiple dates">m</Value>
       <Value description="Dates unknown">n</Value>
-      <Value description="Date of distribution/ release/ issue and production/ recording session when different">p</Value>
+      <Value description="Date of distribution/release/issue and production/recording session when different">p</Value>
       <Value description="Questionable date">q</Value>
-      <Value description="Reprint / reissue date and original date">r</Value>
-      <Value description="Single know date / probable date">s</Value>
+      <Value description="Reprint/reissue date and original date">r</Value>
+      <Value description="Single know date/probable date">s</Value>
       <Value description="Publication date and copyright date">t</Value>
       <Value description="Continuings resource status unknown">u</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
-    <Position pos="07-10" name="Date 1" description="A date specified by the code in 008/06 (Type of date/ Publication status)">
+    <Position pos="07-10" name="Date 1" description="A date specified by the code in 008/06 (Type of date/Publication status)">
       <Value description="Date element is not applicable">#</Value>
       <Value description="Date digit">1</Value>
       <Value description="Date digit">2</Value>
@@ -829,7 +829,7 @@
       <Value description="Date element is totally or partially unknown">u</Value>
       <Value description="No attempt to code">||||</Value>
     </Position>
-    <Position pos="11-14" name="Date 2" description="A date specified by the code in 008/06 (Type of date/ Publication status)">
+    <Position pos="11-14" name="Date 2" description="A date specified by the code in 008/06 (Type of date/Publication status)">
       <Value description="Date element is not applicable">#</Value>
       <Value description="Date digit">1</Value>
       <Value description="Date digit">2</Value>
@@ -844,7 +844,7 @@
       <Value description="No attempt to code">||||</Value>
     </Position>
     <Position pos="15-17" url="http://www.loc.gov/marc/countries/countries_code.html" urltext="MARC Code List for Countries" name="Place of publication, production, or execution" description="">
-      <Value description="Various places">vp# </Value>
+      <Value description="Various places">vp#</Value>
       <Value description="No place, unknown, or undetermined">xx#</Value>
       <Value description="Two-character alphabetic code">[aa#]</Value>
       <Value description="Three-character alphabetic code">[aaa]</Value>
@@ -873,7 +873,7 @@
     </Position>
     <Position pos="19" name="Regularity" description="One-character alphabetic code that indicates the intended regularity of an item; used in conjunction with 008/18 (Frequency).">
       <Value description="Normalized irregular">n</Value>
-      <Value description="Regular ">r</Value>
+      <Value description="Regular">r</Value>
       <Value description="Unknown">u</Value>
       <Value description="Completely irregular">x</Value>
       <Value description="No attempt to code">|</Value>
@@ -896,10 +896,10 @@
       <Value description="Microopaque">c</Value>
       <Value description="Large print">d</Value>
       <Value description="Newspaper format">e</Value>
-      <Value description="Braille ">f</Value>
-      <Value description="Online.  The resource is accessed by means of hardware and software connections to a communications network. If a distinction between types of electronic resources is not necessary, code s can be used as a generic code for any form of electronic resource.">o</Value>
+      <Value description="Braille">f</Value>
+      <Value description="Online">o</Value>
       <Value description="Direct electronic">q</Value>
-      <Value description="Electronic. Intended for manipulation by a computer. May reside in a carrier accessed either directly or remotely, in some cases requiring the use of peripheral devices attached to the computer (e.g., a CD-ROM player). Not used for items that do not requi">s</Value>
+      <Value description="Electronic">s</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="23" name="Form of item" description="One-character alphabetic code that specifies the form of material for the item being described">
@@ -908,18 +908,18 @@
       <Value description="Microfiche">b</Value>
       <Value description="Microopaque">c</Value>
       <Value description="Large print">d</Value>
-      <Value description="Braille ">f</Value>
-      <Value description="Online.  The resource is accessed by means of hardware and software connections to a communications network. If a distinction between types of electronic resources is not necessary, code s can be used as a generic code for any form of electronic resource.">o</Value>
+      <Value description="Braille">f</Value>
+      <Value description="Online">o</Value>
       <Value description="Direct electronic">q</Value>
       <Value description="Regular print reproduction">r</Value>
-      <Value description="Electronic. Intended for manipulation by a computer. May reside in a carrier accessed either directly or remotely, in some cases requiring the use of peripheral devices attached to the computer (e.g., a CD-ROM player). Not used for items that do not requi">s</Value>
+      <Value description="Electronic">s</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="24" name="Nature of entire work" description="">
       <Value description="Not specified">#</Value>
       <Value description="Calendars">5</Value>
       <Value description="Comics/graphic novels">6</Value>
-      <Value description="Abstracts/ summaries">a</Value>
+      <Value description="Abstracts/summaries">a</Value>
       <Value description="Bibliographies">b</Value>
       <Value description="Catalogs">c</Value>
       <Value description="Dictionaries. Also used for a glossary or a gazetteer.">d</Value>
@@ -927,9 +927,9 @@
       <Value description="Handbooks">f</Value>
       <Value description="Legal articles">g</Value>
       <Value description="Biography">h</Value>
-      <Value description="Indexes. Index to bibliographical material other than itself. Not used when a publication contains an index to its own content.">i</Value>
+      <Value description="Indexes">i</Value>
       <Value description="Discographies">k</Value>
-      <Value description="Legislation. Full or partial text of enactments of legislative bodies, published either in statute or in code form, or text of rules and regulations issued by executive or adminitrative agencies.">l</Value>
+      <Value description="Legislation">l</Value>
       <Value description="Theses">m</Value>
       <Value description="Survey of literature in a subject area">n</Value>
       <Value description="Reviews">o</Value>
@@ -938,7 +938,7 @@
       <Value description="Directories">r</Value>
       <Value description="Statistics">s</Value>
       <Value description="Technical reports">t</Value>
-      <Value description="Standards/ specifications">u</Value>
+      <Value description="Standards/specifications">u</Value>
       <Value description="Legal cases and case notes">v</Value>
       <Value description="Law reorts and digests">w</Value>
       <Value description="Yearbooks">y</Value>
@@ -949,7 +949,7 @@
       <Value description="Not specified">#</Value>
       <Value description="Calendars">5</Value>
       <Value description="Comics/graphic novels">6</Value>
-      <Value description="Abstracts/ summaries">a</Value>
+      <Value description="Abstracts/summaries">a</Value>
       <Value description="Bibliographies">b</Value>
       <Value description="Catalogs">c</Value>
       <Value description="Dictionaries. Also used for a glossary or a gazetteer.">d</Value>
@@ -957,9 +957,9 @@
       <Value description="Handbooks">f</Value>
       <Value description="Legal articles">g</Value>
       <Value description="Biography">h</Value>
-      <Value description="Indexes. Index to bibliographical material other than itself. Not used when a publication contains an index to its own content.">i</Value>
+      <Value description="Indexes">i</Value>
       <Value description="Discographies">k</Value>
-      <Value description="Legislation. Full or partial text of enactments of legislative bodies, published either in statute or in code form, or text of rules and regulations issued by executive or adminitrative agencies.">l</Value>
+      <Value description="Legislation">l</Value>
       <Value description="Theses">m</Value>
       <Value description="Survey of literature in a subject area">n</Value>
       <Value description="Reviews">o</Value>
@@ -978,7 +978,7 @@
       <Value description="Not a government publication">#</Value>
       <Value description="Autonomous or semi-autonomous component">a</Value>
       <Value description="Multilocal">c</Value>
-      <Value description="Federal / National">f</Value>
+      <Value description="Federal/National">f</Value>
       <Value description="International intergovernmental">i</Value>
       <Value description="Local">l</Value>
       <Value description="Multistate">m</Value>
@@ -995,7 +995,7 @@
     </Position>
     <Position pos="30-32" name="Undefined" description="Undefined; each contains a blank (#) or a fill character (|)."/>
     <Position pos="33" name="Original alphabet or script of title" description="One-character alphabetic code that indicates the original alphabet or script of the language of the title on the source item upon which the key title (field 222) is based.">
-      <Value description="No alphabet or script given / No key title">#</Value>
+      <Value description="No alphabet or script given/No key title">#</Value>
       <Value description="Basic Roman">a</Value>
       <Value description="Extended Roman">b</Value>
       <Value description="Cyrillic">c</Value>
@@ -1004,18 +1004,18 @@
       <Value description="Arabic">f</Value>
       <Value description="Greek">g</Value>
       <Value description="Hebrew">h</Value>
-      <Value description="Thai ">i</Value>
-      <Value description="Devanagari ">j</Value>
+      <Value description="Thai">i</Value>
+      <Value description="Devanagari">j</Value>
       <Value description="Korean">k</Value>
-      <Value description="Tamil ">l</Value>
+      <Value description="Tamil">l</Value>
       <Value description="Unknown">u</Value>
       <Value description="Other">z</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="34" name="Entry convention" description="One-character numeric code that indicates whether the item was cataloged according to successive entry, latest entry, or integrated entry cataloging conventions.">
-      <Value description="Succesive entry.New bibliographic record is created each time 1) a title changes, or 2) a corporate body used as main entry or uniform title qualifier, changes. The earlier or later title or author/title is recorded in a linking field (field 780/785) on each record.">0</Value>
-      <Value description="Latest entry. Cataloged under its latest (most recent) title or issuing body (pre-AACR cataloging rules). All former titles and/or issuing bodies are given in notes (fields 247, 547, and 550).">1</Value>
-      <Value description="Integrated entry. Cataloged under its latest (most recent) title and/or responsible person or corporate body. Used for integrating resources and electronic serials that do not retain their earlier titles.">2</Value>
+      <Value description="Succesive entry">0</Value>
+      <Value description="Latest entry">1</Value>
+      <Value description="Integrated entry">2</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="35-37" url="http://www.loc.gov/marc/languages/language_code.html" urltext="MARC Code List for Languages" name="Language" description="">
@@ -1045,7 +1045,7 @@
   </Material>
   <Material id="VM" name="Visual Materials" description="">
     <Position pos="00-05" name="Date entered on file" description=""/>
-    <Position pos="06" name="Type of date/ Publication status" description="">
+    <Position pos="06" name="Type of date/Publication status" description="">
       <Value description="No dates given; B.C. date involved">b</Value>
       <Value description="Continuing resource currently published">c</Value>
       <Value description="Continuing resource ceased publication">d</Value>
@@ -1054,15 +1054,15 @@
       <Value description="Range of years of bulk of collection">k</Value>
       <Value description="Multiple dates">m</Value>
       <Value description="Dates unknown">n</Value>
-      <Value description="Date of distribution/ release/ issue and production/ recording session when different">p</Value>
+      <Value description="Date of distribution/release/issue and production/recording session when different">p</Value>
       <Value description="Questionable date">q</Value>
-      <Value description="Reprint / reissue date and original date">r</Value>
-      <Value description="Single know date / probable date">s</Value>
+      <Value description="Reprint/reissue date and original date">r</Value>
+      <Value description="Single know date/probable date">s</Value>
       <Value description="Publication date and copyright date">t</Value>
       <Value description="Continuings resource status unknown">u</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
-    <Position pos="07-10" name="Date 1" description="A date specified by the code in 008/06 (Type of date/ Publication status)">
+    <Position pos="07-10" name="Date 1" description="A date specified by the code in 008/06 (Type of date/Publication status)">
       <Value description="Date element is not applicable">#</Value>
       <Value description="Date digit">1</Value>
       <Value description="Date digit">2</Value>
@@ -1076,7 +1076,7 @@
       <Value description="Date element is totally or partially unknown">u</Value>
       <Value description="No attempt to code">||||</Value>
     </Position>
-    <Position pos="11-14" name="Date 2" description="A date specified by the code in 008/06 (Type of date/ Publication status)">
+    <Position pos="11-14" name="Date 2" description="A date specified by the code in 008/06 (Type of date/Publication status)">
       <Value description="Date element is not applicable">#</Value>
       <Value description="Date digit">1</Value>
       <Value description="Date digit">2</Value>
@@ -1091,12 +1091,12 @@
       <Value description="No attempt to code">||||</Value>
     </Position>
     <Position pos="15-17" url="http://www.loc.gov/marc/countries/countries_code.html" urltext="MARC Code List for Countries" name="Place of publication, production, or execution" description="">
-      <Value description="Various places">vp# </Value>
+      <Value description="Various places">vp#</Value>
       <Value description="No place, unknown, or undetermined">xx#</Value>
       <Value description="Two-character alphabetic code">[aa#]</Value>
       <Value description="Three-character alphabetic code">[aaa]</Value>
     </Position>
-    <Position pos="18-20" name="Running time for motion pictures and videorecordings " description="Three-digit number that indicates the total running time of the motion picture or videorecording. The number is right justified and each unused position contains a zero.">
+    <Position pos="18-20" name="Running time for motion pictures and videorecordings" description="Three-digit number that indicates the total running time of the motion picture or videorecording. The number is right justified and each unused position contains a zero.">
       <Value description="Running time exceeds three characters">000</Value>
       <Value description="Running time">001-999</Value>
       <Value description="Not applicable">nnn</Value>
@@ -1121,7 +1121,7 @@
       <Value description="Not a government publication">#</Value>
       <Value description="Autonomous or semi-autonomous component">a</Value>
       <Value description="Multilocal">c</Value>
-      <Value description="Federal / National">f</Value>
+      <Value description="Federal/National">f</Value>
       <Value description="International intergovernmental">i</Value>
       <Value description="Local">l</Value>
       <Value description="Multistate">m</Value>
@@ -1137,19 +1137,19 @@
       <Value description="Microfiche">b</Value>
       <Value description="Microopaque">c</Value>
       <Value description="Large print">d</Value>
-      <Value description="Braille ">f</Value>
-      <Value description="Online.  The resource is accessed by means of hardware and software connections to a communications network. If a distinction between types of electronic resources is not necessary, code s can be used as a generic code for any form of electronic resource.">o</Value>
-      <Value description="Direct electronic. Storage on a directly accessible tangible recording medium, e.g. disc, tape, playaway device, flashdrive, portable hard drive, etc. If a distinction between types of electronic resources is not necessary, code s can be used as a generic code for any form of electronic resource.">q</Value>
+      <Value description="Braille">f</Value>
+      <Value description="Online">o</Value>
+      <Value description="Direct electronic">q</Value>
       <Value description="Regular print reproduction">r</Value>
-      <Value description="Electronic. Intended for manipulation by a computer. May reside in a carrier accessed either directly or remotely, in some cases requiring the use of peripheral devices attached to the computer (e.g., a CD-ROM player). Not used for items that do not require the use of a computer (e.g., music compact discs, videodiscs). This code can be used as a generic code for any form of electronic resource. Codes o and q may be used if there is a need to separately identify online and direct electronic resources.">s</Value>
+      <Value description="Electronic">s</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="30-32" name="Undefined" description="Undefined; each contains a blank (#) or a fill character (|)."/>
     <Position pos="33" name="Type of visual material" description="One-character alphabetic code that indicates the type of visual material being described.">
-      <Value description="Art original ">a</Value>
-      <Value description="Kit.Mixture of components from two or more categories, that is, sound recording, maps, filmstrips, etc., no one of which is the predominant constituent of the item.">b</Value>
+      <Value description="Art original">a</Value>
+      <Value description="Kit">b</Value>
       <Value description="Art reproduction">c</Value>
-      <Value description="Diorama ">d</Value>
+      <Value description="Diorama">d</Value>
       <Value description="Filmstrip">f</Value>
       <Value description="Game">g</Value>
       <Value description="Picture">i</Value>
@@ -1160,7 +1160,7 @@
       <Value description="Flash card">o</Value>
       <Value description="Microscope slide">p</Value>
       <Value description="Model">q</Value>
-      <Value description="Realia ">r</Value>
+      <Value description="Realia">r</Value>
       <Value description="Slide">s</Value>
       <Value description="Transparency">t</Value>
       <Value description="Videorecording">v</Value>
@@ -1204,7 +1204,7 @@
   </Material>
   <Material id="MX" name="Mixed Materials" description="">
     <Position pos="00-05" name="Date entered on file" description=""/>
-    <Position pos="06" name="Type of date/ Publication status" description="">
+    <Position pos="06" name="Type of date/Publication status" description="">
       <Value description="No dates given; B.C. date involved">b</Value>
       <Value description="Continuing resource currently published">c</Value>
       <Value description="Continuing resource ceased publication">d</Value>
@@ -1213,15 +1213,15 @@
       <Value description="Range of years of bulk of collection">k</Value>
       <Value description="Multiple dates">m</Value>
       <Value description="Dates unknown">n</Value>
-      <Value description="Date of distribution/ release/ issue and production/ recording session when different">p</Value>
+      <Value description="Date of distribution/release/issue and production/recording session when different">p</Value>
       <Value description="Questionable date">q</Value>
-      <Value description="Reprint / reissue date and original date">r</Value>
-      <Value description="Single know date / probable date">s</Value>
+      <Value description="Reprint/reissue date and original date">r</Value>
+      <Value description="Single know date/probable date">s</Value>
       <Value description="Publication date and copyright date">t</Value>
       <Value description="Continuings resource status unknown">u</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
-    <Position pos="07-10" name="Date 1" description="A date specified by the code in 008/06 (Type of date/ Publication status)">
+    <Position pos="07-10" name="Date 1" description="A date specified by the code in 008/06 (Type of date/Publication status)">
       <Value description="Date element is not applicable">#</Value>
       <Value description="Date digit">1</Value>
       <Value description="Date digit">2</Value>
@@ -1235,7 +1235,7 @@
       <Value description="Date element is totally or partially unknown">u</Value>
       <Value description="No attempt to code">||||</Value>
     </Position>
-    <Position pos="11-14" name="Date 2" description="A date specified by the code in 008/06 (Type of date/ Publication status)">
+    <Position pos="11-14" name="Date 2" description="A date specified by the code in 008/06 (Type of date/Publication status)">
       <Value description="Date element is not applicable">#</Value>
       <Value description="Date digit">1</Value>
       <Value description="Date digit">2</Value>
@@ -1250,7 +1250,7 @@
       <Value description="No attempt to code">||||</Value>
     </Position>
     <Position pos="15-17" url="http://www.loc.gov/marc/countries/countries_code.html" urltext="MARC Code List for Countries" name="Place of publication, production, or execution" description="">
-      <Value description="Various places">vp# </Value>
+      <Value description="Various places">vp#</Value>
       <Value description="No place, unknown, or undetermined">xx#</Value>
       <Value description="Two-character alphabetic code">[aa#]</Value>
       <Value description="Three-character alphabetic code">[aaa]</Value>
@@ -1262,11 +1262,11 @@
       <Value description="Microfiche">b</Value>
       <Value description="Microopaque">c</Value>
       <Value description="Large print">d</Value>
-      <Value description="Braille ">f</Value>
-      <Value description="Online.  The resource is accessed by means of hardware and software connections to a communications network. If a distinction between types of electronic resources is not necessary, code s can be used as a generic code for any form of electronic resource.">o</Value>
+      <Value description="Braille">f</Value>
+      <Value description="Online">o</Value>
       <Value description="Direct electronic">q</Value>
       <Value description="Regular print reproduction">r</Value>
-      <Value description="Electronic. Intended for manipulation by a computer. May reside in a carrier accessed either directly or remotely, in some cases requiring the use of peripheral devices attached to the computer (e.g., a CD-ROM player). Not used for items that do not requi">s</Value>
+      <Value description="Electronic">s</Value>
       <Value description="No attempt to code">|</Value>
     </Position>
     <Position pos="24-34" name="Undefined" description="Undefined; each contains a blank (#) or a fill character (|)."/>
-- 
2.39.5