diff --git a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_07.robot b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_07.robot
index 314cbf35b59675f88f279b9837019e57aa63771f..9942b45e64f2f8941128d660c9f3fffd60017748 100644
--- a/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_07.robot
+++ b/TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_07.robot
@@ -52,7 +52,6 @@ Retrieve Entity With Language Filter
     ...    ${expectation_filename}
     ...    ${entity_id}
     ...    ${response.json()}
-    ...    ${True}
 
 Create Initial Entity
     ${entity_id}=    Generate Random Entity Id    ${building_id_prefix}
diff --git a/data/entities/expectations/building-language-property-any-language-filter-simplified.jsonld b/data/entities/expectations/building-language-property-any-language-filter-simplified.jsonld
index b5449922b03d4f09f572a9afc72ac81a6ec3ecfb..cb34cdcbf48cb127ac66991b58a2188e895a73ef 100644
--- a/data/entities/expectations/building-language-property-any-language-filter-simplified.jsonld
+++ b/data/entities/expectations/building-language-property-any-language-filter-simplified.jsonld
@@ -1,12 +1,7 @@
 {
   "id": "urn:ngsi-ld:Building:randomUUID",
   "type": "Building",
-  "street": {
-    "languageMap": {
-      "fr": "Grand Place",
-      "nl": "Grote Markt"
-    }
-  },
+  "street": "Grand Place",
   "@context": [
     "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld"
   ]
diff --git a/data/entities/expectations/building-language-property-any-language-filter.jsonld b/data/entities/expectations/building-language-property-any-language-filter.jsonld
index 86f2fcb2bc16970fe028a015f4ba27759f4bd215..0857281efe5b91908409ceba8fbb12984403f33b 100644
--- a/data/entities/expectations/building-language-property-any-language-filter.jsonld
+++ b/data/entities/expectations/building-language-property-any-language-filter.jsonld
@@ -2,11 +2,9 @@
   "id": "urn:ngsi-ld:Building:randomUUID",
   "type": "Building",
   "street": {
-    "type": "LanguageProperty",
-    "languageMap": {
-      "fr": "Grand Place",
-      "nl": "Grote Markt"
-    }
+    "type": "Property",
+    "value": "Grand Place",
+    "lang": "fr"
   },
   "@context": [
     "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld"