diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/getTypeMetadataFields.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/getTypeMetadataFields.php
index 5371fff..c3b6ebc 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/getTypeMetadataFields.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/getTypeMetadataFields.php
@@ -4,34 +4,23 @@ require_once('../../../../config/dmsDefaults.php');
 
 require_once(KT_LIB_DIR . '/dispatcher.inc.php');
 require_once(KT_LIB_DIR . '/templating/templating.inc.php');
-require_once(KT_LIB_DIR . '/documentmanagement/DocumentField.inc');
+require_once(KT_LIB_DIR . '/metadata/fieldset.inc.php');
 
 require_once(KT_LIB_DIR . '/visualpatterns/PatternMetaData.inc');
 
 class GetTypeMetadataFieldsDispatcher extends KTDispatcher {
     function do_main() {
-        return $this->getTypeMetadataFields($_REQUEST['fDocumentTypeID']);
+        return $this->getTypeMetadataFieldsets ($_REQUEST['fDocumentTypeID']);
     }
 
-    function getTypeMetadataFields ($iDocumentTypeID) {
-        /*ok*/ $sQuery = array("SELECT DF.id AS id " .
-          "FROM document_fields AS DF LEFT JOIN document_type_fields_link AS DTFL ON DTFL.field_id = DF.id " .
-          "WHERE DF.is_generic = ? " .
-          "AND DTFL.document_type_id = ?", array(false, $iDocumentTypeID));
-
-        $aIDs = DBUtil::getResultArray($sQuery);
-
-        $aFields = array();
-        foreach ($aIDs as $iID) {
-            $aFields[] =& call_user_func(array('DocumentField', 'get'), $iID);
-        }
+    function getTypeMetadataFieldsets ($iDocumentTypeID) {
         $aTemplateData = array(
             'caption' => _('Type specific meta data'),
             'empty_message' => _("No Type Specific Meta Data"),
-            'fields' => $aFields,
+            'fieldsets' => KTFieldSet::getForDocumentType($iDocumentTypeID),
         );
         $oTemplating = KTTemplating::getSingleton();
-        $oTemplate = $oTemplating->loadTemplate("ktcore/metadata_fields/editable_metadata_fields");
+        $oTemplate = $oTemplating->loadTemplate("ktcore/metadata_fields/editable_metadata_fieldsets");
         return $oTemplate->render($aTemplateData);
     }
 }
diff --git a/templates/ktcore/metadata_fields/editable_metadata_fieldsets.smarty b/templates/ktcore/metadata_fields/editable_metadata_fieldsets.smarty
new file mode 100644
index 0000000..1b054c0
--- /dev/null
+++ b/templates/ktcore/metadata_fields/editable_metadata_fieldsets.smarty
@@ -0,0 +1,76 @@
+{literal}
+<style>
+
+.kt_treenodes {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    border: 0;
+    text-align: left !important;
+}
+
+.leafnode {font-weight: bold; }
+
+.kt_treenodes ul {
+    list-style: none;
+    text-align: left;
+}
+.kt_treenodes li.treenode > a.pathnode {
+   background: transparent url(/graphics/plus.png) center left no-repeat;
+   padding-left: 15px;
+}
+
+.kt_treenodes li.treenode.active > a.pathnode {
+   background: transparent url(/graphics/minus.png) center left no-repeat;
+}
+
+.kt_treenodes li.active > ul {
+    display: block;
+}
+
+.kt_treenodes li ul {
+    display: none;
+}
+
+</style>
+{/literal}
+
+<script language="javascript" src="/thirdpartyjs/MochiKit/Base.js" > </script>
+<script language="javascript" src="/thirdpartyjs/MochiKit/Iter.js" > </script>
+<script language="javascript" src="/thirdpartyjs/MochiKit/DOM.js" > </script>
+
+{if !$metadata_prefix}
+  {assign var="metadata_prefix" value="emd"}
+{/if}
+
+{if $caption}
+  <p>{$caption}</p>
+{/if}
+
+{foreach from=$fieldsets item=oFieldset}
+<fieldset>
+  <legend>{$oFieldset->getName()}</legend>
+
+  <table class="prettysw" cellpadding="0" cellspacing="0">
+  { foreach item=oField from=$oFieldset->getFields() }
+    <tr>
+      <th>{$oField->getName()}</th>
+      <td>
+
+  {php}
+  $oField = $this->_tpl_vars['oField'];
+  $sPrefix = $this->_tpl_vars['metadata_prefix'];
+  $sValue = $this->_tpl_vars['values'][$oField->getID()];
+  $this->assign('pattern',
+  	new PatternMetadata($oField->getName(), $sPrefix .  $oField->getID(), $sValue));
+  {/php}
+  {$pattern->render()}
+
+      </td>
+    </tr>
+  { /foreach }
+  </table>
+</fieldset}
+{foreachelse}
+No fields found
+{/foreach}