diff --git a/src/classes/entities/class-tainacan-item.php b/src/classes/entities/class-tainacan-item.php
index 494a542fb..115d8e322 100644
--- a/src/classes/entities/class-tainacan-item.php
+++ b/src/classes/entities/class-tainacan-item.php
@@ -622,9 +622,6 @@ class Item extends Entity {
 
 			$fto = $item_meta->get_metadatum()->get_metadata_type_object();
 
-			$before = str_replace('$type', $fto->get_slug(), $args['before']);
-			$return .= $before;
-
 			if ( $fto->get_core() ) {
 				if ( $args['exclude_core'] ) {
 					continue;
@@ -635,6 +632,9 @@ class Item extends Entity {
 				}
 			}
 
+			$before = str_replace('$type', $fto->get_slug(), $args['before']);
+			$return .= $before;
+
 			if ($item_meta->has_value() || !$args['hide_empty']) {
 				$return .= $args['before_title'] . $item_meta->get_metadatum()->get_name() . $args['after_title'];
 				$return .= $args['before_value'] . $item_meta->get_value_as_html() . $args['after_value'];
diff --git a/src/views/admin/components/filter-types/taxonomy/Checkbox.vue b/src/views/admin/components/filter-types/taxonomy/Checkbox.vue
index e3098a7e8..069c4e1dc 100644
--- a/src/views/admin/components/filter-types/taxonomy/Checkbox.vue
+++ b/src/views/admin/components/filter-types/taxonomy/Checkbox.vue
@@ -193,7 +193,6 @@
                     this.selected = metadata.terms;
                 } else {
                     this.selected = [];
-                    return false;
                 }
 
                 let onlyLabels = [];