diff --git a/packages/schema-editor/src/plugins/json-schema-5/hooks/use-rdf-ontologies-resolver.ts b/packages/schema-editor/src/plugins/json-schema-5/hooks/use-rdf-ontologies-resolver.ts
index 9f35bd4aca6..939252a9d6f 100644
--- a/packages/schema-editor/src/plugins/json-schema-5/hooks/use-rdf-ontologies-resolver.ts
+++ b/packages/schema-editor/src/plugins/json-schema-5/hooks/use-rdf-ontologies-resolver.ts
@@ -20,27 +20,44 @@ export function useRDFPropertyResolver(fieldUri: string | undefined): AsyncState
     PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 
 
-    SELECT DISTINCT * WHERE {
+    SELECT DISTINCT
+      ?fieldUri
+      ?domain
+      ?class
+      ?comment
+      ?controlledVocabulary
+    WHERE {
       VALUES ?fieldUri { <${fieldUri}> }
+      VALUES ?_propertyClass { rdf:Property owl:DatatypeProperty owl:FunctionalProperty }
 
       ?fieldUri
-        rdfs:domain ?domain ;
-        rdfs:range ?class
+        a ?_propertyClass
       .
 
+
       OPTIONAL {
         ?fieldUri
-          rdfs:comment ?comment
+          rdfs:domain ?domain ;
+          rdfs:range ?class
         .
-        FILTER(lang(?comment) = 'en')
+
+
+        OPTIONAL {
+          ?class
+            <https://w3id.org/italia/onto/l0/controlledVocabulary> ?controlledVocabulary
+          .
+        }
+
       }
 
       OPTIONAL {
-        ?class
-          <https://w3id.org/italia/onto/l0/controlledVocabulary> ?controlledVocabulary
+        ?fieldUri
+          rdfs:comment ?comment
         .
+        FILTER(lang(?comment) = 'en')
       }
 
+
     }
   `,
     { skip: !fieldUri },