diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
index 315f9ba2e..7bcc47811 100644
--- a/xsd/NeTEx_publication.xsd
+++ b/xsd/NeTEx_publication.xsd
@@ -320,7 +320,7 @@
 		</xsd:unique>
 		<!-- =====ResponsibilitySet Key ========================== -->
 		<xsd:keyref name="ResponsibilitySet_AnyKeyRef" refer="netex:ResponsibilitySet_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ResponsibilitySetRef | .//netex:DefaultResponsibilitySetRef  | .//netex:DelegatedResponsibilitySetRef"/>
+			<xsd:selector xpath=".//netex:ResponsibilitySetRef | .//netex:DefaultResponsibilitySetRef | .//netex:DelegatedResponsibilitySetRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -794,7 +794,7 @@
 		</xsd:unique>
 		<!-- =====GeneralGroupOfEntities Key ========================== -->
 		<xsd:keyref name="GeneralGroupOfEntities_AnyKeyRef" refer="netex:GeneralGroupOfEntities_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:GeneralGroupOfEntitiesRef   | DistributionGroupRef"/>
+			<xsd:selector xpath=".//netex:GeneralGroupOfEntitiesRef | DistributionGroupRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -827,12 +827,12 @@
 		<!-- =====TypeOfPoint============================== -->
 		<!-- =====Point============================== -->
 		<xsd:keyref name="Point_AnyKeyRef" refer="netex:Point_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:PointRef  |.//netex:ProjectedObjectRef"/>
+			<xsd:selector xpath=".//netex:PointRef | .//netex:ProjectedObjectRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="Point_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:Point | .//netex:RoutePoint | .//netex:TimingPoint | .//netex:ReliefPoint | .//netex:ParkingPoint | .//netex:GaragePoint | .//netex:ScheduledStopPoint   | .//netex:RoadJunction | .//netex:RailwayJunction | .//netex:WireJunction | .//netex:ActivationPoint | .//netex:BeaconPoint | .//netex:TrafficControlPoint |.//netex:PathJunction  |.//netex:FareScheduledStopPoint   |.//netex:BorderPoint"/>
+			<xsd:selector xpath=".//netex:Point | .//netex:RoutePoint | .//netex:TimingPoint | .//netex:ReliefPoint | .//netex:ParkingPoint | .//netex:GaragePoint | .//netex:ScheduledStopPoint | .//netex:RoadJunction | .//netex:RailwayJunction | .//netex:WireJunction | .//netex:ActivationPoint | .//netex:BeaconPoint | .//netex:TrafficControlPoint | .//netex:PathJunction | .//netex:FareScheduledStopPoint | .//netex:BorderPoint"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -858,7 +858,7 @@
 		</xsd:key>
 		<!-- =====Link============================== -->
 		<xsd:keyref name="Link_AnyKeyRef" refer="netex:Link_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:LinkRef |.//netex:ProjectToLinkRef | .//netex:ProjectedLinkRef  |.//netex:ProjectedObjectRef"/>
+			<xsd:selector xpath=".//netex:LinkRef | .//netex:ProjectToLinkRef | .//netex:ProjectedLinkRef | .//netex:ProjectedObjectRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -895,13 +895,13 @@
 			<xsd:annotation>
 				<xsd:documentation>Every [PointOnLink Id + PointOnLink] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath=".//netex:PointOnLink| .//netex:StartPointOnLink| .//netex:EndPointOnLink"/>
+			<xsd:selector xpath=".//netex:PointOnLink | .//netex:StartPointOnLink | .//netex:EndPointOnLink"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
 		<!-- =====PointOnLink Key ========================== -->
 		<xsd:keyref name="PointOnLink_AnyKeyRef" refer="netex:PointOnLink_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:PointOnLinkRef |.//netex:StartPointOnLinkRef |.//netex:EndPointOnLinkRef"/>
+			<xsd:selector xpath=".//netex:PointOnLinkRef | .//netex:StartPointOnLinkRef | .//netex:EndPointOnLinkRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -1038,12 +1038,12 @@
 		</xsd:key>
 		<!-- =====Zone============================== --> 
  	<xsd:keyref name="Zone_AnyKeyRef" refer="netex:Zone_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ZoneRef | .//netex:ParentZoneRef | .//netex:ProjectedZoneRef | .//netex:ProjectToZoneRef |.//netex:ProjectedObjectRef"/>
+			<xsd:selector xpath=".//netex:ZoneRef | .//netex:ParentZoneRef | .//netex:ProjectedZoneRef | .//netex:ProjectToZoneRef | .//netex:ProjectedObjectRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="Zone_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:Zone | .//netex:TariffZone | .//netex:FareZone | .//netex:RoutingConstraintZone | .//netex:ConnectionZone  | .//netex:PointOfInterest | .//netex:Parking | .//netex:ParkingArea | .//netex:ParkingBay | .//netex:TopographicPlace | .//netex:Quay | .//netex:AccessSpace | .//netex:PointOfInterestSpace | .//netex:StopPlace| .//netex:Garage| .//netex:EquipmentPlace | .//netex:FlexibleArea | .//netex:HailAndRideArea | .//netex:FlexibleQuay| .//netex:StopPlaceEntrance |  .//netex:PointOfInterestEntrance |  .//netex:ParkingPassengerEntrance | .//netex:BoardingPosition | .//netex:VehicleStoppingPlace | .//netex:VehicleEntrance   | .//netex:TransportAdministrativeZone | .//netex:AdministrativeZone | .//netex:GeneralZone"/>
+			<xsd:selector xpath=".//netex:Zone | .//netex:TariffZone | .//netex:FareZone | .//netex:RoutingConstraintZone | .//netex:ConnectionZone | .//netex:PointOfInterest | .//netex:Parking | .//netex:ParkingArea | .//netex:ParkingBay | .//netex:TopographicPlace | .//netex:Quay | .//netex:AccessSpace | .//netex:PointOfInterestSpace | .//netex:StopPlace| .//netex:Garage| .//netex:EquipmentPlace | .//netex:FlexibleArea | .//netex:HailAndRideArea | .//netex:FlexibleQuay| .//netex:StopPlaceEntrance | .//netex:PointOfInterestEntrance | .//netex:ParkingPassengerEntrance | .//netex:BoardingPosition | .//netex:VehicleStoppingPlace | .//netex:VehicleEntrance | .//netex:TransportAdministrativeZone | .//netex:AdministrativeZone | .//netex:GeneralZone"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>  
@@ -1059,7 +1059,7 @@
 		</xsd:unique>
 		<!-- =====TariffZone Key ========================== -->
 		<xsd:keyref name="TariffZone_AnyKeyRef" refer="netex:TariffZone_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:TariffZoneRef | .//netex:ParentTariffZoneRef | .//netex:StartTariffZoneRef | .//netex:EndTariffZoneRef | .//netex:FareZoneRef   |.//netex:ProjectedObjectRef"/>
+			<xsd:selector xpath=".//netex:TariffZoneRef | .//netex:ParentTariffZoneRef | .//netex:StartTariffZoneRef | .//netex:EndTariffZoneRef | .//netex:FareZoneRef | .//netex:ProjectedObjectRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -1330,7 +1330,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="Organisation_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:GeneralOrganisation | .//netex:Authority | .//netex:Operator | .//netex:ServicedOrganisation | .//netex:TravelAgent | .//netex:ManagementAgent  | .//netex:RetailConsortium"/>
+			<xsd:selector xpath=".//netex:GeneralOrganisation | .//netex:Authority | .//netex:Operator | .//netex:ServicedOrganisation | .//netex:TravelAgent | .//netex:ManagementAgent | .//netex:RetailConsortium"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -1346,7 +1346,7 @@
 		</xsd:unique>
 		<!-- =====OrganisationPart Key ========================== -->
 		<xsd:keyref name="OrganisationPart_KeyRef" refer="netex:OrganisationPart_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:OrganisationPartRef |.//netex:ResponsibilityRoleAssignment/netex:ResponsiblePartRef"/>
+			<xsd:selector xpath=".//netex:OrganisationPartRef | .//netex:ResponsibilityRoleAssignment/netex:ResponsiblePartRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -1443,7 +1443,7 @@
 		</xsd:unique>
 		<!-- =====Operator Key ========================== -->
 		<xsd:keyref name="Operator_KeyRef" refer="netex:Operator_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:OperatorRef | .//netex:ParentOperatorRef |.//netex:ServiceFacilitySet/netex:ProvidedByRef"/>
+			<xsd:selector xpath=".//netex:OperatorRef | .//netex:ParentOperatorRef | .//netex:ServiceFacilitySet/netex:ProvidedByRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -1569,7 +1569,7 @@
 		</xsd:unique>
 		<!-- =====TransportAdministrativeZone Key ========================== -->
 		<xsd:keyref name="TransportAdministrativeZone_KeyRef" refer="netex:TransportAdministrativeZone_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:TransportAdministrativeZoneRef |.//netex:ResponsibilityRoleAssignment/netex:ResponsibleAreaRef"/>
+			<xsd:selector xpath=".//netex:TransportAdministrativeZoneRef | .//netex:ResponsibilityRoleAssignment/netex:ResponsibleAreaRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -1721,7 +1721,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="Equipment_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:Equipment | .//netex:PlaceEquipment | .//netex:InstalledEquipment | .//netex:ActualVehicleEquipment | .//netex:TicketValidatorEquipment | .//netex:TicketingEquipment   | .//netex:SanitaryEquipment  | .//netex:PassengerSafetyEquipment | .//netex:RubbishDisposalEquipment    |.//netex:PassengerInformationEquipment   | .//netex:EntranceEquipment  | .//netex:LiftEquipment |  .//netex:EscalatorEquipment | .//netex:TravelatorEquipment | .//netex:StaircaseEquipment | .//netex:RampEquipment  | .//netex:RoughSurface  | .//netex:PlaceLighting|  .//netex:PlaceSign |  .//netex:PlaceSign | .//netex:HeadingSign  | .//netex:GeneralSign   |.//netex:WaitingRoomEquipment   | .//netex:ShelterEquipment  | .//netex:SeatingEquipment | .//netex:TrolleyStandEquipment      | .//netex:LuggageLockerEquipment  |  .//netex:CycleParkingEquipment    |.//netex:AccessVehicleEquipment    |.//netex:WheelchairVehicleEquipment"/>
+			<xsd:selector xpath=".//netex:Equipment | .//netex:PlaceEquipment | .//netex:InstalledEquipment | .//netex:ActualVehicleEquipment | .//netex:TicketValidatorEquipment | .//netex:TicketingEquipment | .//netex:SanitaryEquipment | .//netex:PassengerSafetyEquipment | .//netex:RubbishDisposalEquipment | .//netex:PassengerInformationEquipment | .//netex:EntranceEquipment | .//netex:LiftEquipment | .//netex:EscalatorEquipment | .//netex:TravelatorEquipment | .//netex:StaircaseEquipment | .//netex:RampEquipment | .//netex:RoughSurface | .//netex:PlaceLighting|  .//netex:PlaceSign | .//netex:PlaceSign | .//netex:HeadingSign | .//netex:GeneralSign | .//netex:WaitingRoomEquipment | .//netex:ShelterEquipment | .//netex:SeatingEquipment | .//netex:TrolleyStandEquipment | .//netex:LuggageLockerEquipment | .//netex:CycleParkingEquipment | .//netex:AccessVehicleEquipment | .//netex:WheelchairVehicleEquipment"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key> -->
@@ -1816,7 +1816,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="AccessEquipment_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:EntranceEquipment | .//netex:LiftEquipment | .//netex:RampEquipment |.//netex:StaircaseEquipment   | .//netex:EscalatorEquipment  |  .//netex:TravelatorEquipment  | .//netex:RoughSurface | .//netex:PlaceLighting"/>
+			<xsd:selector xpath=".//netex:EntranceEquipment | .//netex:LiftEquipment | .//netex:RampEquipment | .//netex:StaircaseEquipment | .//netex:EscalatorEquipment | .//netex:TravelatorEquipment | .//netex:RoughSurface | .//netex:PlaceLighting"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -2163,7 +2163,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="PassengerEquipment_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:TicketingEquipment | .//netex:TicketValidatorEquipment | .//netex:SanitaryEquipment |.//netex:RubbishDisposalEquipment"/>
+			<xsd:selector xpath=".//netex:TicketingEquipment | .//netex:TicketValidatorEquipment | .//netex:SanitaryEquipment | .//netex:RubbishDisposalEquipment"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -2373,7 +2373,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="LocalService_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:LocalService | .//netex:TicketingService | .//netex:AssistanceService |  .//netex:AssistanceBookingService | .//netex:LuggageService | .//netex:LeftLuggageService | .//netex:CustomerService | .//netex:ComplaintsService | .//netex:LostPropertyService | .//netex:MeetingPointService | .//netex:HireService | .//netex:MoneyService |.//netex:RetailService  |.//netex:CateringService  |.//netex:CommunicationService"/>
+			<xsd:selector xpath=".//netex:LocalService | .//netex:TicketingService | .//netex:AssistanceService | .//netex:AssistanceBookingService | .//netex:LuggageService | .//netex:LeftLuggageService | .//netex:CustomerService | .//netex:ComplaintsService | .//netex:LostPropertyService | .//netex:MeetingPointService | .//netex:HireService | .//netex:MoneyService | .//netex:RetailService | .//netex:CateringService | .//netex:CommunicationService"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -2861,20 +2861,20 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="AvailabilityCondition_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:AvailabilityCondition | .//netex:SimpleAvailabilityCondition |  .//netex:ValidDuring"/>
+			<xsd:selector xpath=".//netex:AvailabilityCondition | .//netex:SimpleAvailabilityCondition | .//netex:ValidDuring"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
 		<!-- =====ObjectRef============================== -->
 		<!--- 
 			<xsd:keyref name="Object_AnyKeyRef" refer="netex:Object_AnyVersionedKey">
-				<xsd:selector xpath=".//netex:ConditionedObjectRef |.//netex:RuleObjectRef"/>
+				<xsd:selector xpath=".//netex:ConditionedObjectRef | .//netex:RuleObjectRef"/>
 				<xsd:field xpath="@ref"/>
 				<xsd:field xpath="@version"/>
 			</xsd:keyref>
 		 
 			<xsd:key name="Object_AnyVersionedKey">
-				<xsd:selector xpath=".//netex:ResourceFrame | .//netex:CompositeFrame | .//netex:SiteFrame | .//netex:ServiceFrame | .//netex:InfrastructureFrame | .//netex:TimetableFrame | .//netex:GeneralFrame  | .//netex:SiteFrame | .//netex:ServiceCalendarFrame | .//netex:VehicleScheduleFrame  |  .//netex:DriverScheduleFrame |.//netex:FareFrame | .//netex:RailwayJunction| .//netex:RoadJunction| .//netex:WireJunction|.//netex:ReliefPoint  |.//netex:GaragePoint  |.//netex:ParkingPoint  | .//netex:ScheduledStopPoint  | .//netex:TimingPoint  |.//netex:ActivationPoint  |.//netex:BeaconPoint  |.//netex:RoutePoint  | .//netex:TrafficControlPoint  |.//netex:Place |.//netex:StopPlace | .//netex:ServiceSite |  .//netex:TopographicPlace |.//netex:PointOfInterest  |.//netex:Parking  |  .//netex:EquipmentPlace  | .//netex:FlexibleStopPlace | .//netex:AccessZone |.//netex:TariffZone | .//netex:RoadAddress | .//netex:PostalAddress |  .//netex:Quay | .//netex:AccessSpace  | .//netex:BoardingPosition |  .//netex:StopArea | .//netex:HailAndRideArea |  .//netex:FlexibleArea |.//netex:VehicleStoppingPlace |  .//netex:VehicleStoppingPosition | .//netex:VehicleEntrance | .//netex:StopPlaceEntrance | .//netex:StopPlaceVehicleEntrance | .//netex:PointOfInterestEntrance | .//netex:ParkingPassengerEntrance |  .//netex:ParkingEntranceForVehicles | .//netex:ParkingBay | .//netex:ParkingArea |   .//netex:AdministrativeZone | .//netex:Country |   .//netex:RoutingConstraintZone  |.//netex:ActivationLink  | .//netex:TimingLink  |  .//netex:ServiceLink | .//netex:Connection |.//netex:Access |  .//netex:NavigationPath |.//netex:PathJunction  | .//netex:VehicleJourney |  .//netex:DeadRun |.//netex:ServiceJourney |.//netex:TemplateServiceJourney |.//netex:TemplateServiceJourney | .//netex:SpecialService |.//netex:DatedVehicleJourney  |.//netex:NormalDatedVehicleJourney |  .//netex:TimingPattern |.//netex:Operator | .//netex:GroupOfOperators |.//netex:Authority | .//netex:OtherOganisation | .//netex:TravelAgent | .//netex:ServicedOrganisation |  .//netex:GeneralOrganisation | .//netex:ManagementAGent | .//netex:Line| .//netex:GroupOfLines |  .//netex:Garage | .//netex:Crewbase  |  .//netex:TimingPattern | .//netex:Route | .//netex:ServicePattern | .//netex:DeadRunPattern |.//netex:GroupOfServices"/>
+				<xsd:selector xpath=".//netex:ResourceFrame | .//netex:CompositeFrame | .//netex:SiteFrame | .//netex:ServiceFrame | .//netex:InfrastructureFrame | .//netex:TimetableFrame | .//netex:GeneralFrame | .//netex:SiteFrame | .//netex:ServiceCalendarFrame | .//netex:VehicleScheduleFrame | .//netex:DriverScheduleFrame | .//netex:FareFrame | .//netex:RailwayJunction| .//netex:RoadJunction| .//netex:WireJunction|.//netex:ReliefPoint | .//netex:GaragePoint | .//netex:ParkingPoint | .//netex:ScheduledStopPoint | .//netex:TimingPoint | .//netex:ActivationPoint | .//netex:BeaconPoint | .//netex:RoutePoint | .//netex:TrafficControlPoint | .//netex:Place | .//netex:StopPlace | .//netex:ServiceSite | .//netex:TopographicPlace | .//netex:PointOfInterest | .//netex:Parking | .//netex:EquipmentPlace | .//netex:FlexibleStopPlace | .//netex:AccessZone | .//netex:TariffZone | .//netex:RoadAddress | .//netex:PostalAddress | .//netex:Quay | .//netex:AccessSpace | .//netex:BoardingPosition | .//netex:StopArea | .//netex:HailAndRideArea | .//netex:FlexibleArea | .//netex:VehicleStoppingPlace | .//netex:VehicleStoppingPosition | .//netex:VehicleEntrance | .//netex:StopPlaceEntrance | .//netex:StopPlaceVehicleEntrance | .//netex:PointOfInterestEntrance | .//netex:ParkingPassengerEntrance | .//netex:ParkingEntranceForVehicles | .//netex:ParkingBay | .//netex:ParkingArea | .//netex:AdministrativeZone | .//netex:Country | .//netex:RoutingConstraintZone | .//netex:ActivationLink | .//netex:TimingLink | .//netex:ServiceLink | .//netex:Connection | .//netex:Access | .//netex:NavigationPath | .//netex:PathJunction | .//netex:VehicleJourney | .//netex:DeadRun | .//netex:ServiceJourney | .//netex:TemplateServiceJourney | .//netex:TemplateServiceJourney | .//netex:SpecialService | .//netex:DatedVehicleJourney | .//netex:NormalDatedVehicleJourney | .//netex:TimingPattern | .//netex:Operator | .//netex:GroupOfOperators | .//netex:Authority | .//netex:OtherOganisation | .//netex:TravelAgent | .//netex:ServicedOrganisation | .//netex:GeneralOrganisation | .//netex:ManagementAGent | .//netex:Line| .//netex:GroupOfLines | .//netex:Garage | .//netex:Crewbase | .//netex:TimingPattern | .//netex:Route | .//netex:ServicePattern | .//netex:DeadRunPattern | .//netex:GroupOfServices"/>
 				<xsd:field xpath="@id"/>
 				<xsd:field xpath="@version"/>
 			</xsd:key>  -->
@@ -2920,7 +2920,7 @@
 		</xsd:unique>
 		<!-- =====VehicleType Key ========================== -->
 		<xsd:keyref name="VehicleType_KeyRef" refer="netex:VehicleType_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:VehicleTypeRef | .//netex:ForVehicleTypeRef | .//netex:AgainstVehicleTypeRef  | .//netex:OvertakingVehicleTypeRef | .//netex:OvertakenVehicleTypeRef"/>
+			<xsd:selector xpath=".//netex:VehicleTypeRef | .//netex:ForVehicleTypeRef | .//netex:AgainstVehicleTypeRef | .//netex:OvertakingVehicleTypeRef | .//netex:OvertakenVehicleTypeRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -3172,7 +3172,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="Site_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:StopPlace | .//netex:Parking | .//netex:PointOfInterest  | .//netex:ServiceSite"/>
+			<xsd:selector xpath=".//netex:StopPlace | .//netex:Parking | .//netex:PointOfInterest | .//netex:ServiceSite"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -3184,7 +3184,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="Entrance_AnyVersionedKey">
-			<xsd:selector xpath="| .//netex:StopPlaceEntrance| .//netex:PointOfInterestEntrance |   .//netex:ParkingPassengerEntrance | .//netex:ParkingEntranceForVehicles"/>
+			<xsd:selector xpath=".//netex:StopPlaceEntrance| .//netex:PointOfInterestEntrance | .//netex:ParkingPassengerEntrance | .//netex:ParkingEntranceForVehicles"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key> -->
@@ -3264,7 +3264,7 @@
 		</xsd:unique>
 		<!-- =====StopPlace Key ========================== -->
 		<xsd:keyref name="StopPlace_KeyRef" refer="netex:StopPlace_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:StopPlaceRef  | .//netex:AdjacentStopPlaceRef"/>
+			<xsd:selector xpath=".//netex:StopPlaceRef | .//netex:AdjacentStopPlaceRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -3858,7 +3858,7 @@
 			<xsd:annotation>
 				<xsd:documentation>Every [PathJunction Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath=".//netex:PathJunction|.//netex:PathLink/netex:FromPointRef"/>
+			<xsd:selector xpath=".//netex:PathJunction | .//netex:PathLink/netex:FromPointRef"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
@@ -4000,7 +4000,7 @@
 		</xsd:unique>
 		<!-- =====RoadJunction Key ========================== -->
 		<xsd:keyref name="RoadJunction_KeyRef" refer="netex:RoadJunction_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:RoadPointRef | .//netex:RoadElement/netex:FromPointRef |.//netex:RoadElement/netex:ToPointRef"/>
+			<xsd:selector xpath=".//netex:RoadPointRef | .//netex:RoadElement/netex:FromPointRef | .//netex:RoadElement/netex:ToPointRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -4117,7 +4117,7 @@
 		<!-- =====InfrastructurePoint============================== -->
 		<!-- =====InfrastructurePoint Key ========================== -->
 		<xsd:keyref name="InfrastructurePoint_KeyRef" refer="netex:InfrastructurePoint_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:InfrastructurePointRef |.//netex:OvertakingAtPointRef"/>
+			<xsd:selector xpath=".//netex:InfrastructurePointRef | .//netex:OvertakingAtPointRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -4129,7 +4129,7 @@
 		<!-- =====InfrastructurePoint============================== -->
 		<!-- =====InfrastructureLink Key ========================== -->
 		<xsd:keyref name="InfrastructureLink_KeyRef" refer="netex:InfrastructureLink_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:InfrastructureLinkRef |.//netex:OvertakingOnLinkRef"/>
+			<xsd:selector xpath=".//netex:InfrastructureLinkRef | .//netex:OvertakingOnLinkRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -4240,7 +4240,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="ActivationPoint_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ActivationPoint |.//netex:BeaconPoint"/>
+			<xsd:selector xpath=".//netex:ActivationPoint | .//netex:BeaconPoint"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -4412,7 +4412,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="GroupOfLines_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:GroupOfLines |.//netex:Network"/>
+			<xsd:selector xpath=".//netex:GroupOfLines | .//netex:Network"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -4448,7 +4448,7 @@
 		</xsd:unique>
 		<!-- =====Direction Key ========================== -->
 		<xsd:keyref name="Direction_KeyRef" refer="netex:Direction_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:DirectionRef |.//netex:ReverseDirectionRef"/>
+			<xsd:selector xpath=".//netex:DirectionRef | .//netex:ReverseDirectionRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -4500,7 +4500,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="RoutePoint_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:RoutePoint | .//netex:ScheduledStopPoint | .//netex:GaragePoint | .//netex:ParkingPoint | .//netex:ReliefPoint | .//netex:ActivationPoint | .//netex:TimingPoint |.//netex:FareScheduledStopPoint"/>
+			<xsd:selector xpath=".//netex:RoutePoint | .//netex:ScheduledStopPoint | .//netex:GaragePoint | .//netex:ParkingPoint | .//netex:ReliefPoint | .//netex:ActivationPoint | .//netex:TimingPoint | .//netex:FareScheduledStopPoint"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -4805,7 +4805,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="TimingPoint_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:TimingPoint | .//netex:ScheduledStopPoint | .//netex:ReliefPoint | .//netex:GaragePoint | .//netex:ParkingPoint  |.//netex:FareScheduledStopPoint"/>
+			<xsd:selector xpath=".//netex:TimingPoint | .//netex:ScheduledStopPoint | .//netex:ReliefPoint | .//netex:GaragePoint | .//netex:ParkingPoint | .//netex:FareScheduledStopPoint"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -4832,7 +4832,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="TimingLink_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:TimingLink |.//netex:ServiceLink"/>
+			<xsd:selector xpath=".//netex:TimingLink | .//netex:ServiceLink"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -4885,18 +4885,18 @@
 			<xsd:annotation>
 				<xsd:documentation>Every [ScheduledStopPoint Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath=".//netex:ScheduledStopPoint  |.//netex:FareScheduledStopPoint"/>
+			<xsd:selector xpath=".//netex:ScheduledStopPoint | .//netex:FareScheduledStopPoint"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
 		<!-- =====ScheduledStopPoint Key ========================== -->
 		<xsd:keyref name="ScheduledStopPoint_KeyRef" refer="netex:ScheduledStopPoint_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ScheduledStopPointRef | .//netex:ServiceLink/netex:FromPointRef | .//netex:ServiceLink/netex:ToPointRef | .//netex:FromStopPointRef | .//netex:ToStopPointRef | .//netex:NextStopPointRef | .//netex:AtStopPointRef | .//netex:StartStopPointRef | .//netex:EndStopPointRef  |.//netex:FareScheduledStopPointRef  |.//netex:AccountingStopPointRef  |.//netex:AdjacentStopPointRef   |.//netex:EndStopPointRef"/>
+			<xsd:selector xpath=".//netex:ScheduledStopPointRef | .//netex:ServiceLink/netex:FromPointRef | .//netex:ServiceLink/netex:ToPointRef | .//netex:FromStopPointRef | .//netex:ToStopPointRef | .//netex:NextStopPointRef | .//netex:AtStopPointRef | .//netex:StartStopPointRef | .//netex:EndStopPointRef | .//netex:FareScheduledStopPointRef | .//netex:AccountingStopPointRef | .//netex:AdjacentStopPointRef | .//netex:EndStopPointRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="ScheduledStopPoint_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ScheduledStopPoint  |.//netex:FareScheduledStopPoint"/>
+			<xsd:selector xpath=".//netex:ScheduledStopPoint | .//netex:FareScheduledStopPoint"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -4975,7 +4975,7 @@
 		</xsd:unique>
 		<!-- =====Connection Key ========================== -->
 		<xsd:keyref name="Connection_KeyRef" refer="netex:Connection_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ConnectionRef  | .//netex:FromConnectionRef | .//netex:ToConnectionRef"/>
+			<xsd:selector xpath=".//netex:ConnectionRef | .//netex:FromConnectionRef | .//netex:ToConnectionRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -5213,18 +5213,18 @@
 			<xsd:annotation>
 				<xsd:documentation>Every [JourneyPattern Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath=".//netex:JourneyPattern | .//netex:ServiceJourneyPattern |.//netex:DeadRunJourneyPattern"/>
+			<xsd:selector xpath=".//netex:JourneyPattern | .//netex:ServiceJourneyPattern | .//netex:DeadRunJourneyPattern"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
 		<!-- =====JourneyPattern Key ========================== -->
 		<xsd:keyref name="JourneyPattern_KeyRef" refer="netex:JourneyPattern_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:JourneyPatternRef | .//netex:ServiceJourneyPatternRef |.//netex:FromJourneyPatternRef | .//netex:ToJourneyPatternRef | .//netex:DeadRunJourneyPatternRef"/>
+			<xsd:selector xpath=".//netex:JourneyPatternRef | .//netex:ServiceJourneyPatternRef | .//netex:FromJourneyPatternRef | .//netex:ToJourneyPatternRef | .//netex:DeadRunJourneyPatternRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="JourneyPattern_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:JourneyPattern| .//netex:ServiceJourneyPattern |.//netex:DeadRunJourneyPattern"/>
+			<xsd:selector xpath=".//netex:JourneyPattern| .//netex:ServiceJourneyPattern | .//netex:DeadRunJourneyPattern"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -5241,7 +5241,7 @@
 		</xsd:unique>
 		<!-- =====PointInJourneyPattern Key ========================== -->
 		<xsd:keyref name="PointInJourneyPattern_KeyRef" refer="netex:PointInJourneyPattern_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:PointInJourneyPatternRef | .//netex:FromPointInPatternRef | .//netex:ToPointInPatternRef  | .//netex:StartPointInPatternRef  | .//netex:EndPointInPatternRef"/>
+			<xsd:selector xpath=".//netex:PointInJourneyPatternRef | .//netex:FromPointInPatternRef | .//netex:ToPointInPatternRef | .//netex:StartPointInPatternRef | .//netex:EndPointInPatternRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 			<xsd:field xpath="@order"/>
@@ -5289,13 +5289,13 @@
 		</xsd:unique>
 		<!-- =====StopPointInJourneyPattern Key ========================== -->
 		<xsd:keyref name="StopPointInJourneyPattern_KeyRef" refer="netex:StopPointInJourneyPattern_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:StopPointInJourneyPatternRef | .//netex:FarePointInPatternRef | .//netex:FromPointInPatternRef | .//netex:ToPointInPatternRef  | .//netex:StartPointInPatternRef  | .//netex:EndPointInPatternRef"/>
+			<xsd:selector xpath=".//netex:StopPointInJourneyPatternRef | .//netex:FarePointInPatternRef | .//netex:FromPointInPatternRef | .//netex:ToPointInPatternRef | .//netex:StartPointInPatternRef | .//netex:EndPointInPatternRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 			<xsd:field xpath="@order"/>
 		</xsd:keyref>
 		<xsd:key name="StopPointInJourneyPattern_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:StopPointInJourneyPattern |  .//netex:FarePointInPattern"/>
+			<xsd:selector xpath=".//netex:StopPointInJourneyPattern | .//netex:FarePointInPattern"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 			<xsd:field xpath="@order"/>
@@ -5462,7 +5462,7 @@
 			<xsd:annotation>
 				<xsd:documentation>Every [ServicePattern Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath=".//netex:ServicePattern |.//netex:DeadRunPattern"/>
+			<xsd:selector xpath=".//netex:ServicePattern | .//netex:DeadRunPattern"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
@@ -5473,7 +5473,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="ServicePattern_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ServicePattern |.//netex:DeadRunPattern"/>
+			<xsd:selector xpath=".//netex:ServicePattern | .//netex:DeadRunPattern"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -6042,7 +6042,7 @@
 		</xsd:unique>
 		<!-- =====DefaultInterchange Key ========================== -->
 		<xsd:keyref name="DefaultInterchange_KeyRef" refer="netex:DefaultInterchange_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:DefaultInterchangeRef |.//netex:InterchangeRef"/>
+			<xsd:selector xpath=".//netex:DefaultInterchangeRef | .//netex:InterchangeRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -6063,7 +6063,7 @@
 		</xsd:unique>
 		<!-- =====ServiceJourneyInterchange Key ========================== -->
 		<xsd:keyref name="ServiceJourneyInterchange_KeyRef" refer="netex:ServiceJourneyInterchange_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ServiceJourneyInterchangeRef |.//netex:InterchangeRef"/>
+			<xsd:selector xpath=".//netex:ServiceJourneyInterchangeRef | .//netex:InterchangeRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -6235,7 +6235,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="Block_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:Block | .//netex:TrainBlock |.//netex:CompoundBlock"/>
+			<xsd:selector xpath=".//netex:Block | .//netex:TrainBlock | .//netex:CompoundBlock"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -6298,7 +6298,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="BlockPart_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:BlockPart |  .//netex:TrainBlockPart"/>
+			<xsd:selector xpath=".//netex:BlockPart | .//netex:TrainBlockPart"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -6758,7 +6758,7 @@
 		</xsd:unique>
 		<!-- =====ClassOfUse Key ========================== -->
 		<xsd:keyref name="ClassOfUse_KeyRef" refer="netex:ClassOfUse_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ClassOfUseRef |  .//netex:ToClassOfUseRef"/>
+			<xsd:selector xpath=".//netex:ClassOfUseRef | .//netex:ToClassOfUseRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -7089,7 +7089,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="FarePrice_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:FarePrice |   .//netex:FareProductPrice| .//netex:CappingRulePrice | .//netex:UsageParameterPrice|.//netex:FareStructureElementPrice |.//netex:ValidableElementPrice| .//netex:ControllableElementPrice | .//netex:DistanceMatrixElementPrice | .//netex:SeriesConstraintPrice |  .//netex:GeographicalIntervalPrice | .//netex:TimeIntervalPrice | .//netex:SalesOfferPackagePrice  | .//netex:FulfilmentMethodPrice  | .//netex:QualityStructureFactorPrice  | .//netex:ParkingPrice"/>
+			<xsd:selector xpath=".//netex:FarePrice | .//netex:FareProductPrice| .//netex:CappingRulePrice | .//netex:UsageParameterPrice|.//netex:FareStructureElementPrice | .//netex:ValidableElementPrice| .//netex:ControllableElementPrice | .//netex:DistanceMatrixElementPrice | .//netex:SeriesConstraintPrice | .//netex:GeographicalIntervalPrice | .//netex:TimeIntervalPrice | .//netex:SalesOfferPackagePrice | .//netex:FulfilmentMethodPrice | .//netex:QualityStructureFactorPrice | .//netex:ParkingPrice"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -7437,7 +7437,7 @@
 			<xsd:annotation>
 				<xsd:documentation>Every [FareTable Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath=".//netex:FareTable   | .//netex:StandardFareTable"/>
+			<xsd:selector xpath=".//netex:FareTable | .//netex:StandardFareTable"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
@@ -7510,7 +7510,7 @@
 		</xsd:unique>
 		<!-- =====DistanceMatrixElement Key ========================== -->
 		<xsd:keyref name="DistanceMatrixElement_KeyRef" refer="netex:DistanceMatrixElement_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:DistanceMatrixElementRef  | .//netex:DistanceMatrixElementInverseRef "/>
+			<xsd:selector xpath=".//netex:DistanceMatrixElementRef | .//netex:DistanceMatrixElementInverseRef "/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -7598,13 +7598,13 @@
 		</xsd:unique>
 		<!-- =====FarePointInPattern Key ========================== -->
 		<xsd:keyref name="FarePointInPattern_KeyRef" refer="netex:FarePointInPattern_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:FarePointInPatternRef  | .//netex:FromPointInPatternRef | .//netex:ToPointInPatternRef  | .//netex:StartPointInPatternRef  | .//netex:EndPointInPatternRef"/>
+			<xsd:selector xpath=".//netex:FarePointInPatternRef | .//netex:FromPointInPatternRef | .//netex:ToPointInPatternRef | .//netex:StartPointInPatternRef | .//netex:EndPointInPatternRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 			<xsd:field xpath="@order"/>
 		</xsd:keyref>
 		<xsd:key name="FarePointInPattern_AnyVersionedKey_ordered">
-			<xsd:selector xpath=".//netex:FarePointInPattern   |  .//netex:StopPointInJourneyPattern   |  .//netex:TimingPointInJourneyPattern"/>
+			<xsd:selector xpath=".//netex:FarePointInPattern | .//netex:StopPointInJourneyPattern | .//netex:TimingPointInJourneyPattern"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 			<xsd:field xpath="@order"/>
@@ -7621,7 +7621,7 @@
 		</xsd:unique>
 		<!-- =====FareZone Key ========================== -->
 		<xsd:keyref name="FareZone_KeyRef" refer="netex:FareZone_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:FareZoneRef | .//netex:ParentFareZoneRef | .//netex:FromFareZoneRef | .//netex:ToFareZoneRef   |.//netex:ProjectedObjectRef"/>
+			<xsd:selector xpath=".//netex:FareZoneRef | .//netex:ParentFareZoneRef | .//netex:FromFareZoneRef | .//netex:ToFareZoneRef | .//netex:ProjectedObjectRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -8626,7 +8626,7 @@
 		</xsd:unique>
 		<!-- =====SalesOfferPackage Key ========================== -->
 		<xsd:keyref name="SalesOfferPackage_KeyRef" refer="netex:SalesOfferPackage_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:SalesOfferPackageRef   | .//netex:WithSalesOfferPackageRef"/>
+			<xsd:selector xpath=".//netex:SalesOfferPackageRef | .//netex:WithSalesOfferPackageRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd
index 2f0055f58..98d771741 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd
@@ -38,7 +38,7 @@
 					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
- 					<Copyright>CEN, Crown Copyright 2009-2014</Copyright>
+ 					<Copyright>CEN, Crown Copyright 2009-2021</Copyright>
 				</Rights>
 				<Source>
 					<ul>