diff --git a/input/ignoreWarnings.txt b/input/ignoreWarnings.txt
index feb325e..bdfe017 100644
--- a/input/ignoreWarnings.txt
+++ b/input/ignoreWarnings.txt
@@ -8,6 +8,10 @@ None of the codings provided are in the value set 'Patient Contact Relationship
 None of the codings provided are in the value set 'Patient Contact Relationship ' (http://hl7.org/fhir/ValueSet/patient-contactrelationship|4.0.1), and a coding should come from this value set unless it has no suitable code (note that the validator cannot judge what is suitable) (codes = http://terminology.hl7.org/CodeSystem/v3-RoleCode#MTH)
 None of the codings provided are in the value set 'Patient Contact Relationship ' (http://hl7.org/fhir/ValueSet/patient-contactrelationship|4.0.1), and a coding should come from this value set unless it has no suitable code (note that the validator cannot judge what is suitable) (codes = http://terminology.hl7.org/CodeSystem/v3-RoleCode#FTH)
 
+# No suitable code for Encounter.identifier / NamingSystem.type
+None of the codings provided are in the value set 'IdentifierType' (http://hl7.org/fhir/ValueSet/identifier-type|4.0.1), and a coding should come from this value set unless it has no suitable code (note that the validator cannot judge what is suitable) (codes = http://terminology.hl7.org/CodeSystem/v2-0203#VN)
+None of the codings provided are in the value set 'IdentifierType' (http://hl7.org/fhir/ValueSet/identifier-type|4.0.1), and a coding should come from this value set unless it has no suitable code (note that the validator cannot judge what is suitable) (codes = http://terminology.hl7.org/CodeSystem/v2-0203#NI)
+
 # All important examples are included
 The Implementation Guide contains no examples for this profile
 The Implementation Guide contains no examples for this extension
@@ -51,9 +55,3 @@ INFORMATION: Bundle/CdaContainingOriginalRepresentationAsPdfA: Bundle.entry[0].r
 The image source 'pdf1' cannot be resolved
 The link 'www.grouppractice.ch' for "www.grouppractice.ch" cannot be resolved
 The link 'www.sampledomain.ch' for "www.sampledomain.ch" cannot be resolved
-
-# Due to ongoing activities around the terminology server, see also https://chat.fhir.org/#narrow/stream/179252-IG-creation/topic/tx.2Efhir.2Eorg
-None of the codings provided are in the value set 'IdentifierType' (http://hl7.org/fhir/ValueSet/identifier-type|4.0.1), and a coding should come from this value set unless it has no suitable code (note that the validator cannot judge what is suitable) (codes = http://terminology.hl7.org/CodeSystem/v2-0203#VN)
-None of the codings provided are in the value set 'IdentifierType' (http://hl7.org/fhir/ValueSet/identifier-type|4.0.1), and a coding should come from this value set unless it has no suitable code (note that the validator cannot judge what is suitable) (codes = http://terminology.hl7.org/CodeSystem/v2-0203#NI)
-The source display 'stationär' is not valid. Possible codes [stationär]
-The source display 'männlich' is not valid. Possible codes [männlich]
diff --git a/input/resources/conceptmap/bfs-encounter-class-to-fhir.xml b/input/resources/conceptmap/bfs-encounter-class-to-fhir.xml
index 49fb7bc..dfda3c0 100644
--- a/input/resources/conceptmap/bfs-encounter-class-to-fhir.xml
+++ b/input/resources/conceptmap/bfs-encounter-class-to-fhir.xml
@@ -40,20 +40,19 @@
         </element>
         <element>
             <code value="3"/>
-            <display value="stationär"/>
+            <display value="stationär"/>
             <target>
                 <code value="IMP"/>
                 <display value="inpatient encounter"/>
                 <equivalence value="equivalent"/>
             </target>
-        </element>
-        <!-- uncommented because of the following error: The link 'null#equivalent' for "equivalent" cannot be resolved --> 
-        <!--<element>
+        </element> 
+        <element>
             <code value="9"/>
             <display value="unbekannt"/>
             <target>
                 <equivalence value="unmatched"/>
             </target>
-        </element>-->
+        </element>
     </group>
 </ConceptMap>
diff --git a/input/resources/conceptmap/sex-ech11-to-fhir.xml b/input/resources/conceptmap/sex-ech11-to-fhir.xml
index 0b50556..9f6868b 100644
--- a/input/resources/conceptmap/sex-ech11-to-fhir.xml
+++ b/input/resources/conceptmap/sex-ech11-to-fhir.xml
@@ -31,7 +31,7 @@
         <target value="http://hl7.org/fhir/administrative-gender"/>
         <element>
             <code value="1"/>
-            <display value="männlich"/>
+            <display value="männlich"/>
             <target>
                 <code value="male"/>
                 <display value="Male"/>