diff --git a/app/scripts/controlled-term/class-list.directive.html b/app/scripts/controlled-term/class-list.directive.html
index cf054c061..5a9f57ab1 100644
--- a/app/scripts/controlled-term/class-list.directive.html
+++ b/app/scripts/controlled-term/class-list.directive.html
@@ -5,12 +5,15 @@
         <div class="class-list-container">
           <div class="class-list-table">
             <table  class="table table-hover table-striped ">
+              <!-- Will need te below commented out parts of the table after schema will be extended to store ontology name,
+              so these fields can be queried and displayed -->
               <thead>
               <tr>
-                <th>Name</th>
-                <th width="250px">Description</th>
-                <th>Source</th>
-                <th>Identifier</th>
+                <th colspan=5 >IRI</th>
+<!--                <th>Name</th>-->
+<!--                <th width="250px">Description</th>-->
+<!--                <th>Source</th>-->
+<!--                <th>Identifier</th>-->
                 <th><button class="close" style="left:0;color:#000" type="button" ng-click="dialogOpen = false"
                     tooltip-append-to-body="true"
                     uib-tooltip="{{'GENERIC.Close' | translate}}"
@@ -20,18 +23,21 @@
               </thead>
               <tbody>
               <tr ng-if="addedFieldKeys.length > 0" ng-repeat="key in addedFieldKeys">
-                <td>
-                  {{getPrefLabel(key)}}
-                </td>
-                <td style="font-size:0.9em">
-                  {{getShortText(getClassDescription(key), 120, '...', '-')}}
-                </td>
-                <td>
-                  {{parseOntologyName(key)}}
-                </td>
-                <td uib-tooltip="{{getShortId(getClassId(key))}}" tooltip-append-to-body="true">
-                  {{getShortId(getClassId(key), 16)}}
-                </td>
+                    <td colspan="5">
+                      {{key}}
+                    </td>
+<!--                <td>-->
+<!--                  {{getPrefLabel(key)}}-->
+<!--                </td>-->
+<!--                <td style="font-size:0.9em">-->
+<!--                  {{getShortText(getClassDescription(key), 120, '...', '-')}}-->
+<!--                </td>-->
+<!--                <td>-->
+<!--                  {{parseOntologyName(key)}}-->
+<!--                </td>-->
+<!--                <td uib-tooltip="{{getShortId(getClassId(key))}}" tooltip-append-to-body="true">-->
+<!--                  {{getShortId(getClassId(key), 16)}}-->
+<!--                </td>-->
                 <td>
                   <div class="class-delete" ng-click="deleteFieldAddedItem(key);$event.stopPropagation();"
                       tooltip-append-to-body="true"
diff --git a/app/scripts/controlled-term/class-list.directive.js b/app/scripts/controlled-term/class-list.directive.js
index 5b598332e..fba969bfb 100644
--- a/app/scripts/controlled-term/class-list.directive.js
+++ b/app/scripts/controlled-term/class-list.directive.js
@@ -93,13 +93,15 @@ define([
             }, myMap);
 
 
+            // Marc 2023: Started to write correct IRI to schema which doesn't have the ontology name.
+            // Following can not be queried until schema is extended to store the ontology
+
             // get any missing responses
-            myMap.forEach(function (value, key) {
-              if (myMap.get(key) == "") {
-                setResponse(key, DataManipulationService.parseOntologyName(key),
-                    DataManipulationService.parseClassLabel(key));
-              }
-            }, myMap);
+            // myMap.forEach(function (value, key) {
+            //   if (myMap.get(key) == "") {
+            //     setResponse(key, DataManipulationService.parseOntologyName(key), key);
+            //   }
+            // }, myMap);
 
 
             // fill up the key array
diff --git a/app/scripts/controlled-term/controlled-term-search.directive.js b/app/scripts/controlled-term/controlled-term-search.directive.js
index a1b070e13..4d526c918 100644
--- a/app/scripts/controlled-term/controlled-term-search.directive.js
+++ b/app/scripts/controlled-term/controlled-term-search.directive.js
@@ -649,4 +649,4 @@ define([
 
       }
     }
-);
\ No newline at end of file
+);
diff --git a/app/scripts/controlled-term/controlled-term.directive.controller.js b/app/scripts/controlled-term/controlled-term.directive.controller.js
index 64bcf2773..d8268e106 100644
--- a/app/scripts/controlled-term/controlled-term.directive.controller.js
+++ b/app/scripts/controlled-term/controlled-term.directive.controller.js
@@ -179,8 +179,8 @@ define([
          * Add ontology type to JSON.
          */
         var properties = $rootScope.propertiesOf(vm.field);
-        var selfUrl = controlledTermService.getSelfUrl(selection);
-        //var selfUrl = selection['@id'];
+        // var selfUrl = controlledTermService.getSelfUrl(selection);
+        var selfUrl = selection['@id'];
         if (angular.isArray(properties['@type'].oneOf[0].enum)) {
           properties['@type'].oneOf[0].enum.push(selfUrl);
           properties['@type'].oneOf[1].items.enum.push(selfUrl);
@@ -197,7 +197,6 @@ define([
 
       var id = DataManipulationService.getId(vm.field);
       $rootScope.$broadcast('field:controlledTermAdded', ['', id, '', '']);
-
     }
 
     /**
diff --git a/app/scripts/service/data-manipulation.service.js b/app/scripts/service/data-manipulation.service.js
index 3c6fc0c03..46678e26a 100755
--- a/app/scripts/service/data-manipulation.service.js
+++ b/app/scripts/service/data-manipulation.service.js
@@ -1889,7 +1889,7 @@ define([
 
         // parse the ontology code from the selfUrl
         service.parseOntologyName = function (itemData) {
-          var re = new RegExp('\/ontologies\/(.+)\/classes\/');
+          var re = new RegExp('\/ontology\/(.+)\/');
           var m;
           var result;
           if ((m = re.exec(itemData)) !== null) {