diff --git a/examples/functions/fares/rail/Netex_era_toc_uk.xml b/examples/functions/fares/rail/Netex_era_toc_uk.xml
index 273b712c4..9526ee597 100644
--- a/examples/functions/fares/rail/Netex_era_toc_uk.xml
+++ b/examples/functions/fares/rail/Netex_era_toc_uk.xml
@@ -5198,7 +5198,7 @@ Customers should check with Customer Services of individual Train Companies for
Prices will be fetched dynamically
-
+
03.00
@@ -5208,7 +5208,7 @@ Customers should check with Customer Services of individual Train Companies for
Prices will be fetched dynamically
-
+
04.00
@@ -5218,7 +5218,7 @@ Customers should check with Customer Services of individual Train Companies for
Prices will be fetched dynamically
-
+
05.00
@@ -5258,7 +5258,7 @@ Customers should check with Customer Services of individual Train Companies for
Prices will be fetched dynamically
-
+
02.00
@@ -5268,7 +5268,7 @@ Customers should check with Customer Services of individual Train Companies for
Prices will be fetched dynamically
-
+
03.00
@@ -5278,7 +5278,7 @@ Customers should check with Customer Services of individual Train Companies for
Prices will be fetched dynamically
-
+
04.00
@@ -8974,7 +8974,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g
-
+
@@ -8986,7 +8986,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g
-
+
@@ -8999,7 +8999,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g
-
+
@@ -9025,7 +9025,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g
-
+
Suffolk
@@ -9050,7 +9050,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g
-
+
Norfolk
@@ -9075,7 +9075,7 @@ Short Term (1/4/18-1/6/18): £135.00 Short term (1/4-1/6): £230.00d with this g
-
+
Norfolk
@@ -10441,7 +10441,7 @@ C2C, Chiltern Railways, Great Western Railway, Great Northern rail, London Midla
Area in which Network Railcards are valid
-
+
diff --git a/examples/functions/site/Netex_14_Olympic Venues 1.1.xml b/examples/functions/site/Netex_14_Olympic Venues 1.1.xml
index bced9b180..63ecb7ac9 100644
--- a/examples/functions/site/Netex_14_Olympic Venues 1.1.xml
+++ b/examples/functions/site/Netex_14_Olympic Venues 1.1.xml
@@ -149,7 +149,7 @@
-
+
fr
translation
Parc Olympique
@@ -323,7 +323,7 @@
-
+
fr
translation
Centre aquatique
@@ -348,7 +348,7 @@
-
+
fr
translation
Stade olympique
@@ -373,7 +373,7 @@
-
+
fr
translation
Vélodrome
@@ -398,7 +398,7 @@
-
+
fr
translation
Pavillon de basketball
@@ -423,7 +423,7 @@
-
+
fr
translation
Centre de Hockey
@@ -448,7 +448,7 @@
-
+
fr
translation
Pavillon de water-polo
@@ -473,7 +473,7 @@
-
+
fr
translation
Pavillon de handball
@@ -498,7 +498,7 @@
-
+
fr
translation
Piste de BMX
diff --git a/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml b/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml
index 907939291..88c19110d 100644
--- a/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml
+++ b/examples/functions/timetable/Netex_01.1_Bus_SimpleTimetable_JourneysOnly.xml
@@ -152,7 +152,7 @@ The Calendar is shown coded as
Bravo Rd
BRAV
-
+
textToSpeech
Bravo
diff --git a/examples/standards/era_uic/Netex_Eurostar_stations.xml b/examples/standards/era_uic/Netex_Eurostar_stations.xml
index 23d29a9e8..3d92926f9 100644
--- a/examples/standards/era_uic/Netex_Eurostar_stations.xml
+++ b/examples/standards/era_uic/Netex_Eurostar_stations.xml
@@ -2421,7 +2421,7 @@
WISSEMBOURG FRONTIERE
-
+
alias
WISSEMBOURG FRONT
@@ -2443,7 +2443,7 @@
LILLE CHR
-
+
alias
LILLE CHR
@@ -2464,7 +2464,7 @@
LILLE-FLANDRES (B)
-
+
alias
LILLE-FLANDRES
@@ -2485,7 +2485,7 @@
LILLE FLANDRES
-
+
alias
LILLE FLANDRES
@@ -2506,7 +2506,7 @@
LILLE EUROPE
-
+
alias
LILLE EUROPE
@@ -2528,7 +2528,7 @@
CALAIS VILLE
-
+
alias
CALAIS VILLE
@@ -2549,7 +2549,7 @@
CALAIS FRETHUN
-
+
alias
CALAIS FRETHUN
@@ -2570,7 +2570,7 @@
MARNE LA VALLEE CHESSY
-
+
alias
MARNE LA VAL CHES
@@ -2591,7 +2591,7 @@
MARNE LA VALLEE CHESSY SNCF
-
+
alias
MARNE
@@ -2612,7 +2612,7 @@
BRUXELLES AGGLO/BRUSSEL AGGLO
-
+
alias
BRUXELLES
@@ -2627,12 +2627,12 @@
BRUXELLES MIDI EUROSTAR
-
+
NL
translation
BRUSSEL ZUID EUROSTAR
-
+
FR
translation
BRUXELLES MIDI EUROSTAR
@@ -2648,12 +2648,12 @@
BRUXELLES-MIDI
-
+
NL
translation
BRUSSEL-ZUID
-
+
FR
translation
BRUXELLES-MIDI
@@ -2675,7 +2675,7 @@
PARIS NORD
-
+
alias
PARIS NORD
@@ -2696,7 +2696,7 @@
GARE DU NORD
-
+
alias
GARE DU NORD
@@ -2717,7 +2717,7 @@
GARE DU NORD SURFACE
-
+
alias
GARE DU NORD SURF
@@ -2738,7 +2738,7 @@
PARIS GARE DE LYON
-
+
alias
PARIS GARE LYON
@@ -2759,7 +2759,7 @@
PARIS BERCY
-
+
alias
PARIS BERCY
@@ -2780,7 +2780,7 @@
PARIS AUSTERLITZ
-
+
alias
PARIS AUSTERLITZ
@@ -2801,7 +2801,7 @@
PARIS AUSTERLITZ RER C
-
+
alias
PARIS-AUST RERC
@@ -2822,7 +2822,7 @@
PARIS GARE DE LYON RER
-
+
alias
PARIS LYON RER
@@ -2843,7 +2843,7 @@
PARIS ST LAZARE
-
+
alias
PARIS ST LAZARE
@@ -2864,7 +2864,7 @@
PARIS MONTPARNASSE 1 ET 2
-
+
alias
PARIS MONT 1 ET 2
@@ -2885,7 +2885,7 @@
GARE DE LYON BANLIEUE
-
+
alias
GARE DE LYON BANL
@@ -2906,7 +2906,7 @@
PARIS MONTPARNASSE 3 VAUGIRARD
-
+
alias
PARIS MONT 3 VAUG
@@ -2927,7 +2927,7 @@
PARIS EST
-
+
alias
PARIS EST
@@ -2948,7 +2948,7 @@
ST PANCRAS
-
+
alias
ST
@@ -2969,7 +2969,7 @@
EBBSFLEET
-
+
alias
EBBSFLEET
@@ -2990,7 +2990,7 @@
ASHFORD INTERNATIONAL
-
+
alias
ASHFORD
@@ -3011,7 +3011,7 @@
AVIGNON CENTRE
-
+
alias
AVIGNON CENTRE
@@ -3032,7 +3032,7 @@
AVIGNON TGV
-
+
alias
AVIGNON TGV
@@ -3053,7 +3053,7 @@
BOURG ST MAURICE
-
+
alias
BOURG ST MAURICE
@@ -3074,7 +3074,7 @@
AIME LA PLAGNE
-
+
alias
AIME LA PLAGNE
@@ -3095,7 +3095,7 @@
MOUTIERS SALINS BRIDES L BAINS
-
+
alias
MOUTIERS SALINS B
diff --git a/examples/standards/era_uic/Netex_era_uic_complexsite.xml b/examples/standards/era_uic/Netex_era_uic_complexsite.xml
index 576511516..6f199779c 100644
--- a/examples/standards/era_uic/Netex_era_uic_complexsite.xml
+++ b/examples/standards/era_uic/Netex_era_uic_complexsite.xml
@@ -2288,7 +2288,7 @@ This example shows all stations within Paris, the connections between them and t
PARIS NORD
PARIS NORD
-
+
alias
PARIS NORD
@@ -2313,7 +2313,7 @@ This example shows all stations within Paris, the connections between them and t
GARE DU NORD
GARE DU NORD
-
+
alias
GARE DU NORD
@@ -2338,7 +2338,7 @@ This example shows all stations within Paris, the connections between them and t
GARE DU NORD SURFACE
GARE DU NORD SURF
-
+
alias
GARE DU NORD SURF
@@ -2363,7 +2363,7 @@ This example shows all stations within Paris, the connections between them and t
PARIS GARE DE LYON
PARIS GARE LYON
-
+
alias
PARIS GARE LYON
@@ -2388,7 +2388,7 @@ This example shows all stations within Paris, the connections between them and t
PARIS BERCY
PARIS BERCY
-
+
alias
PARIS BERCY
@@ -2413,7 +2413,7 @@ This example shows all stations within Paris, the connections between them and t
PARIS AUSTERLITZ
PARIS AUSTERLITZ
-
+
alias
PARIS AUSTERLITZ
@@ -2438,7 +2438,7 @@ This example shows all stations within Paris, the connections between them and t
PARIS AUSTERLITZ RER C
PARIS-AUST RERC
-
+
alias
PARIS-AUST RERC
@@ -2463,7 +2463,7 @@ This example shows all stations within Paris, the connections between them and t
PARIS GARE DE LYON RER
PARIS LYON RER
-
+
alias
PARIS LYON RER
@@ -2488,7 +2488,7 @@ This example shows all stations within Paris, the connections between them and t
PARIS ST LAZARE
PARIS ST LAZARE
-
+
alias
PARIS ST LAZARE
@@ -2513,7 +2513,7 @@ This example shows all stations within Paris, the connections between them and t
PARIS MONTPARNASSE 1 ET 2
PARIS MONT 1 ET 2
-
+
alias
PARIS MONT 1 ET 2
@@ -2538,7 +2538,7 @@ This example shows all stations within Paris, the connections between them and t
GARE DE LYON BANLIEUE
GARE DE LYON BANL
-
+
alias
GARE DE LYON BANL
@@ -2563,7 +2563,7 @@ This example shows all stations within Paris, the connections between them and t
PARIS MONTPARNASSE 3 VAUGIRARD
PARIS MONT 3 VAUG
-
+
alias
PARIS MONT 3 VAUG
@@ -2588,7 +2588,7 @@ This example shows all stations within Paris, the connections between them and t
PARIS EST
PARIS EST
-
+
alias
PARIS EST
diff --git a/examples/standards/era_uic/Netex_era_uic_scheduledstoppointsforaregion.xml b/examples/standards/era_uic/Netex_era_uic_scheduledstoppointsforaregion.xml
index 4c5524e3d..8eccdab05 100644
--- a/examples/standards/era_uic/Netex_era_uic_scheduledstoppointsforaregion.xml
+++ b/examples/standards/era_uic/Netex_era_uic_scheduledstoppointsforaregion.xml
@@ -141,7 +141,7 @@ A COMPOSITE FRAME IS used for grouping.
LILLE CHR
LILLE CHR
-
+
alias
LILLE CHR
@@ -166,7 +166,7 @@ A COMPOSITE FRAME IS used for grouping.
LILLE-FLANDRES (B)
LILLE-FLANDRES
-
+
alias
LILLE-FLANDRES
@@ -191,7 +191,7 @@ A COMPOSITE FRAME IS used for grouping.
LILLE FLANDRES
LILLE FLANDRES
-
+
alias
LILLE FLANDRES
@@ -216,7 +216,7 @@ A COMPOSITE FRAME IS used for grouping.
LILLE EUROPE
LILLE EUROPE
-
+
alias
LILLE EUROPE
diff --git a/examples/standards/era_uic/Netex_era_uic_simplepark(Disneyland).xml b/examples/standards/era_uic/Netex_era_uic_simplepark(Disneyland).xml
index d8ad04b55..64d346a3e 100644
--- a/examples/standards/era_uic/Netex_era_uic_simplepark(Disneyland).xml
+++ b/examples/standards/era_uic/Netex_era_uic_simplepark(Disneyland).xml
@@ -87,7 +87,7 @@ A COMPOSITE FRAME IS used for grouping the other frames.
MARNE LA VALLEE CHESSY
MARNE LA VAL CHES
-
+
alias
MARNE LA VAL CHES
@@ -110,7 +110,7 @@ A COMPOSITE FRAME IS used for grouping the other frames.
MARNE LA VALLEE CHESSY SNCF
MARNE
-
+
alias
MARNE
diff --git a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml
index d34a3cbd7..9e14f09b8 100644
--- a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml
+++ b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-(mixed)_2017-01-01 (5).xml
@@ -1053,7 +1053,7 @@ Over 12 miles (within West of England area) £5.50
-
+
Adult
@@ -1107,7 +1107,7 @@ Over 12 miles (within West of England area) £5.50
-
+
child
@@ -3063,7 +3063,7 @@ Bristol Inner 1 trip short hop | 1.000 £0.60 |
-
+
Bristol Inner
@@ -3074,7 +3074,7 @@ Bristol Inner 1 trip short hop | 1.000 £0.60 |
-
+
Short_Hop - Adult
@@ -3094,7 +3094,7 @@ Bristol Inner 1 trip short hop | 1.000 £0.60 |
-
+
Cash - child
@@ -3147,7 +3147,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 |
-
+
Bristol
@@ -3158,7 +3158,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 |
-
+
Single - Adult
@@ -3178,7 +3178,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 |
-
+
Cash - child
@@ -3200,7 +3200,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 |
-
+
Single - Student
@@ -3222,7 +3222,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 |
-
+
Bath
@@ -3233,7 +3233,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 |
-
+
Single - Adult
@@ -3253,7 +3253,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 |
-
+
Cash - child
@@ -3275,7 +3275,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 |
-
+
Single - Student
@@ -3297,7 +3297,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 |
-
+
Weston-super-mare
@@ -3308,7 +3308,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 |
-
+
Single - Adult
@@ -3328,7 +3328,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 |
-
+
Cash - child
@@ -3350,7 +3350,7 @@ Weston-super-Mare Town Zone 1 trip | £2.00 £1.00 £1.40 |
-
+
Single - Student
@@ -3400,10 +3400,10 @@ Weston £18 £9 £12.60
-
+
5 journeys
-
+
10 journeys
@@ -3414,7 +3414,7 @@ Weston £18 £9 £12.60
-
+
Multitrip - Adult
@@ -3441,7 +3441,7 @@ Weston £18 £9 £12.60
-
+
Cash - child
@@ -3472,7 +3472,7 @@ Weston £18 £9 £12.60
-
+
Multitrip - Student
diff --git a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml
index 71360a63e..f3a340c30 100644
--- a/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml
+++ b/examples/standards/fxc/FX-PI-01_UK_FBRI_NETWORK-FARE_WOE-Bristol-pass-(Z2Z)_2017-01-01.xml
@@ -2347,19 +2347,19 @@ Over 12 miles (within West of England area) £ 6.50 | £ 3.30 | £ 4.50 |
First Somerset & Avon Ltd nocn:136361
-
+
Adult
-
+
child
-
+
Student
diff --git a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml
index ba030f2c7..b1af68ab3 100644
--- a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml
+++ b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-period_20200310.xml
@@ -5386,7 +5386,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Sheffield
@@ -5400,7 +5400,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Cash
@@ -5414,7 +5414,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Adult
@@ -5449,7 +5449,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Adult
@@ -5483,7 +5483,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Family
@@ -5507,7 +5507,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Student
@@ -5529,7 +5529,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
m-ticket
@@ -5543,7 +5543,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Adult
@@ -5594,7 +5594,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Child / Youth
@@ -5638,7 +5638,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Family
@@ -5652,7 +5652,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Student
@@ -5689,7 +5689,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Subscription
@@ -5741,7 +5741,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
South Yorkshir
@@ -5755,7 +5755,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Cash
@@ -5769,7 +5769,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Adult
@@ -5804,7 +5804,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Child / Youth
@@ -5838,7 +5838,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Group
@@ -5863,7 +5863,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Student
@@ -5890,7 +5890,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
m-ticket
@@ -5904,7 +5904,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Adult
@@ -5955,7 +5955,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Child / Youth
@@ -5999,7 +5999,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Family
@@ -6024,7 +6024,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Student
@@ -6069,7 +6069,7 @@ ______ ______ _____ | ______ ______ ______ _______ | ______ ______ ______ ______
-
+
Subscription
diff --git a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml
index 6149fe8be..d6b4c9cd7 100644
--- a/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml
+++ b/examples/standards/fxc/FX-PI-01_UK_FSYO_NETWORK_FARE_FirstSheffield-pass-by-user_20200310.xml
@@ -5341,7 +5341,7 @@ FirstYear: 1 year | xxxxx xxxxx xxxxx xxxxx | £572.00 xxxxx xxxxx xxxxx |
-
+
Sheffield
@@ -5355,7 +5355,7 @@ FirstYear: 1 year | xxxxx xxxxx xxxxx xxxxx | £572.00 xxxxx xxxxx xxxxx |
-
+
Cash
@@ -5381,7 +5381,7 @@ Firstweek : 7 day | £14.50
-