diff --git a/src/views/gutenberg-blocks/tainacan-blocks/carousel-collections-list/edit.js b/src/views/gutenberg-blocks/tainacan-blocks/carousel-collections-list/edit.js
index a21448620..3eaef215c 100644
--- a/src/views/gutenberg-blocks/tainacan-blocks/carousel-collections-list/edit.js
+++ b/src/views/gutenberg-blocks/tainacan-blocks/carousel-collections-list/edit.js
@@ -70,8 +70,7 @@ export default function ({ attributes, setAttributes, className, isSelected, cli
                 }
                 <a 
                     id={ isNaN(collection.id) ? collection.id : 'collection-id-' + collection.id }
-                    href={ collection.url } 
-                    target="_blank">
+                    href={ collection.url }>
                     { !showCollectionThumbnail ? 
                         <div class="collection-items-grid">
                             <img 
diff --git a/src/views/gutenberg-blocks/tainacan-blocks/carousel-collections-list/theme.vue b/src/views/gutenberg-blocks/tainacan-blocks/carousel-collections-list/theme.vue
index 02817431d..a419a23b4 100644
--- a/src/views/gutenberg-blocks/tainacan-blocks/carousel-collections-list/theme.vue
+++ b/src/views/gutenberg-blocks/tainacan-blocks/carousel-collections-list/theme.vue
@@ -19,8 +19,7 @@
                         <a 
                                 v-if="showCollectionThumbnail"
                                 :id="isNaN(collection.id) ? collection.id : 'collection-id-' + collection.id"
-                                :href="collection.url"
-                                target="_blank">
+                                :href="collection.url">
                             <img
                                 :src=" 
                                     collection.thumbnail && collection.thumbnail[maxCollectionsPerScreen > 4 ? (!cropImagesToSquare ? 'tainacan-medium-full' : 'tainacan-medium') : 'full'][0] && collection.thumbnail[maxCollectionsPerScreen > 4 ? (!cropImagesToSquare ? 'tainacan-medium-full' : 'tainacan-medium') : 'full'][0] 
@@ -54,8 +53,7 @@
                         <a 
                                 v-else
                                 :id="isNaN(collection.id) ? collection.id : 'collection-id-' + collection.id"
-                                :href="collection.url"
-                                target="_blank">
+                                :href="collection.url">
                             <div class="collection-items-grid">
                                 <blur-hash-image
                                         :height="collectionItems[collection.id][0] ? $thumbHelper.getHeight(collectionItems[collection.id][0]['thumbnail'], 'tainacan-medium') : 275"
diff --git a/src/views/gutenberg-blocks/tainacan-blocks/carousel-items-list/edit.js b/src/views/gutenberg-blocks/tainacan-blocks/carousel-items-list/edit.js
index d65702c17..0f9584892 100644
--- a/src/views/gutenberg-blocks/tainacan-blocks/carousel-items-list/edit.js
+++ b/src/views/gutenberg-blocks/tainacan-blocks/carousel-items-list/edit.js
@@ -81,8 +81,7 @@ export default function({ attributes, setAttributes, className, isSelected, clie
                 }   
                 <a 
                     id={ isNaN(item.id) ? item.id : 'item-id-' + item.id }
-                    href={ item.url } 
-                    target="_blank">
+                    href={ item.url }>
                     <div class="items-list-item--image-wrap">
                         <img
                             src={ thumbHelper.getSrc(item['thumbnail'], (maxItemsPerScreen > 4 ? (!cropImagesToSquare ? 'tainacan-medium-full' : 'tainacan-medium') : 'large'), item['document_mimetype']) }
@@ -569,7 +568,6 @@ export default function({ attributes, setAttributes, className, isSelected, clie
                         :
                         <a
                                 href={ collection.url ? collection.url : '' }
-                                target="_blank"
                                 class="carousel-items-collection-header">
                             <div
                                     style={{
diff --git a/src/views/gutenberg-blocks/tainacan-blocks/carousel-items-list/theme.vue b/src/views/gutenberg-blocks/tainacan-blocks/carousel-items-list/theme.vue
index 4ce075fd9..d37fa0ab3 100644
--- a/src/views/gutenberg-blocks/tainacan-blocks/carousel-items-list/theme.vue
+++ b/src/views/gutenberg-blocks/tainacan-blocks/carousel-items-list/theme.vue
@@ -9,7 +9,6 @@
                     :style="{ height: '165px' }"/>
             <a
                     v-else
-                    target="_blank"
                     :href="collection.url ? collection.url : ''"
                     class="carousel-items-collection-header">
                 <div
@@ -69,8 +68,7 @@
                             :class="{ 'is-forced-square': cropImagesToSquare }">
                         <a 
                                 :id="isNaN(item.id) ? item.id : 'item-id-' + item.id"
-                                :href="item.url"
-                                target="_blank">
+                                :href="item.url">
                             <blur-hash-image
                                     :height="$thumbHelper.getHeight(item['thumbnail'], (maxItemsPerScreen > 4 ? (!cropImagesToSquare ? 'tainacan-medium-full' : 'tainacan-medium') : 'large'))"
                                     :width="$thumbHelper.getWidth(item['thumbnail'], (maxItemsPerScreen > 4 ? (!cropImagesToSquare ? 'tainacan-medium-full' : 'tainacan-medium') : 'large'))"
diff --git a/src/views/gutenberg-blocks/tainacan-blocks/carousel-terms-list/edit.js b/src/views/gutenberg-blocks/tainacan-blocks/carousel-terms-list/edit.js
index 52c5bb39c..35eaf8894 100644
--- a/src/views/gutenberg-blocks/tainacan-blocks/carousel-terms-list/edit.js
+++ b/src/views/gutenberg-blocks/tainacan-blocks/carousel-terms-list/edit.js
@@ -66,8 +66,7 @@ export default function({ attributes, setAttributes, className, isSelected, clie
                 }
                 <a 
                     id={ isNaN(term.id) ? term.id : 'term-id-' + term.id }
-                    href={ term.url } 
-                    target="_blank">
+                    href={ term.url }>
                     { !showTermThumbnail ? 
                         <div class="term-items-grid">
                             <img 
diff --git a/src/views/gutenberg-blocks/tainacan-blocks/carousel-terms-list/theme.vue b/src/views/gutenberg-blocks/tainacan-blocks/carousel-terms-list/theme.vue
index 5b01ecb86..418c22a66 100644
--- a/src/views/gutenberg-blocks/tainacan-blocks/carousel-terms-list/theme.vue
+++ b/src/views/gutenberg-blocks/tainacan-blocks/carousel-terms-list/theme.vue
@@ -19,8 +19,7 @@
                         <a 
                                 v-if="showTermThumbnail"
                                 :id="isNaN(term.id) ? term.id : 'term-id-' + term.id"
-                                :href="term.url"
-                                target="_blank">
+                                :href="term.url">
                             <img
                                 :src="term.header_image ? term.header_image : `${tainacanBaseUrl}/assets/images/placeholder_square.png`"
                                 :alt="term.name ? term.name : $root.__('Thumbnail', 'tainacan')" >
@@ -29,8 +28,7 @@
                         <a 
                                 v-else
                                 :id="isNaN(term.id) ? term.id : 'term-id-' + term.id"
-                                :href="term.url"
-                                target="_blank">
+                                :href="term.url">
                             <div class="term-items-grid">
                                 <blur-hash-image
                                         :height="termItems[term.id][2] ? $thumbHelper.getHeight(termItems[term.id][0]['thumbnail'], 'tainacan-medium') : 275"
diff --git a/src/views/gutenberg-blocks/tainacan-blocks/collections-list/edit.js b/src/views/gutenberg-blocks/tainacan-blocks/collections-list/edit.js
index 239d9d00f..7c490fe91 100644
--- a/src/views/gutenberg-blocks/tainacan-blocks/collections-list/edit.js
+++ b/src/views/gutenberg-blocks/tainacan-blocks/collections-list/edit.js
@@ -43,8 +43,7 @@ export default function({ attributes, setAttributes, className, isSelected }) {
                 }
                 <a 
                     id={ isNaN(collection.id) ? collection.id : 'collection-id-' + collection.id }
-                    href={ collection.url } 
-                    target="_blank"
+                    href={ collection.url }
                     className={ (!showName ? 'collection-without-name' : '') + ' ' + (!showImage ? 'collection-without-image' : '') }>
                     <img
                         src={ collection.thumbnail && collection.thumbnail[0] && collection.thumbnail[0].src ? collection.thumbnail[0].src : `${tainacan_blocks.base_url}/assets/images/placeholder_square.png`}
diff --git a/src/views/gutenberg-blocks/tainacan-blocks/dynamic-items-list/edit.js b/src/views/gutenberg-blocks/tainacan-blocks/dynamic-items-list/edit.js
index 0071b4073..e57500182 100644
--- a/src/views/gutenberg-blocks/tainacan-blocks/dynamic-items-list/edit.js
+++ b/src/views/gutenberg-blocks/tainacan-blocks/dynamic-items-list/edit.js
@@ -95,13 +95,14 @@ export default function({ attributes, setAttributes, className, isSelected, clie
                     id={ isNaN(item.id) ? item.id : 'item-id-' + item.id }
                     href={ item.url } 
                     onClick={ (event) => event.preventDefault() }
-                    target="_blank"
                     className={ (!showName ? 'item-without-title' : '') + ' ' + (!showImage ? 'item-without-image' : '') }>
                     <img
                         src={ thumbHelper.getSrc(item['thumbnail'], ( (layout == 'list' || cropImagesToSquare) ? 'tainacan-medium' : 'tainacan-medium-full'), item['document_mimetype']) }
                         srcSet={ thumbHelper.getSrcSet(item['thumbnail'], ( (layout == 'list' || cropImagesToSquare) ? 'tainacan-medium' : 'tainacan-medium-full'), item['document_mimetype']) }
                         alt={ item.thumbnail_alt ? item.thumbnail_alt : (item && item.title ? item.title : __( 'Thumbnail', 'tainacan' )) }/>
-                    <span>{ item.title ? item.title : '' }</span>
+                    { item.title ?
+                        <span>{ item.title }</span>
+                    : null }
                 </a>
             </li>
         );
@@ -848,7 +849,6 @@ export default function({ attributes, setAttributes, className, isSelected, clie
                         :
                         <a
                                 href={ collection.url ? collection.url : '' }
-                                target="_blank"
                                 class="dynamic-items-collection-header">
                             <div
                                     style={{
diff --git a/src/views/gutenberg-blocks/tainacan-blocks/dynamic-items-list/theme.vue b/src/views/gutenberg-blocks/tainacan-blocks/dynamic-items-list/theme.vue
index 7f2e31d24..c6fab66ed 100644
--- a/src/views/gutenberg-blocks/tainacan-blocks/dynamic-items-list/theme.vue
+++ b/src/views/gutenberg-blocks/tainacan-blocks/dynamic-items-list/theme.vue
@@ -9,7 +9,6 @@
                     :style="{ height: '165px' }"/>
             <a
                     v-else
-                    target="_blank"
                     :href="collection.url ? collection.url : ''"
                     class="dynamic-items-collection-header">
                 <div
@@ -204,7 +203,6 @@
                     <a 
                             :id="isNaN(item.id) ? item.id : 'item-id-' + item.id"
                             :href="item.url"
-                            target="_blank"
                             :class="(!showName ? 'item-without-title' : '') + ' ' + (!showImage ? 'item-without-image' : '')">
                         <blur-hash-image
                                 v-if="showImage"
@@ -215,7 +213,7 @@
                                 :hash="$thumbHelper.getBlurhashString(item['thumbnail'], ( layout == 'list' || cropImagesToSquare ? 'tainacan-medium' : 'tainacan-medium-full' ))"
                                 :alt="item.thumbnail_alt ? item.thumbnail_alt : (item && item.name ? item.name : $root.__( 'Thumbnail', 'tainacan' ))"
                                 :transition-duration="500" />
-                        <span>{{ item.title ? item.title : '' }}</span>
+                        <span v-if="item.title">{{ item.title }}</span>
                     </a>
                 </li>
             </ul>
@@ -252,7 +250,6 @@
                         <a 
                                 :id="isNaN(item.id) ? item.id : 'item-id-' + item.id"
                                 :href="item.url"
-                                target="_blank"
                                 :class="(!showName ? 'item-without-title' : '') + ' ' + (!showImage ? 'item-without-image' : '')">
                             <blur-hash-image
                                     :height="$thumbHelper.getHeight(item['thumbnail'], ( layout == 'list' || cropImagesToSquare ? 'tainacan-medium' : 'tainacan-medium-full' ))"
@@ -262,7 +259,7 @@
                                     :hash="$thumbHelper.getBlurhashString(item['thumbnail'], ( layout == 'list' || cropImagesToSquare ? 'tainacan-medium' : 'tainacan-medium-full' ))"
                                     :alt="item.thumbnail_alt ? item.thumbnail_alt : (item && item.name ? item.name : $root.__( 'Thumbnail', 'tainacan' ))"
                                     :transition-duration="500" />
-                            <span>{{ item.title ? item.title : '' }}</span>
+                            <span v-if="item.title">{{ item.title }}</span>
                         </a>
                     </li>
                 </div>
diff --git a/src/views/gutenberg-blocks/tainacan-blocks/facets-list/edit.js b/src/views/gutenberg-blocks/tainacan-blocks/facets-list/edit.js
index c815cd2b0..2b4bc7791 100644
--- a/src/views/gutenberg-blocks/tainacan-blocks/facets-list/edit.js
+++ b/src/views/gutenberg-blocks/tainacan-blocks/facets-list/edit.js
@@ -99,7 +99,6 @@ export default function({ attributes, setAttributes, className, isSelected, clie
                     id={ isNaN(facetId) ? facetId : 'facet-id-' + facetId }
                     href={ !appendChildTerms ? ((linkTermFacetsToTermPage && isMetadatumTypeTaxonomy(metadatumType)) ? facet.term_url : facet.url) : (facet.total_children > 0 ? null : (linkTermFacetsToTermPage ? facet.term_url : facet.url)) }
                     onClick={ () => { (appendChildTerms && facet.total_children > 0) ? displayChildTerms(facetId) : null } } 
-                    target="_blank"
                     style={{ fontSize: layout == 'cloud' && facet.total_items ? + (1 + (cloudRate/4) * Math.log(facet.total_items)) + 'em' : ''}}>
                     { isMetadatumTypeTaxonomy(metadatumType) ? 
                         <img
diff --git a/src/views/gutenberg-blocks/tainacan-blocks/facets-list/facet-unit.vue b/src/views/gutenberg-blocks/tainacan-blocks/facets-list/facet-unit.vue
index 5dbd5646b..a723bc432 100644
--- a/src/views/gutenberg-blocks/tainacan-blocks/facets-list/facet-unit.vue
+++ b/src/views/gutenberg-blocks/tainacan-blocks/facets-list/facet-unit.vue
@@ -6,7 +6,6 @@
                 :id="isNaN(facetId) ? facetId : 'facet-id-' + facetId"
                 :href="(appendChildTerms && facet.total_children > 0) ? null : ((linkTermFacetsToTermPage && isMetadatumTypeTaxonomy) ? facet.term_url : facet.url)"
                 @click="() => { (appendChildTerms && facet.total_children > 0) ? displayChildTerms(facetId) : null }"
-                target="_blank"
                 :style="{ fontSize: layout == 'cloud' && facet.total_items ? + (1 + (cloudRate/4) * Math.log(facet.total_items)) + 'em' : ''}">
             <img
                 v-if="isMetadatumTypeTaxonomy"
diff --git a/src/views/gutenberg-blocks/tainacan-blocks/items-list/edit.js b/src/views/gutenberg-blocks/tainacan-blocks/items-list/edit.js
index a93f27d5e..717ea569a 100644
--- a/src/views/gutenberg-blocks/tainacan-blocks/items-list/edit.js
+++ b/src/views/gutenberg-blocks/tainacan-blocks/items-list/edit.js
@@ -43,8 +43,7 @@ export default function({ attributes, setAttributes, className, isSelected }) {
                 }
                 <a 
                     id={ isNaN(item.id) ? item.id : 'item-id-' + item.id }
-                    href={ item.url } 
-                    target="_blank"
+                    href={ item.url }
                     className={ (!showName ? 'item-without-title' : '') + ' ' + (!showImage ? 'item-without-image' : '') }>
                     <img
                         src={ item.thumbnail && item.thumbnail[0] && item.thumbnail[0].src ? item.thumbnail[0].src : `${tainacan_blocks.base_url}/assets/images/placeholder_square.png`}
diff --git a/src/views/gutenberg-blocks/tainacan-blocks/terms-list/edit.js b/src/views/gutenberg-blocks/tainacan-blocks/terms-list/edit.js
index 23e03bd03..93a631c64 100644
--- a/src/views/gutenberg-blocks/tainacan-blocks/terms-list/edit.js
+++ b/src/views/gutenberg-blocks/tainacan-blocks/terms-list/edit.js
@@ -41,8 +41,7 @@ export default function({ attributes, setAttributes, className, isSelected }){
                 }         
                 <a 
                     id={ isNaN(term.id) ? term.id : 'term-id-' + term.id }
-                    href={ term.url } 
-                    target="_blank"
+                    href={ term.url }
                     className={ (!showName ? 'term-without-name' : '') + ' ' + (!showImage ? 'term-without-image' : '') }>
                     <img
                         src={ term.header_image && term.header_image[0] && term.header_image[0].src ? term.header_image[0].src : `${tainacan_blocks.base_url}/assets/images/placeholder_square.png`}