@netwerk-digitaal-erfgoed/network-of-terms-catalog 10.0.2 → 10.2.0

package/catalog/queries/search/aat-styles-and-periods.rq

@@ -19,46 +19,61 @@ CONSTRUCT {
         skos:exactMatch ?exactMatch_uri .
     ?broader_uri skos:prefLabel ?broader_prefLabel .
     ?narrower_uri skos:prefLabel ?narrower_prefLabel .
+    ?exactMatch_uri skos:prefLabel ?exactMatch_prefLabel .
 }
 WHERE {
+    VALUES ?language {
+        aat:300388256 # Dutch
+        aat:300388277 # English
+    }
+
     {
-        SELECT * WHERE {
+        SELECT DISTINCT ?uri WHERE {
             ?uri luc:term ?query ;
                 a ?type ;
                 void:inDataset <http://vocab.getty.edu/dataset/aat> ;
-                gvp:broaderPreferred+ <http://vocab.getty.edu/aat/300015646> . # limit results to the "styles and periodes hierarchy name (300015646)"
+            gvp:broaderPreferred+ <http://vocab.getty.edu/aat/300015646> . # limit results to the "styles and periodes hierarchy name (300015646)"
             ?type rdfs:subClassOf gvp:Subject .
             FILTER (?type != gvp:Subject) .
-            ?uri skosxl:prefLabel ?prefLabel_uri .
-            ?prefLabel_uri dcterms:language aat:300388256 . # Dutch (language)
-            ?prefLabel_uri skosxl:literalForm ?prefLabel .
+            ?uri skosxl:prefLabel [
+                dcterms:language ?language ; # Faster than FILTER(langMatches(...): https://vocab.getty.edu/queries#Find_Terms_by_Language_Tag
+                skosxl:literalForm ?prefLabel
+            ]
         }
         #LIMIT#
     }
+    ?uri skosxl:prefLabel [
+        dcterms:language ?language ; # Faster than FILTER(langMatches(...): https://vocab.getty.edu/queries#Find_Terms_by_Language_Tag
+        skosxl:literalForm ?prefLabel
+    ]
     OPTIONAL {
-        ?uri skosxl:altLabel ?altLabel_uri .
-        ?altLabel_uri dcterms:language aat:300388256 . # Dutch (language)
-        ?altLabel_uri skosxl:literalForm ?altLabel .
+        ?uri skosxl:altLabel [
+            dcterms:language ?language ;
+            skosxl:literalForm ?altLabel
+        ]
     }
     OPTIONAL {
-        ?uri skos:scopeNote ?scopeNote_uri .
-        ?scopeNote_uri dcterms:language aat:300388256 . # Dutch (language)
-        ?scopeNote_uri rdf:value ?scopeNote .
+        ?uri skos:scopeNote [
+            dcterms:language ?language ;
+            rdf:value ?scopeNote
+        ]
     }
     OPTIONAL {
         ?uri rdfs:seeAlso ?rdfs_seeAlso
     }
     OPTIONAL {
         ?uri gvp:broaderPreferred ?broader_uri .
-        ?broader_uri skosxl:prefLabel ?broader_uri_skosxl .
-        ?broader_uri_skosxl dcterms:language aat:300388256 . # Dutch (language)
-        ?broader_uri_skosxl skosxl:literalForm ?broader_prefLabel .
+        ?broader_uri skosxl:prefLabel [
+            dcterms:language ?language ;
+            skosxl:literalForm ?broader_prefLabel
+        ]
     }
     OPTIONAL {
         ?uri skos:narrower ?narrower_uri .
-        ?narrower_uri skosxl:prefLabel ?narrower_uri_skosxl .
-        ?narrower_uri_skosxl dcterms:language aat:300388256 . # Dutch (language)
-        ?narrower_uri_skosxl skosxl:literalForm ?narrower_prefLabel .
+        ?narrower_uri skosxl:prefLabel [
+            dcterms:language ?language ;
+            skosxl:literalForm ?narrower_prefLabel
+        ]
     }
     OPTIONAL {
         ?uri skos:exactMatch ?exactMatch_uri . # Has no labels.

package/catalog/queries/search/aat.rq

@@ -22,48 +22,63 @@ CONSTRUCT {
     ?exactMatch_uri skos:prefLabel ?exactMatch_prefLabel .
 }
 WHERE {
+    VALUES ?language {
+        aat:300388256 # Dutch
+        aat:300388277 # English
+    }
+
     {
-        SELECT * WHERE {
+        SELECT DISTINCT ?uri WHERE {
             ?uri luc:term ?query ;
                 a ?type ;
                 void:inDataset <http://vocab.getty.edu/dataset/aat> .
             ?type rdfs:subClassOf gvp:Subject .
             FILTER (?type != gvp:Subject) .
-            ?uri skosxl:prefLabel ?prefLabel_uri .
-            ?prefLabel_uri dcterms:language aat:300388256 . # Dutch (language)
-            ?prefLabel_uri skosxl:literalForm ?prefLabel .
+            ?uri skosxl:prefLabel [
+                dcterms:language ?language ; # Faster than FILTER(langMatches(...): https://vocab.getty.edu/queries#Find_Terms_by_Language_Tag
+                skosxl:literalForm ?prefLabel
+            ]
         }
         #LIMIT#
     }
+    ?uri skosxl:prefLabel [
+        dcterms:language ?language ; # Faster than FILTER(langMatches(...): https://vocab.getty.edu/queries#Find_Terms_by_Language_Tag
+        skosxl:literalForm ?prefLabel
+    ]
     OPTIONAL {
-        ?uri skosxl:altLabel ?altLabel_uri .
-        ?altLabel_uri dcterms:language aat:300388256 . # Dutch (language)
-        ?altLabel_uri skosxl:literalForm ?altLabel .
+        ?uri skosxl:altLabel [
+            dcterms:language ?language ;
+            skosxl:literalForm ?altLabel
+        ]
     }
     OPTIONAL {
-        ?uri skos:scopeNote ?scopeNote_uri .
-        ?scopeNote_uri dcterms:language aat:300388256 . # Dutch (language)
-        ?scopeNote_uri rdf:value ?scopeNote .
+        ?uri skos:scopeNote [
+            dcterms:language ?language ;
+            rdf:value ?scopeNote
+        ]
     }
     OPTIONAL {
         ?uri rdfs:seeAlso ?rdfs_seeAlso
     }
     OPTIONAL {
         ?uri gvp:broaderPreferred ?broader_uri .
-        ?broader_uri skosxl:prefLabel ?broader_uri_skosxl .
-        ?broader_uri_skosxl dcterms:language aat:300388256 . # Dutch (language)
-        ?broader_uri_skosxl skosxl:literalForm ?broader_prefLabel .
+        ?broader_uri skosxl:prefLabel [
+            dcterms:language ?language ;
+            skosxl:literalForm ?broader_prefLabel
+        ]
     }
     OPTIONAL {
         ?uri skos:narrower ?narrower_uri .
-        ?narrower_uri skosxl:prefLabel ?narrower_uri_skosxl .
-        ?narrower_uri_skosxl dcterms:language aat:300388256 . # Dutch (language)
-        ?narrower_uri_skosxl skosxl:literalForm ?narrower_prefLabel .
+        ?narrower_uri skosxl:prefLabel [
+            dcterms:language ?language ;
+            skosxl:literalForm ?narrower_prefLabel
+        ]
     }
     OPTIONAL {
         ?uri skos:exactMatch ?exactMatch_uri .
-        ?exactMatch_uri skosxl:prefLabel ?exactMatch_uri_skosxl .
-        ?exactMatch_uri_skosxl dcterms:language aat:300388256 . # Dutch (language)
-        ?exactMatch_uri_skosxl skosxl:literalForm ?exactMatch_prefLabel .
+        ?exactMatch_uri skosxl:prefLabel [
+            dcterms:language ?language ;
+            skosxl:literalForm ?exactMatch_prefLabel
+        ]
     }
 }

package/catalog/queries/search/eurovoc.rq

@@ -20,7 +20,9 @@ WHERE {
             ?uri a eurovoc:ThesaurusConcept ;
                 ?predicate ?label .
             VALUES ?predicate { skos:prefLabel skos:altLabel }
-            FILTER(LANG(?label) = "nl")
+
+            # TODO: define a search language. For example NL ‘brussel’ should not return ‘bladgroente’ with altLabel ‘Brussels sprouts’.
+            FILTER(LANG(?label) = "nl" || LANG(?label) = "en")
             # The http://publications.europa.eu/webapi/rdf/sparql endpoint
             # is based on Virtuoso but it looks like fulltext search support
             # is not enabled therefore fallback to the standard CONTAINS function
@@ -30,30 +32,30 @@ WHERE {
     }
     OPTIONAL {
         ?uri skos:prefLabel ?prefLabel .
-        FILTER(LANG(?prefLabel) = "nl")
+        FILTER(LANG(?prefLabel) = "nl" || LANG(?prefLabel) = "en")
     }
     OPTIONAL {
         ?uri skos:altLabel ?altLabel .
-        FILTER(LANG(?altLabel) = "nl")
+        FILTER(LANG(?altLabel) = "nl" || LANG(?altLabel) = "en")
     }
     OPTIONAL {
         ?uri skos:broader ?broader_uri .
         ?broader_uri skos:prefLabel ?broader_prefLabel .
-        FILTER(LANG(?broader_prefLabel) = "nl")
+        FILTER(LANG(?broader_prefLabel) = "nl" || LANG(?broader_prefLabel) = "en")
     }
     OPTIONAL {
         ?uri skos:narrower ?narrower_uri .
         ?narrower_uri skos:prefLabel ?narrower_prefLabel .
-        FILTER(LANG(?narrower_prefLabel) = "nl")
+        FILTER(LANG(?narrower_prefLabel) = "nl" || LANG(?narrower_prefLabel) = "en")
     }
     OPTIONAL {
         ?uri skos:related ?related_uri .
         ?related_uri skos:prefLabel ?related_prefLabel .
-        FILTER(LANG(?related_prefLabel) = "nl")
+        FILTER(LANG(?related_prefLabel) = "nl" || LANG(?related_prefLabel) = "en")
     }
     OPTIONAL {
         ?uri skos:exactMatch ?exactMatch_uri .
         ?exactMatch_uri skos:exactMatch ?exactMatch_prefLabel .
-        FILTER(LANG(?exactMatch_prefLabel) = "nl")
+        FILTER(LANG(?exactMatch_prefLabel) = "nl" || LANG(?exactMatch_prefLabel) = "en")
     }
 }

package/catalog/queries/search/geonames.rq

@@ -7,7 +7,7 @@ CONSTRUCT {
     ?uri a skos:Concept ;
         skos:prefLabel ?prefLabel_ext ;
         skos:altLabel ?altLabel ;
-        skos:scopeNote ?scopeNote ;
+        skos:scopeNote ?scopeNote_en ;
         skos:broader ?broader ;
         vrank:simpleRank ?score .
     ?broader skos:prefLabel ?broader_prefLabel .
@@ -46,5 +46,7 @@ WHERE {
 
     OPTIONAL {
         ?uri gn:featureCode/gn:name ?scopeNote .
+        # scopeNote is always in English.
+        BIND(STRLANG(?scopeNote, "en") as ?scopeNote_en)
     }
 }

package/catalog/queries/search/muziekschatten-onderwerpen.rq

@@ -5,8 +5,8 @@ PREFIX som: <https://data.muziekschatten.nl/som/>
 
 CONSTRUCT {
     ?uri a skos:Concept;
-        skos:prefLabel ?schema_name;
-        skos:scopeNote ?scopeNote;
+        skos:prefLabel ?prefLabel;
+        skos:scopeNote ?scopeNote_nl, ?scopeNote_en;
         skos:broader ?broader_uri ;
         skos:exactMatch ?exactMatch_uri .
     ?broader_uri skos:prefLabel ?broader_schema_name .
@@ -24,13 +24,11 @@ WHERE {
     }
 
     OPTIONAL {
-        ?uri schema:name ?schema_name .
-        FILTER(LANG(?schema_name) = "nl")
+        ?uri schema:name ?prefLabel .
     }
     OPTIONAL {
         ?uri skos:broader ?broader_uri .
         ?broader_uri schema:name ?broader_schema_name .
-        FILTER(LANG(?broader_schema_name) = "nl")
     }
     OPTIONAL {
         ?uri schema:keywords ?schema_keywords
@@ -39,11 +37,25 @@ WHERE {
         ?uri som:DC ?dc
     }
     BIND(
-        COALESCE(
-            IF(BOUND(?schema_keywords) && BOUND(?dc), CONCAT("Trefwoorden: ", ?schema_keywords, " | ", "Dewey: ", ?dc), ?noScopeNote),
-            IF(BOUND(?schema_keywords), CONCAT("Trefwoorden: ", ?schema_keywords), ?noScopeNote),
-            IF(BOUND(?dc), CONCAT("Dewey: ", ?dc), ?noScopeNote)
-        ) AS ?scopeNote
+        STRLANG(
+            COALESCE(
+                IF(BOUND(?schema_keywords) && BOUND(?dc), CONCAT("Trefwoorden: ", ?schema_keywords, " | ", "Dewey: ", ?dc), ?noScopeNote),
+                IF(BOUND(?schema_keywords), CONCAT("Trefwoorden: ", ?schema_keywords), ?noScopeNote),
+                IF(BOUND(?dc), CONCAT("Dewey: ", ?dc), ?noScopeNote)
+            ),
+            "nl"
+        ) AS ?scopeNote_nl
+    )
+
+    BIND(
+        STRLANG(
+            COALESCE(
+                IF(BOUND(?schema_keywords) && BOUND(?dc), CONCAT("Keywords: ", ?schema_keywords, " | ", "Dewey: ", ?dc), ?noScopeNote),
+                IF(BOUND(?schema_keywords), CONCAT("Keywords: ", ?schema_keywords), ?noScopeNote),
+                IF(BOUND(?dc), CONCAT("Dewey: ", ?dc), ?noScopeNote)
+            ),
+            "en"
+        ) AS ?scopeNote_en
     )
 
     OPTIONAL { ?uri skos:exactMatch ?exactMatch_uri } # Has no labels.

package/catalog/queries/search/muziekschatten-personen.rq

@@ -43,7 +43,10 @@ WHERE {
 
     OPTIONAL { ?uri schema:name ?schema_name }
     OPTIONAL { ?uri schema:alternateName ?schema_alternateName }
-    OPTIONAL { ?uri schema:hasOccupation ?schema_hasOccupation }
+    OPTIONAL {
+        ?uri schema:hasOccupation ?hasOccupation .
+        BIND(REPLACE(?hasOccupation, ";;;;;;;;;;;;", "") AS ?schema_hasOccupation)
+    }
 
     OPTIONAL { ?uri schema:familyName ?schema_familyName }
     OPTIONAL { ?uri schema:givenName ?schema_givenName }

package/catalog/queries/search/rkdartists.rq

@@ -6,16 +6,20 @@ CONSTRUCT {
     ?uri a skos:Concept ;
         skos:prefLabel ?prefLabel ;
         skos:altLabel ?altLabel ;
-        skos:scopeNote ?scopeNote ;
+        skos:scopeNote ?scopeNote_nl, ?scopeNote_en ;
+        skos:exactMatch ?exactMatch_uri ;
         rdfs:seeAlso ?seeAlso .
 }
 WHERE {
     {
         SELECT DISTINCT ?uri
             (GROUP_CONCAT(DISTINCT ?schema_description; separator="; ") as ?descriptions)
-            (GROUP_CONCAT(DISTINCT ?birthPlace; separator="/") as ?birthPlaces)
-            (GROUP_CONCAT(DISTINCT ?deathPlace; separator="/") as ?deathPlaces)
-            (GROUP_CONCAT(DISTINCT ?additionalType; separator=", ") as ?additionalTypes)
+            (GROUP_CONCAT(DISTINCT ?additionalType_nl; separator=", ") as ?additionalTypes_nl)
+            (GROUP_CONCAT(DISTINCT ?additionalType_en; separator=", ") as ?additionalTypes_en)
+            ?birthPlace_nl
+            ?birthPlace_en
+            ?deathPlace_nl
+            ?deathPlace_en
         WHERE {
             ?uri ?predicate ?label .
             ?label <bif:contains> ?virtuosoQuery .
@@ -25,13 +29,33 @@ WHERE {
             VALUES ?type { schema:Person schema:Organization }
 
             OPTIONAL { ?uri schema:description ?schema_description . }
-            OPTIONAL { ?uri schema:birthPlace ?birthPlace .
-                FILTER(langMatches(lang(?birthPlace), "nl")) }
-            OPTIONAL { ?uri schema:deathPlace ?deathPlace .
-                FILTER(langMatches(lang(?deathPlace), "nl"))}
-            OPTIONAL { ?uri schema:additionalType ?additionalType .
-                FILTER(langMatches(lang(?additionalType), "nl"))}
 
+            OPTIONAL {
+                ?uri schema:birthPlace ?birthPlace_nl .
+                FILTER(langMatches(lang(?birthPlace_nl), "nl"))
+            }
+            OPTIONAL {
+                ?uri schema:birthPlace ?birthPlace_en .
+                FILTER(langMatches(lang(?birthPlace_en), "en"))
+            }
+
+            OPTIONAL {
+                ?uri schema:deathPlace ?deathPlace_nl .
+                FILTER(langMatches(lang(?deathPlace_nl), "nl"))
+            }
+            OPTIONAL {
+                ?uri schema:deathPlace ?deathPlace_en .
+                FILTER(langMatches(lang(?deathPlace_en), "en"))
+            }
+
+            OPTIONAL {
+                ?uri schema:additionalType ?additionalType_nl .
+                FILTER(langMatches(lang(?additionalType_nl), "nl"))
+            }
+            OPTIONAL {
+                ?uri schema:additionalType ?additionalType_en .
+                FILTER(langMatches(lang(?additionalType_en), "en"))
+            }
         }
         #LIMIT#
     }
@@ -40,25 +64,55 @@ WHERE {
     OPTIONAL { ?uri schema:alternateName ?altLabel . }
     OPTIONAL { ?uri schema:birthDate ?birthDate . }
     OPTIONAL { ?uri schema:deathDate ?deathDate . }
+    OPTIONAL { ?uri rdfs:seeAlso ?exactMatch_uri . }
 
     BIND(
-        CONCAT(
-          IF(BOUND(?birthDate) || STRLEN(?birthPlaces) > 0 ,
+        STRLANG(
             CONCAT(
-              IF(BOUND(?birthDate), CONCAT(?birthDate, " "), ""),
-              IF(STRLEN(?birthPlaces) > 0, CONCAT("(", ?birthPlaces, ") "), ""),
-              IF(BOUND(?deathDate) || STRLEN(?deathPlaces) > 0," - "," - ; ")),
-            ""),
-          IF(BOUND(?deathDate) || STRLEN(?deathPlaces) > 0,
+                IF(BOUND(?birthDate) || STRLEN(?birthPlace_nl) > 0,
+                    CONCAT(
+                        IF(BOUND(?birthDate), CONCAT(?birthDate, " "), ""),
+                        IF(STRLEN(?birthPlace_nl) > 0, CONCAT("(", ?birthPlace_nl, ") "), ""),
+                        IF(BOUND(?deathDate) || STRLEN(?deathPlace_nl) > 0," - "," – ; ")),
+                        ""
+                    ),
+                IF(BOUND(?deathDate) || STRLEN(?deathPlace_nl) > 0,
+                    CONCAT(
+                        IF(BOUND(?birthDate) || STRLEN(?birthPlace_nl) > 0, "", "– "),
+                        IF(BOUND(?deathDate), CONCAT(?deathDate, " "), ""),
+                        IF(STRLEN(?deathPlace_nl) > 0, CONCAT("(", ?deathPlace_nl, ")"), ""),
+                        "; "),
+                        ""
+                    ),
+                IF(STRLEN(?additionalTypes_nl) > 0, CONCAT(?additionalTypes_nl, ". "), ""),
+                IF(STRLEN(?descriptions) > 0, CONCAT(?descriptions, ". "), "")
+            ),
+            "nl"
+        ) as ?scopeNote_nl
+    )
+    BIND(
+        STRLANG(
             CONCAT(
-              IF(BOUND(?birthDate) || STRLEN(?birthPlaces) > 0 , "", "- "),
-              IF(BOUND(?deathDate), CONCAT(?deathDate, " "), ""),
-              IF(STRLEN(?deathPlaces) > 0, CONCAT("(", ?deathPlaces, ")"), ""),
-              "; "),
-            ""),
-            IF(STRLEN(?additionalTypes) > 0, CONCAT(?additionalTypes, ". "), ""),
-            IF(STRLEN(?descriptions) > 0, CONCAT(?descriptions, ". "), "")
-        ) as ?scopeNote
+                IF(BOUND(?birthDate) || STRLEN(?birthPlace_en) > 0,
+                    CONCAT(
+                        IF(BOUND(?birthDate), CONCAT(?birthDate, " "), ""),
+                        IF(STRLEN(?birthPlace_en) > 0, CONCAT("(", ?birthPlace_en, ") "), ""),
+                        IF(BOUND(?deathDate) || BOUND(?deathPlace_en)," - "," – ; ")),
+                        ""
+                    ),
+                IF(BOUND(?deathDate) || BOUND(?deathPlace_en),
+                    CONCAT(
+                        IF(BOUND(?birthDate) || BOUND(?birthPlace_en), "", "– "),
+                        IF(BOUND(?deathDate), CONCAT(?deathDate, " "), ""),
+                        IF(STRLEN(?deathPlace_nl) > 0, CONCAT("(", ?deathPlace_en, ")"), ""),
+                        "; "),
+                        ""
+                    ),
+                IF(STRLEN(?additionalTypes_nl) > 0, CONCAT(?additionalTypes_en, ". "), ""),
+                IF(STRLEN(?descriptions) > 0, CONCAT(?descriptions, ". "), "")
+            ),
+            "en"
+        ) as ?scopeNote_en
     )
     BIND(STRAFTER(STR(?uri), "https://data.rkd.nl/artists/") AS ?identifier)
     BIND(IRI(CONCAT("https://rkd.nl/explore/artists/", ?identifier)) AS ?seeAlso)

package/catalog/queries/search/uitvoeringsmedium.rq

@@ -17,8 +17,6 @@ WHERE {
                 skos:inScheme som:Uitvoeringsmedium ;
                 skos:prefLabel ?prefLabel .
 
-            FILTER(LANG(?prefLabel) = "nl")
-
             ?uri ?predicate ?label .
             VALUES ?predicate { skos:prefLabel skos:altLabel }
             ?label <bif:contains> ?virtuosoQuery .
@@ -33,13 +31,11 @@ WHERE {
 
     OPTIONAL {
         ?uri skos:altLabel ?altLabel .
-        FILTER(LANG(?altLabel) = "nl")
     }
 
     OPTIONAL {
         ?uri skos:broader ?broader_uri .
         ?broader_uri skos:prefLabel ?broader_prefLabel .
-        FILTER(LANG(?broader_prefLabel) = "nl")
     }
 
     OPTIONAL { ?uri skos:exactMatch ?exactMatch_uri } # Has no labels.

package/catalog/queries/search/wikidata-entities-all.rq

@@ -26,14 +26,14 @@ WHERE {
         ?ordinal wikibase:apiOrdinal true.
     }
     ?item rdfs:label ?rdfs_label .
-    FILTER(LANG(?rdfs_label) = "nl")
+    FILTER(LANG(?rdfs_label) = "nl" || LANG(?rdfs_label) = "en")
     OPTIONAL {
         ?item skos:altLabel ?altLabel .
-        FILTER(LANG(?altLabel) = "nl")
+        FILTER(LANG(?altLabel) = "nl" || LANG(?altLabel) = "en")
     }
     OPTIONAL {
         ?item schema:description ?schema_description
-        FILTER(LANG(?schema_description) = "nl")
+        FILTER(LANG(?schema_description) = "nl" || LANG(?schema_description) = "en")
     }
     BIND(-?ordinal AS ?score)
 }

package/catalog/queries/search/wikidata-entities-persons.rq

@@ -42,14 +42,14 @@ WHERE {
 
     OPTIONAL {
         ?item rdfs:label ?prefLabel .
-        FILTER(LANG(?prefLabel) = "nl")
+        FILTER(LANG(?prefLabel) = "nl" || LANG(?prefLabel) = "en")
     }
     OPTIONAL {
         ?item skos:altLabel ?altLabel .
-        FILTER(LANG(?altLabel) = "nl"||LANG(?altLabel) = "en")
+        FILTER(LANG(?altLabel) = "nl"|| LANG(?altLabel) = "en")
     }
     OPTIONAL {
         ?item schema:description ?description
-        FILTER(LANG(?description) = "nl")
+        FILTER(LANG(?description) = "nl" || LANG(?description) = "en")
     }
 }

package/catalog/queries/search/wikidata-entities-places.rq

@@ -72,14 +72,14 @@ WHERE {
 
     OPTIONAL {
         ?item rdfs:label ?prefLabel .
-        FILTER(LANG(?prefLabel) = "nl")
+        FILTER(LANG(?prefLabel) = "nl" || LANG(?prefLabel) = "en")
     }
     OPTIONAL {
         ?item skos:altLabel ?altLabel .
-        FILTER(LANG(?altLabel) = "nl")
+        FILTER(LANG(?altLabel) = "nl" || LANG(?altLabel) = "en")
     }
     OPTIONAL {
         ?item schema:description ?schema_description
-        FILTER(LANG(?schema_description) = "nl")
+        FILTER(LANG(?schema_description) = "nl" || LANG(?schema_description) = "en")
     }
 }

package/catalog/queries/search/wikidata-entities-streets.rq

@@ -52,36 +52,15 @@ WHERE {
         #LIMIT#
     }
     OPTIONAL {
-        ?item wdt:P276 ?location .
-        ?location rdfs:label ?locationName .
-        FILTER LANGMATCHES(LANG(?locationName),"nl")
-    }
-    OPTIONAL {
-        ?item schema:description ?description
-        FILTER(LANG(?description) = "nl")
+        ?item rdfs:label ?streetName .
+         FILTER(LANG(?streetName) = "nl" || LANG(?streetName) = "en")
     }
     OPTIONAL {
         ?item skos:altLabel ?altLabel
-        FILTER(LANG(?altLabel) = "nl")
+        FILTER(LANG(?altLabel) = "nl" || LANG(?altLabel) = "en")
     }
     OPTIONAL {
-        ?item rdfs:label ?streetName .
-        FILTER LANGMATCHES(LANG(?streetName), "nl")
-    }
-    OPTIONAL {
-        ?item wdt:P131/rdfs:label ?administrationName .
-        FILTER LANGMATCHES(LANG(?administrationName), "nl")
+        ?item schema:description ?description
+        FILTER(LANG(?description) = "nl" || LANG(?description) = "en")
     }
-
-    # Some streets come with altLabel ‘Street name (Place name)’. For those that don’t, construct the altLabel manually.
-    BIND(
-        COALESCE(
-            ?altLabel,
-            IF(
-                BOUND(?locationName),
-                CONCAT(?streetName," (",?locationName,")"),
-                CONCAT(?streetName," (",?administrationName,")")
-            )
-        ) as ?altLabel
-    )
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netwerk-digitaal-erfgoed/network-of-terms-catalog",
-  "version": "10.0.2",
+  "version": "10.2.0",
   "type": "module",
   "description": "Catalog of Network of Terms datasets",
   "repository": {
@@ -45,7 +45,7 @@
     "@comunica/query-sparql": "^4.1.0",
     "@comunica/query-sparql-rdfjs": "^4.1.0",
     "@comunica/utils-bindings-factory": "^4.0.2",
-    "@netwerk-digitaal-erfgoed/network-of-terms-query": "6.0.0",
+    "@netwerk-digitaal-erfgoed/network-of-terms-query": "6.2.0",
     "globby": "^14.0.2",
     "ldkit": "^2.1.0",
     "memoize": "^10.0.0",