diff --git a/src/classes/theme-helper/class-tainacan-theme-helper.php b/src/classes/theme-helper/class-tainacan-theme-helper.php
index 9a5a56fcd..7ff52a038 100644
--- a/src/classes/theme-helper/class-tainacan-theme-helper.php
+++ b/src/classes/theme-helper/class-tainacan-theme-helper.php
@@ -1533,12 +1533,9 @@ class Theme_Helper {
 		$before = apply_filters( 'tainacan-get-item-metadatum-as-html-before', $before, $item_metadatum );
 		$before = apply_filters( 'tainacan-get-item-metadatum-as-html-before--type-' . $metadatum->get_metadata_type(), $before, $item_metadatum );
 		$before = apply_filters( 'tainacan-get-item-metadatum-as-html-before--id-' . $metadatum->get_id(), $before, $item_metadatum );
-		if ( is_numeric($metadatum_index) ) {
-			$before = apply_filters( 'tainacan-get-item-metadatum-as-html-before--index-' . $metadatum_index, $before, $item_metadatum );
-		}
 
 		// Renders the metadatum opener
-		$return .= $before;
+		$return = $before;
 
 		// Renders the metadatum name
 		$metadatum_title_before = $args['before_title'];
@@ -1557,9 +1554,6 @@ class Theme_Helper {
 		$after = $args['after'];
 
 		// Let theme authors tweak the wrapper closer
-		if ( is_numeric($metadatum_index) ) {
-			$after = apply_filters( 'tainacan-get-item-metadatum-as-html-after--index-' . $metadatum_index, $after, $item_metadatum );
-		}
 		$after = apply_filters( 'tainacan-get-item-metadatum-as-html-after--id-' . $metadatum->get_id(), $after, $item_metadatum );
 		$after = apply_filters( 'tainacan-get-item-metadatum-as-html-after--type-' . $metadatum->get_metadata_type(), $after, $item_metadatum );
 		$after = apply_filters( 'tainacan-get-item-metadatum-as-html-after', $after, $item_metadatum );
diff --git a/src/views/gutenberg-blocks/blocks/item-metadata/edit.js b/src/views/gutenberg-blocks/blocks/item-metadata/edit.js
index 97e55196b..a1d8e9af7 100644
--- a/src/views/gutenberg-blocks/blocks/item-metadata/edit.js
+++ b/src/views/gutenberg-blocks/blocks/item-metadata/edit.js
@@ -29,7 +29,6 @@ export default function ({ attributes, setAttributes, className, isSelected, con
     checkIfTemplateEdition();
 
     function setContent() {
-        
         isLoading = true;
 
         setAttributes({
@@ -37,63 +36,132 @@ export default function ({ attributes, setAttributes, className, isSelected, con
         });
 
         if (metadataSectionsRequestSource != undefined && typeof metadataSectionsRequestSource == 'function')
-            metadataSectionsRequestSource.cancel('Previous items search canceled.');
+            metadataSectionsRequestSource.cancel('Previous metadata sections search canceled.');
 
         metadataSectionsRequestSource = axios.CancelToken.source();
 
         let endpoint = '/collection/'+ collectionId + '/metadata-sections';
 
-        tainacan.get(endpoint, { cancelToken: metadataSectionsRequestSource.token })
-            .then(response => {
+        let requests = [];
 
-                metadataSections = response.data ? response.data : [];
-                setAttributes({
+        requests.push(tainacan.get(endpoint, { cancelToken: metadataSectionsRequestSource.token }));
+
+        if (dataSource !== 'template') {
+            endpoint = '/item/' + itemId + '/metadata';
+            
+            requests.push(tainacan.get(endpoint, { cancelToken: metadataSectionsRequestSource.token }));
+        }
+
+        axios.all(requests)
+            .then(response => {
+                if ( 
+                    (dataSource !== 'template' && response.length !== 2) ||
+                    (dataSource === 'template' && response.length !== 1)
+                ) {
+                    setAttributes({
+                        metadataSections: [],
+                        itemMetadata: [],
+                        isLoading: false
+                    });
+                    return;
+                }
+
+                const metadataSectionsResponse = response[0];
+                metadataSections = metadataSectionsResponse.data ? metadataSectionsResponse.data : [];
+
+                if (dataSource !== 'template') {
+                    const itemMetadataResponse = response[1];
+                    itemMetadata = itemMetadataResponse.data ? itemMetadataResponse.data : [];
+                }
+
+                getItemMetadataTemplates({
                     metadataSections: metadataSections,
-                    isLoading: false,
+                    itemMetadata: dataSource !== 'template' ? itemMetadata : [],
                     metadataSectionsRequestSource: metadataSectionsRequestSource
                 });
-                getItemMetadataTemplates();
+            })
+            .catch((error) => {
+                console.error(error);
+
+                setAttributes({
+                    metadataSections: [],
+                    itemMetadata: [],
+                    isLoading: false
+                });
             });
     }
 
-    function getItemMetadataTemplates() {
-        itemMetadataTemplate = [];
+    function getItemMetadataTemplates({
+            metadataSections,
+            itemMetadata,
+            metadataSectionsRequestSource
+    }) {
+        let itemMetadataTemplate = []; 
 
-        console.log(metadataSections);
-        // itemMetadata.forEach((itemMetadatum) => {
+        metadataSections.forEach((aMetadataSection) => {
+            if ( aMetadataSection['metadata_object_list'] && aMetadataSection['metadata_object_list'].length ) {
+                
+                let itemMetadataBySection = [];
 
-        //     if (dataSource == 'template') {
-        //         itemMetadataTemplate.push([ 
-        //             'tainacan/item-metadatum',
-        //             {
-        //                 placeholder: __( 'Item Metadatum', 'tainacan' ),
-        //                 metadatumId: itemMetadatum.id,
-        //                 itemId: Number(itemId),
-        //                 collectionId: Number(collectionId),
-        //                 dataSource: 'template'
-        //             }
-        //         ]);
-        //     } else {
-        //         if (
-        //             (itemMetadatum.value !== '' && itemMetadatum.value !== false) &&
-        //             (!Array.isArray(itemMetadatum.value) || itemMetadatum.value.lenght) &&
-        //             itemMetadatum.metadatum &&
-        //             itemMetadatum.metadatum.id
-        //         ) {
-        //             itemMetadataTemplate.push([ 
-        //                 'tainacan/item-metadatum',
-        //                 {
-        //                     placeholder: __( 'Item Metadatum', 'tainacan' ),
-        //                     metadatumId: itemMetadatum.metadatum.id,
-        //                     itemId: Number(itemId),
-        //                     collectionId: Number(collectionId),
-        //                     dataSource: 'parent'
-        //                 }
-        //             ]);
-        //         }
-        //     }
-        // });
-        setAttributes({ itemMetadataTemplate: itemMetadataTemplate });
+                itemMetadataBySection.push([
+                    'core/heading',
+                    {
+                        placeholder: __( 'Metadata section name', 'tainacan' ),
+                        content: aMetadataSection.name
+                    }
+                ]);
+
+                if (dataSource === 'template') {
+                    aMetadataSection['metadata_object_list'].forEach((aMetadatum) => {
+                        itemMetadataBySection.push([ 
+                            'tainacan/item-metadatum',
+                            {
+                                placeholder: __( 'Item Metadatum', 'tainacan' ),
+                                metadatumId: aMetadatum.id,
+                                itemId: Number(itemId),
+                                collectionId: Number(collectionId),
+                                dataSource: 'template'
+                            }
+                        ]);
+                    });
+                } else {
+                    const metadataIds = aMetadataSection['metadata_object_list'].map(aMetadataSection => aMetadataSection.id);
+        
+                    itemMetadata.forEach((itemMetadatum) => {
+                        if (
+                            itemMetadatum.metadatum &&
+                            itemMetadatum.metadatum.id &&
+                            metadataIds.includes(itemMetadatum.metadatum.id) &&
+                            (itemMetadatum.value !== '' && itemMetadatum.value !== false) &&
+                            (!Array.isArray(itemMetadatum.value) || itemMetadatum.value.length)
+                        ) {
+                            itemMetadataBySection.push([ 
+                                'tainacan/item-metadatum',
+                                {
+                                    placeholder: __( 'Item Metadatum', 'tainacan' ),
+                                    metadatumId: itemMetadatum.metadatum.id,
+                                    itemId: Number(itemId),
+                                    collectionId: Number(collectionId),
+                                    dataSource: 'parent'
+                                }
+                            ]);
+                        }
+                    });
+                }
+                itemMetadataTemplate.push([
+                    'core/group',
+                    {},
+                    itemMetadataBySection
+                ]);
+            }
+        });
+        setAttributes({ 
+            itemMetadataTemplate: itemMetadataTemplate,
+            itemMetadata: itemMetadata,
+            metadataSections: metadataSections,
+            isLoading: false,
+            metadataSectionsRequestSource: metadataSectionsRequestSource
+        });
     }
     
     function checkIfTemplateEdition() {
@@ -143,11 +211,11 @@ export default function ({ attributes, setAttributes, className, isSelected, con
     }
     
     return content == 'preview' ? 
-            <div className={className}>
-                <img
-                        width="100%"
-                        src={ `${tainacan_blocks.base_url}/assets/images/related-carousel-items.png` } />
-            </div>
+        <div className={className}>
+            <img
+                    width="100%"
+                    src={ `${tainacan_blocks.base_url}/assets/images/related-carousel-items.png` } />
+        </div>
         : (
         <div { ...blockProps }>
 
@@ -182,7 +250,7 @@ export default function ({ attributes, setAttributes, className, isSelected, con
                 ) : null
             }
 
-            { !itemId && dataSource != 'template' ? (
+            { !itemId && dataSource !== 'template' ? (
                 <Placeholder
                     className="tainacan-block-placeholder"
                     icon={(
@@ -222,7 +290,7 @@ export default function ({ attributes, setAttributes, className, isSelected, con
                     <Spinner />
                 </div> :
                 <div className={ 'item-metadata-edit-container' }>
-                    {  itemMetadata.length ?
+                    { metadataSections.length ?
                         <InnerBlocks
                                 allowedBlocks={ true }
                                 template={ itemMetadataTemplate }
diff --git a/src/views/gutenberg-blocks/blocks/item-metadatum/save.php b/src/views/gutenberg-blocks/blocks/item-metadatum/save.php
index b57789626..869ba09f4 100644
--- a/src/views/gutenberg-blocks/blocks/item-metadatum/save.php
+++ b/src/views/gutenberg-blocks/blocks/item-metadatum/save.php
@@ -43,10 +43,10 @@ function tainacan_blocks_render_item_metadatum( $block_attributes, $content, $bl
 	// Checks if we are in the edit page or in the published
 	$current_post = get_post();
 	
-	if ( $data_source == 'template' && $collection_id ) {
+	if ( $data_source === 'template' && $collection_id ) {
 		$collection_pt_pattern = '/' . \Tainacan\Entities\Collection::$db_identifier_prefix . '\d+' . \Tainacan\Entities\Collection::$db_identifier_sufix . '/';
 
-		if ( $current_post == NULL )
+		if ( $current_post === NULL )
 			return \Tainacan\Theme_Helper::get_instance()->get_tainacan_item_metadata_template( $args, $collection_id );
 		else if ( $current_post->post_type !== false && preg_match($collection_pt_pattern, $current_post->post_type) ) 
 			return tainacan_get_the_metadata( $args, $current_post->ID );