diff --git a/code/NLCS_Query_Objects_Verkort.rq b/code/NLCS_Query_Objects_Verkort.rq
index e289269a..4ee23ca4 100644
--- a/code/NLCS_Query_Objects_Verkort.rq
+++ b/code/NLCS_Query_Objects_Verkort.rq
@@ -56,6 +56,22 @@ WHERE {
   }
   BIND( COALESCE(?DisciplineValue, "**") AS ?discipline) .
 
+  OPTIONAL {
+    ?objectURI rdfs:subClassOf ?bnodeSymbool .
+    ?bnodeSymbool owl:onProperty <https://w3id.org/nen2660/def#isDescribedBy> .
+    ?bnodeSymbool owl:onClass ?sobjectURI .
+    ?sobjectURI rdfs:subClassOf* ?SymboolTopConcept .
+    ?SymboolTopConcept skos:prefLabel "Symbool" .
+    ?sobjectURI skos:prefLabel ?sobject .
+  }
+  OPTIONAL {
+    ?objectURI rdfs:subClassOf ?bnodeArcering .
+    ?bnodeArcering owl:onProperty <https://w3id.org/nen2660/def#isDescribedBy> .
+    ?bnodeArcering owl:onClass ?aobjectURI .
+    ?aobjectURI rdfs:subClassOf* ?SymboolTopConcept .
+    ?ArceringTopConcept skos:prefLabel "Arcering" .
+    ?aobjectURI skos:prefLabel ?aobject .
+  }
   OPTIONAL {
     ?objectURI ?elementProperty ?element .
     ?elementProperty skos:prefLabel "VRKL_KORT" .
@@ -66,25 +82,45 @@ WHERE {
     ?BLineweightProperty skos:prefLabel "B lineweight" .
     ?lw_bURI skos:prefLabel ?lw_b .
 
-    ?objectURI ?BColorProperty ?kl_bURI .
+    ?objectURI ?BColorProperty ?kl_bURI_temp .
     ?BColorProperty skos:prefLabel "B color" .
-    ?kl_bURI skos:prefLabel ?kl_b .
+    OPTIONAL {
+      ?kl_bURI_temp skos:prefLabel ?kl_b_temp .
+    }
+    BIND( COALESCE(?kl_b_temp, ?kl_bURI_temp) AS ?kl_b) .
+    BIND( IF(?kl_b = ?kl_b_temp, ?kl_bURI_temp, ?undefined) AS ?kl_bURI) .
 
-    ?objectURI ?BColorAProperty ?kl_b_aURI .
+    ?objectURI ?BColorAProperty ?kl_b_aURI_temp .
     ?BColorAProperty skos:prefLabel "B color A" .
-    ?kl_b_aURI skos:prefLabel ?kl_b_a .
+    OPTIONAL {
+      ?kl_b_aURI_temp skos:prefLabel ?kl_b_a_temp .
+    }
+    BIND( COALESCE(?kl_b_a_temp, ?kl_b_aURI_temp) AS ?kl_b_a) .
+    BIND( IF(?kl_b_a = ?kl_b_a_temp, ?kl_b_aURI_temp, ?undefined) AS ?kl_b_aURI) .
 
-    ?objectURI ?BColorGDProperty ?kl_b_gdURI .
+    ?objectURI ?BColorGDProperty ?kl_b_gdURI_temp .
     ?BColorGDProperty skos:prefLabel "B color GD" .
-    ?kl_b_gdURI skos:prefLabel ?kl_b_gd .
+    OPTIONAL {
+      ?kl_b_gdURI_temp skos:prefLabel ?kl_b_gd_temp .
+    }
+    BIND( COALESCE(?kl_b_gd_temp, ?kl_b_gdURI_temp) AS ?kl_b_gd) .
+    BIND( IF(?kl_b_gd = ?kl_b_gd_temp, ?kl_b_gdURI_temp, ?undefined) AS ?kl_b_gdURI) .
 
-    ?objectURI ?BColorGNProperty ?kl_b_gnURI .
+    ?objectURI ?BColorGNProperty ?kl_b_gnURI_temp .
     ?BColorGNProperty skos:prefLabel "B color GN" .
-    ?kl_b_gnURI skos:prefLabel ?kl_b_gn .
+    OPTIONAL {
+      ?kl_b_gnURI_temp skos:prefLabel ?kl_b_gn_temp .
+    }
+    BIND( COALESCE(?kl_b_gn_temp, ?kl_b_gnURI_temp) AS ?kl_b_gn) .
+    BIND( IF(?kl_b_gn = ?kl_b_gn_temp, ?kl_b_gnURI_temp, ?undefined) AS ?kl_b_gnURI) .
 
-    ?objectURI ?BColorVProperty ?kl_b_vURI .
+    ?objectURI ?BColorVProperty ?kl_b_vURI_temp .
     ?BColorVProperty skos:prefLabel "B color V" .
-    ?kl_b_vURI skos:prefLabel ?kl_b_v .
+    OPTIONAL {
+      ?kl_b_vURI_temp skos:prefLabel ?kl_b_v_temp .
+    }
+    BIND( COALESCE(?kl_b_v_temp, ?kl_b_vURI_temp) AS ?kl_b_v) .
+    BIND( IF(?kl_b_v = ?kl_b_v_temp, ?kl_b_vURI_temp, ?undefined) AS ?kl_b_vURI) .
 
     ?objectURI ?BLinetypeProperty ?lt_bURI .
     ?BLinetypeProperty skos:prefLabel "B linetype" .
@@ -95,25 +131,45 @@ WHERE {
     ?NLineweightProperty skos:prefLabel "N lineweight" .
     ?lw_nURI skos:prefLabel ?lw_n .
 
-    ?objectURI ?NColorProperty ?kl_nURI .
+    ?objectURI ?NColorProperty ?kl_nURI_temp .
     ?NColorProperty skos:prefLabel "N color" .
-    ?kl_nURI skos:prefLabel ?kl_n .
+    OPTIONAL {
+      ?kl_nURI_temp skos:prefLabel ?kl_n_temp .
+    }
+    BIND( COALESCE(?kl_n_temp, ?kl_nURI_temp) AS ?kl_n) .
+    BIND( IF(?kl_n = ?kl_n_temp, ?kl_nURI_temp, ?undefined) AS ?kl_nURI) .
 
-    ?objectURI ?NColorAProperty ?kl_n_aURI .
+    ?objectURI ?NColorAProperty ?kl_n_aURI_temp .
     ?NColorAProperty skos:prefLabel "N color A" .
-    ?kl_n_aURI skos:prefLabel ?kl_n_a .
+    OPTIONAL {
+      ?kl_n_aURI_temp skos:prefLabel ?kl_n_a_temp .
+    }
+    BIND( COALESCE(?kl_n_a_temp, ?kl_n_aURI_temp) AS ?kl_n_a) .
+    BIND( IF(?kl_n_a = ?kl_n_a_temp, ?kl_n_aURI_temp, ?undefined) AS ?kl_n_aURI) .
 
-    ?objectURI ?NColorGDProperty ?kl_n_gdURI .
+    ?objectURI ?NColorGDProperty ?kl_n_gdURI_temp .
     ?NColorGDProperty skos:prefLabel "N color GD" .
-    ?kl_n_gdURI skos:prefLabel ?kl_n_gd .
+    OPTIONAL {
+      ?kl_n_gdURI_temp skos:prefLabel ?kl_n_gd_temp .
+    }
+    BIND( COALESCE(?kl_n_gd_temp, ?kl_n_gdURI_temp) AS ?kl_n_gd) .
+    BIND( IF(?kl_n_gd = ?kl_n_gd_temp, ?kl_n_gdURI_temp, ?undefined) AS ?kl_n_gdURI) .
 
-    ?objectURI ?NColorGNProperty ?kl_n_gnURI .
+    ?objectURI ?NColorGNProperty ?kl_n_gnURI_temp .
     ?NColorGNProperty skos:prefLabel "N color GN" .
-    ?kl_n_gnURI skos:prefLabel ?kl_n_gn .
+    OPTIONAL {
+      ?kl_n_gnURI_temp skos:prefLabel ?kl_n_gn_temp .
+    }
+    BIND( COALESCE(?kl_n_gn_temp, ?kl_n_gnURI_temp) AS ?kl_n_gn) .
+    BIND( IF(?kl_n_gn = ?kl_n_gn_temp, ?kl_n_gnURI_temp, ?undefined) AS ?kl_n_gnURI) .
 
-    ?objectURI ?NColorVProperty ?kl_n_vURI .
+    ?objectURI ?NColorVProperty ?kl_n_vURI_temp .
     ?NColorVProperty skos:prefLabel "N color V" .
-    ?kl_n_vURI skos:prefLabel ?kl_n_v .
+    OPTIONAL {
+      ?kl_n_vURI_temp skos:prefLabel ?kl_n_v_temp .
+    }
+    BIND( COALESCE(?kl_n_v_temp, ?kl_n_vURI_temp) AS ?kl_n_v) .
+    BIND( IF(?kl_n_v = ?kl_n_v_temp, ?kl_n_vURI_temp, ?undefined) AS ?kl_n_vURI) .
 
     ?objectURI ?NLinetypeProperty ?lt_nURI .
     ?NLinetypeProperty skos:prefLabel "N linetype" .
@@ -124,54 +180,94 @@ WHERE {
     ?TLineweightProperty skos:prefLabel "T lineweight" .
     ?lw_tURI skos:prefLabel ?lw_t .
 
-    ?objectURI ?TColorProperty ?kl_tURI .
+    ?objectURI ?TColorProperty ?kl_tURI_temp .
     ?TColorProperty skos:prefLabel "T color" .
-    ?kl_tURI skos:prefLabel ?kl_t .
+    OPTIONAL {
+      ?kl_tURI_temp skos:prefLabel ?kl_t_temp .
+    }
+    BIND( COALESCE(?kl_t_temp, ?kl_tURI_temp) AS ?kl_t) .
+    BIND( IF(?kl_t = ?kl_t_temp, ?kl_tURI_temp, ?undefined) AS ?kl_tURI) .
 
-    ?objectURI ?TColorAProperty ?kl_t_aURI .
+    ?objectURI ?TColorAProperty ?kl_t_aURI_temp .
     ?TColorAProperty skos:prefLabel "T color A" .
-    ?kl_t_aURI skos:prefLabel ?kl_t_a .
+    OPTIONAL {
+      ?kl_t_aURI_temp skos:prefLabel ?kl_t_a_temp .
+    }
+    BIND( COALESCE(?kl_t_a_temp, ?kl_t_aURI_temp) AS ?kl_t_a) .
+    BIND( IF(?kl_t_a = ?kl_t_a_temp, ?kl_t_aURI_temp, ?undefined) AS ?kl_t_aURI) .
 
-    ?objectURI ?TColorGDProperty ?kl_t_gdURI .
+    ?objectURI ?TColorGDProperty ?kl_t_gdURI_temp .
     ?TColorGDProperty skos:prefLabel "T color GD" .
-    ?kl_t_gdURI skos:prefLabel ?kl_t_gd .
+    OPTIONAL {
+      ?kl_t_gdURI_temp skos:prefLabel ?kl_t_gd_temp .
+    }
+    BIND( COALESCE(?kl_t_gd_temp, ?kl_t_gdURI_temp) AS ?kl_t_gd) .
+    BIND( IF(?kl_t_gd = ?kl_t_gd_temp, ?kl_t_gdURI_temp, ?undefined) AS ?kl_t_gdURI) .
 
-    ?objectURI ?TColorGNProperty ?kl_t_gnURI .
+    ?objectURI ?TColorGNProperty ?kl_t_gnURI_temp .
     ?TColorGNProperty skos:prefLabel "T color GN" .
-    ?kl_t_gnURI skos:prefLabel ?kl_t_gn .
+    OPTIONAL {
+      ?kl_t_gnURI_temp skos:prefLabel ?kl_t_gn_temp .
+    }
+    BIND( COALESCE(?kl_t_gn_temp, ?kl_t_gnURI_temp) AS ?kl_t_gn) .
+    BIND( IF(?kl_t_gn = ?kl_t_gn_temp, ?kl_t_gnURI_temp, ?undefined) AS ?kl_t_gnURI) .
 
-    ?objectURI ?TColorVProperty ?kl_t_vURI .
+    ?objectURI ?TColorVProperty ?kl_t_vURI_temp .
     ?TColorVProperty skos:prefLabel "T color V" .
-    ?kl_t_vURI skos:prefLabel ?kl_t_v .
+    OPTIONAL {
+      ?kl_t_vURI_temp skos:prefLabel ?kl_t_v_temp .
+    }
+    BIND( COALESCE(?kl_t_v_temp, ?kl_t_vURI_temp) AS ?kl_t_v) .
+    BIND( IF(?kl_t_v = ?kl_t_v_temp, ?kl_t_vURI_temp, ?undefined) AS ?kl_t_vURI) .
 
     ?objectURI ?TLinetypeProperty ?lt_tURI .
     ?TLinetypeProperty skos:prefLabel "T linetype" .
     ?lt_tURI skos:prefLabel ?lt_t .
-  } 
+  }  
   OPTIONAL {
     ?objectURI ?VLineweightProperty ?lw_vURI .
     ?VLineweightProperty skos:prefLabel "V lineweight" .
     ?lw_vURI skos:prefLabel ?lw_v .
 
-    ?objectURI ?VColorProperty ?kl_vURI .
+    ?objectURI ?VColorProperty ?kl_vURI_temp .
     ?VColorProperty skos:prefLabel "V color" .
-    ?kl_vURI skos:prefLabel ?kl_v .
+    OPTIONAL {
+      ?kl_vURI_temp skos:prefLabel ?kl_v_temp .
+    }
+    BIND( COALESCE(?kl_v_temp, ?kl_vURI_temp) AS ?kl_v) .
+    BIND( IF(?kl_v = ?kl_v_temp, ?kl_vURI_temp, ?undefined) AS ?kl_vURI) .
 
-    ?objectURI ?VColorAProperty ?kl_v_aURI .
+    ?objectURI ?VColorAProperty ?kl_v_aURI_temp .
     ?VColorAProperty skos:prefLabel "V color A" .
-    ?kl_v_aURI skos:prefLabel ?kl_v_a .
+    OPTIONAL {
+      ?kl_v_aURI_temp skos:prefLabel ?kl_v_a_temp .
+    }
+    BIND( COALESCE(?kl_v_a_temp, ?kl_v_aURI_temp) AS ?kl_v_a) .
+    BIND( IF(?kl_v_a = ?kl_v_a_temp, ?kl_v_aURI_temp, ?undefined) AS ?kl_v_aURI) .
 
-    ?objectURI ?VColorGDProperty ?kl_v_gdURI .
+    ?objectURI ?VColorGDProperty ?kl_v_gdURI_temp .
     ?VColorGDProperty skos:prefLabel "V color GD" .
-    ?kl_v_gdURI skos:prefLabel ?kl_v_gd .
+    OPTIONAL {
+      ?kl_v_gdURI_temp skos:prefLabel ?kl_v_gd_temp .
+    }
+    BIND( COALESCE(?kl_v_gd_temp, ?kl_v_gdURI_temp) AS ?kl_v_gd) .
+    BIND( IF(?kl_v_gd = ?kl_v_gd_temp, ?kl_v_gdURI_temp, ?undefined) AS ?kl_v_gdURI) .
 
-    ?objectURI ?VColorGNProperty ?kl_v_gnURI .
+    ?objectURI ?VColorGNProperty ?kl_v_gnURI_temp .
     ?VColorGNProperty skos:prefLabel "V color GN" .
-    ?kl_v_gnURI skos:prefLabel ?kl_v_gn .
+    OPTIONAL {
+      ?kl_v_gnURI_temp skos:prefLabel ?kl_v_gn_temp .
+    }
+    BIND( COALESCE(?kl_v_gn_temp, ?kl_v_gnURI_temp) AS ?kl_v_gn) .
+    BIND( IF(?kl_v_gn = ?kl_v_gn_temp, ?kl_v_gnURI_temp, ?undefined) AS ?kl_v_gnURI) .
 
-    ?objectURI ?VColorVProperty ?kl_v_vURI .
+    ?objectURI ?VColorVProperty ?kl_v_vURI_temp .
     ?VColorVProperty skos:prefLabel "V color V" .
-    ?kl_v_vURI skos:prefLabel ?kl_v_v .
+    OPTIONAL {
+      ?kl_v_vURI_temp skos:prefLabel ?kl_v_v_temp .
+    }
+    BIND( COALESCE(?kl_v_v_temp, ?kl_v_vURI_temp) AS ?kl_v_v) .
+    BIND( IF(?kl_v_v = ?kl_v_v_temp, ?kl_v_vURI_temp, ?undefined) AS ?kl_v_vURI) .
 
     ?objectURI ?VLinetypeProperty ?lt_vURI .
     ?VLinetypeProperty skos:prefLabel "V linetype" .