diff --git a/build.sh b/build.sh
index 2b75c8a86..57c66af03 100755
--- a/build.sh
+++ b/build.sh
@@ -73,6 +73,7 @@ rsync -axz --exclude='vendor/bin/phpc*' --exclude='vendor/squizlabs' --exclude='
  --exclude='pdf-viewer/pdfjs-dist/web/compressed.tracemonkey-pldi-09.pdf' \
  --exclude='vendor/tecnickcom/tcpdf/fonts' \
  --exclude='vendor/smalot/pdfparser/src/Smalot/PdfParser/Tests/' \
+ --exclude='vendor/tecnickcom/tcpdf/examples' \
   src/* $wp_plugin_dir/
 
 rm -rf $wp_plugin_dir/scss
diff --git a/package-lock.json b/package-lock.json
index 71ce1e51c..9e6ec88b6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1951,9 +1951,9 @@
       }
     },
     "buefy": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/buefy/-/buefy-0.8.5.tgz",
-      "integrity": "sha512-yGQUhIsZWTodCx1rpfDTA32v5OjILpDIDAP+X6KoE6du3F3EZwJ/k5aT8D6Ba6AxNzVdDa2M7f0hzMddLbm38A==",
+      "version": "0.8.6",
+      "resolved": "https://registry.npmjs.org/buefy/-/buefy-0.8.6.tgz",
+      "integrity": "sha512-7woxrdwANcnJbe7lofPxkJLGRRGIVwFXOo0kzEpiNB6alQj18NV6UrdAKse+LWCOADz+AeHe5gyc6qdgRjG5mw==",
       "requires": {
         "bulma": "0.7.5"
       }
diff --git a/package.json b/package.json
index 31ca65333..9adf8c99c 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "axios": "^0.19.0",
-    "buefy": "^0.8.5",
+    "buefy": "^0.8.6",
     "bulma": "^0.7.5",
     "mdi": "^2.2.43",
     "moment": "^2.22.2",
diff --git a/src/admin/class-tainacan-admin.php b/src/admin/class-tainacan-admin.php
index 8f9527454..a692af8af 100644
--- a/src/admin/class-tainacan-admin.php
+++ b/src/admin/class-tainacan-admin.php
@@ -41,14 +41,14 @@ class Admin {
 			array( &$this, 'admin_page' ),
 			plugin_dir_url( __FILE__ ) . 'images/tainacan_logo_symbol.svg'
 		);
-		
-		add_submenu_page( 
-			$this->menu_slug, 
-			__('System check', 'tainacan'), 
-			__('System check', 'tainacan'), 
-			'manage_options', 
-			'tainacan_systemcheck', 
-			array( &$this, 'systemcheck_page' ) 
+
+		add_submenu_page(
+			$this->menu_slug,
+			__('System check', 'tainacan'),
+			__('System check', 'tainacan'),
+			'manage_options',
+			'tainacan_systemcheck',
+			array( &$this, 'systemcheck_page' )
 		);
 
 		add_action( 'load-' . $page_suffix, array( &$this, 'load_admin_page' ) );
@@ -57,6 +57,7 @@ class Admin {
 	function load_admin_page() {
 		add_action( 'admin_enqueue_scripts', array( &$this, 'add_admin_css' ), 90 );
 		add_action( 'admin_enqueue_scripts', array( &$this, 'add_admin_js' ), 90 );
+		add_action( 'admin_enqueue_scripts', array(&$this, 'add_theme_files') );
 	}
 
 
@@ -74,18 +75,18 @@ class Admin {
 
 	function add_theme_files() {
 		global $TAINACAN_BASE_URL;
-		
+
 		// wp_enqueue_style( 'style', $TAINACAN_BASE_URL . '/assets/css/fonts/materialdesignicons.css' );
 		wp_enqueue_style( 'tainacan-fonts', $TAINACAN_BASE_URL . '/assets/css/fonts/tainacanicons.css', [], TAINACAN_VERSION );
 		wp_enqueue_style( 'roboto-fonts', 'https://fonts.googleapis.com/css?family=Roboto:400,400i,500,500i,700,700i', [], TAINACAN_VERSION );
 		wp_enqueue_script('underscore');
 	}
-	
+
 	function add_admin_css() {
 		global $TAINACAN_BASE_URL;
-		
+
 		wp_enqueue_style( 'tainacan-admin-page', $TAINACAN_BASE_URL . '/assets/css/tainacan-admin.css', [], TAINACAN_VERSION );
-		
+
 //		$undesired_wp_styles = [
 //			'admin-menu',
 //			'admin-bar',
@@ -119,14 +120,14 @@ class Admin {
 //
 //		wp_dequeue_style( $undesired_wp_styles );
 //		wp_deregister_style( $undesired_wp_styles );
-		
+
 	}
-	
+
 	function add_admin_js() {
 		global $TAINACAN_BASE_URL;
 
 		wp_enqueue_script( 'tainacan-user-admin', $TAINACAN_BASE_URL . '/assets/user_admin-components.js', ['underscore', 'media-editor', 'media-views', 'customize-controls'], TAINACAN_VERSION, true );
-		 
+
 		$settings = $this->get_admin_js_localization_params();
 
 		wp_localize_script( 'tainacan-user-admin', 'tainacan_plugin', $settings );
@@ -134,23 +135,23 @@ class Admin {
 		wp_enqueue_script('underscore');
 		wp_enqueue_script('jcrop');
 		wp_enqueue_script( 'customize-controls' );
-		
+
 		do_action('tainacan-enqueue-admin-scripts');
-		
+
 	}
-	
+
 	/**
 	 * Also used by DevInterface
 	 */
 	function get_admin_js_localization_params() {
 		global $TAINACAN_BASE_URL, $TAINACAN_API_MAX_ITEMS_PER_PAGE;
-		
+
 		$Tainacan_Collections = \Tainacan\Repositories\Collections::get_instance();
 		$Tainacan_Metadata      = \Tainacan\Repositories\Metadata::get_instance();
 		$Tainacan_Filters     = \Tainacan\Repositories\Filters::get_instance();
 		$Tainacan_Items       = \Tainacan\Repositories\Items::get_instance();
 		$Tainacan_Taxonomies  = \Tainacan\Repositories\Taxonomies::get_instance();
-		
+
 		$tainacan_admin_i18n = require( 'tainacan-admin-i18n.php' );
 
 		$entities_labels = [
@@ -222,33 +223,33 @@ class Admin {
 		}
 
 		$filter_types = $Tainacan_Filters->fetch_filter_types();
-		
+
 		foreach ( $filter_types as $index => $filter_type){
 		    $class = new $filter_type;
             $settings['i18n']['helpers_label'][$class->get_component()] = $class->get_form_labels();
 		}
-		
+
 		$settings['form_hooks'] = Admin_Hooks::get_instance()->get_registered_hooks();
-		
+
 		$wp_post_types = get_post_types(['show_ui' => true], 'objects');
 		if (isset($wp_post_types['attachment'])) {
 			unset($wp_post_types['attachment']);
 		}
-		
+
 		$wp_post_types = array_map(function($i) {
 			return [
 				'slug' => $i->name,
 				'label' => $i->label
 			];
 		}, $wp_post_types);
-		
+
 		$settings['wp_post_types'] = $wp_post_types;
-		
+
 		// add an alternative to enable select all items in all pages while we temporarly disable bulk edit for all (see #199)
-		$settings['enable_select_all_items_pages'] = defined('TAINACAN_ENABLE_SELECT_ALL_ITEMS_PAGES') ? TAINACAN_ENABLE_SELECT_ALL_ITEMS_PAGES : false; 
-		
+		$settings['enable_select_all_items_pages'] = defined('TAINACAN_ENABLE_SELECT_ALL_ITEMS_PAGES') ? TAINACAN_ENABLE_SELECT_ALL_ITEMS_PAGES : false;
+
 		return $settings;
-		
+
 	}
 
 	function admin_body_class( $classes ) {
@@ -334,7 +335,7 @@ class Admin {
 
 		wp_die();
 	}
-	
+
 	public function systemcheck_page() {
 		require_once('system-check/class-tainacan-system-check.php');
 		$check = new System_Check();
diff --git a/src/admin/components/advanced-search/advanced-search.vue b/src/admin/components/advanced-search/advanced-search.vue
index fda56ef69..a57565a40 100644
--- a/src/admin/components/advanced-search/advanced-search.vue
+++ b/src/admin/components/advanced-search/advanced-search.vue
@@ -54,7 +54,7 @@
                                     :value="`${metadatum.id}-${metadatum.metadata_type_options.taxonomy}-${metadatum.metadata_type_object.primitive_type}`"
                                     :key="metadatum.id"
                             >{{ metadatum.name }}</option>
-                            <option value="_document_content_index-undefined-string">Documento</option>
+                            <option value="document_content_index-undefined-string">Documento</option>
                         </b-select>
                     </b-field>
 
diff --git a/src/admin/components/bulk-edition/bulk-edition-modal.vue b/src/admin/components/bulk-edition/bulk-edition-modal.vue
index f12fb76f8..98536d722 100644
--- a/src/admin/components/bulk-edition/bulk-edition-modal.vue
+++ b/src/admin/components/bulk-edition/bulk-edition-modal.vue
@@ -97,8 +97,6 @@
                                 :maxtags="1"
                                 :class="{'is-field-history': bulkEditionProcedures[criterion].isDone}"
                                 :disabled="bulkEditionProcedures[criterion].isDone"
-                                :id="getMetadataByID(bulkEditionProcedures[criterion].metadatumID).metadata_type_object.component +
-                             '-' + getMetadataByID(bulkEditionProcedures[criterion].metadatumID).slug"
                                 :is="getMetadataByID(bulkEditionProcedures[criterion].metadatumID).metadata_type_object.component"
                                 :metadatum="{metadatum: getMetadataByID(bulkEditionProcedures[criterion].metadatumID)}"
                                 class="tainacan-bulk-edition-field"
@@ -152,8 +150,6 @@
                                 :maxtags="1"
                                 :class="{'is-field-history': bulkEditionProcedures[criterion].isDone}"
                                 :disabled="bulkEditionProcedures[criterion].isDone || bulkEditionProcedures[criterion].isExecuting"
-                                :id="getMetadataByID(bulkEditionProcedures[criterion].metadatumID).metadata_type_object.component +
-                             '-' + getMetadataByID(bulkEditionProcedures[criterion].metadatumID).slug"
                                 :is="getMetadataByID(bulkEditionProcedures[criterion].metadatumID).metadata_type_object.component"
                                 :metadatum="{metadatum: getMetadataByID(bulkEditionProcedures[criterion].metadatumID)}"
                                 class="tainacan-bulk-edition-field tainacan-bulk-edition-field-last"
diff --git a/src/admin/components/edition/collection-edition-form.vue b/src/admin/components/edition/collection-edition-form.vue
index 4850da6b5..a9576a8b7 100644
--- a/src/admin/components/edition/collection-edition-form.vue
+++ b/src/admin/components/edition/collection-edition-form.vue
@@ -182,7 +182,7 @@
                         </span>
                         <br>
                         <a
-                                class="is-inline add-link"   
+                                class="add-link"   
                                 :class="{'disabled': form.enable_cover_page != 'yes'}"
                                 target="_blank"  
                                 :href="newPagePath">
@@ -232,7 +232,7 @@
                             </b-dropdown>
                         </div>
                     </div>
-
+                    
                     <!-- Default View Mode -------------------------------- --> 
                     <b-field
                             v-if="form.enabled_view_modes.length > 0"
@@ -250,7 +250,7 @@
                                 @focus="clearErrors('default_view_mode')">
                             <option
                                     v-for="(viewMode, index) of form.enabled_view_modes"
-                                    v-if="registeredViewModes[viewMode] != undefined"
+                                    v-if="registeredViewModes[viewMode] != undefined && registeredViewModes[viewMode].full_screen != true"
                                     :key="index"
                                     :value="viewMode">{{ registeredViewModes[viewMode].label }}
                             </option>
diff --git a/src/admin/components/edition/importer-edition-form.vue b/src/admin/components/edition/importer-edition-form.vue
index 6fba81d86..f078d1f07 100644
--- a/src/admin/components/edition/importer-edition-form.vue
+++ b/src/admin/components/edition/importer-edition-form.vue
@@ -48,7 +48,7 @@
                             </b-select>
                             <router-link
                                     tag="a" 
-                                    class="is-inline add-link"     
+                                    class="add-link"     
                                     :to="{ path: $routerHelper.getNewCollectionPath(), query: { fromImporter: true }}">
                                 <span class="icon">
                                     <i class="tainacan-icon tainacan-icon-add"/>
@@ -491,7 +491,7 @@ export default {
 
     .source-file-upload {
         width: 100%;
-        display: grid;
+        @include display-grid;
     }
 
     .selected-source-file {
diff --git a/src/admin/components/edition/importer-mapping-form.vue b/src/admin/components/edition/importer-mapping-form.vue
index 9a2472857..63b13d941 100644
--- a/src/admin/components/edition/importer-mapping-form.vue
+++ b/src/admin/components/edition/importer-mapping-form.vue
@@ -74,7 +74,7 @@
                                     {{ metadatum.name }}
                                 </span>
                                 <span class="label-details">  
-                                    ({{ $i18n.get(metadatum.metadata_type_object.component) }}) <em>{{ (metadatum.collection_id != collectionId) ? $i18n.get('label_inherited') : '' }}</em>
+                                    ({{ metadatum.metadata_type_object.name }}) <em>{{ (metadatum.collection_id != collectionId) ? $i18n.get('label_inherited') : '' }}</em>
                                 </span>
                             </option>
                         </b-select>
@@ -93,7 +93,9 @@
                     <b-modal 
                             @close="onMetadatumEditionCanceled()"
                             :active.sync="isNewMetadatumModalActive"
-                            trap-focus>
+                            trap-focus
+                            aria-modal
+                            aria-role="dialog">
                         <div 
                                 autofocus="true"
                                 tabindex="-1"
diff --git a/src/admin/components/edition/item-bulk-edition-form.vue b/src/admin/components/edition/item-bulk-edition-form.vue
index 9bbef9cb1..c41de471f 100644
--- a/src/admin/components/edition/item-bulk-edition-form.vue
+++ b/src/admin/components/edition/item-bulk-edition-form.vue
@@ -400,7 +400,7 @@ export default {
         .source-file-upload {
             width: 100%;
             padding: 0.75rem $page-side-padding;
-            display: grid;
+            @include display-grid;
         }
         .document-list {
             display: inline-block;
diff --git a/src/admin/components/edition/item-edition-form.vue b/src/admin/components/edition/item-edition-form.vue
index 00fc86c19..e4c3bd74c 100644
--- a/src/admin/components/edition/item-edition-form.vue
+++ b/src/admin/components/edition/item-edition-form.vue
@@ -213,7 +213,9 @@
                                 :active.sync="isTextModalActive"
                                 :width="640"
                                 scroll="keep"
-                                trap-focus>
+                                trap-focus
+                                aria-modal
+                                aria-role="dialog">
                             <div class="tainacan-modal-content">
                                 <div class="tainacan-modal-title">
                                     <h2>{{ $i18n.get('instruction_write_text') }}</h2>
@@ -250,11 +252,11 @@
                                 :active.sync="isURLModalActive"
                                 :width="640"
                                 scroll="keep"
-                                trap-focus                
-                                autofocus
+                                trap-focus   
                                 role="dialog"
                                 tabindex="-1"
-                                aria-modal>
+                                aria-modal
+                                aria-role="dialog">
                             <div class="tainacan-modal-content">
                                 <div class="tainacan-modal-title">
                                     <h2>{{ $i18n.get('instruction_insert_url') }}</h2>
diff --git a/src/admin/components/edition/item-metadata-bulk-edition-form.vue b/src/admin/components/edition/item-metadata-bulk-edition-form.vue
index d9abc1cc1..c3742fd6c 100644
--- a/src/admin/components/edition/item-metadata-bulk-edition-form.vue
+++ b/src/admin/components/edition/item-metadata-bulk-edition-form.vue
@@ -115,7 +115,7 @@
                                 <span
                                         v-if="metadatum.required == 'yes'"
                                         class="required-metadatum-asterisk">*</span>
-                                <span class="metadata-type">({{ $i18n.get(metadatum.metadata_type_object.component) }})</span>
+                                <span class="metadata-type">({{ metadatum.metadata_type_object.metadata }})</span>
                                 <help-button 
                                         :title="metadatum.name"
                                         :message="metadatum.description"/>
@@ -132,8 +132,6 @@
                                             :metadatum="{ metadatum: metadatum }"
                                             :value="itemMetadata[index].value"
                                             @input="clearErrorMessage(metadatum.id); bulkEdit($event, metadatum)"/>
-                                            <!-- :class="{'is-field-history': bulkEditionProcedures[criterion].isDone}"
-                                            :disabled="bulkEditionProcedures[criterion].isDone || bulkEditionProcedures[criterion].isExecuting" -->
                                 </div>
                             </transition>
                         </b-field>
diff --git a/src/admin/components/edition/metadatum-edition-form.vue b/src/admin/components/edition/metadatum-edition-form.vue
index 217194366..2c7eeb39e 100644
--- a/src/admin/components/edition/metadatum-edition-form.vue
+++ b/src/admin/components/edition/metadatum-edition-form.vue
@@ -150,7 +150,7 @@
             </b-field>
 
             <b-field :addons="false">
-                <label class="label is-inline-block">{{ $i18n.get('label_options') }}</label>
+                <label class="label is-inline-block">{{ $i18n.get('label_insert_options') }}</label>
                 <b-field
                         :type="formErrors['required'] != undefined ? 'is-danger' : ''"
                         :message="formErrors['required'] != undefined ? formErrors['required'] : ''">
diff --git a/src/admin/components/edition/term-edition-form.vue b/src/admin/components/edition/term-edition-form.vue
index 60675b3bc..1b6b568e7 100644
--- a/src/admin/components/edition/term-edition-form.vue
+++ b/src/admin/components/edition/term-edition-form.vue
@@ -5,6 +5,15 @@
             @submit.prevent="saveEdition(editForm)">
         <div class="tainacan-page-title">
             <h2>{{ $i18n.get("title_term_edition") }}</h2>
+            <a
+                    v-if="editForm && editForm.url != undefined && editForm.url!= ''"
+                    target="_blank"
+                    :href="editForm.url">
+                <span class="icon">
+                    <i class="tainacan-icon tainacan-icon-20px tainacan-icon-see"/>
+                </span>
+                <span class="menu-text">{{ $i18n.get('label_view_on_theme') }}</span>
+            </a>
             <hr>
         </div>
     
@@ -22,7 +31,7 @@
                 <span class="required-term-asterisk">*</span>
                 <help-button
                         :title="$i18n.get('label_name')"
-                        :message="$i18n.get('info_help_term_name')"/>
+                        :message="$i18n.get('info_help_term_name')"/> 
             </label>
             <b-input
                     :placeholder="$i18n.get('label_term_without_name')"
@@ -135,7 +144,7 @@
                         :message="$i18n.get('info_help_parent_term')"/>
             </label>
             <b-autocomplete
-                    id="tainacan-text-cover-page"
+                    id="tainacan-add-parent-field"
                     :placeholder="$i18n.get('instruction_parent_term')"
                     :data="parentTerms"
                     field="name"
@@ -146,7 +155,18 @@
                     @focus="clearErrors('parent');"
                     :disabled="!hasParent">
                 <template slot-scope="props">
-                    {{ props.option.name }}
+                    <div class="media">
+                        <div 
+                                v-if="props.option.header_image"
+                                class="media-left">
+                            <img 
+                                    width="28"
+                                    :src="props.option.header_image">
+                        </div>
+                        <div class="media-content">
+                            {{ props.option.name }}
+                        </div>
+                    </div>
                 </template>
                 <template slot="empty">{{ $i18n.get('info_no_parent_term_found') }}</template>
             </b-autocomplete>
@@ -181,16 +201,6 @@
                     {{ $i18n.get('cancel') }}
                 </button>
             </div>
-            <div class="control">
-                <a
-                        type="button"
-                        v-if="editForm.url != undefined && editForm.url!= ''"
-                        class="button is-secondary"
-                        target="_blank"
-                        :href="editForm.url">
-                    {{ $i18n.get('label_view_term') }}
-                </a>
-            </div>
             <div class="control">
                 <button
                         class="button is-success"
@@ -443,16 +453,21 @@
         animation-duration: 0.5s;
 
         .tainacan-page-title {
-            margin-bottom: 35px;
+            margin-bottom: 30px;
+            display: flex;
+            flex-wrap: wrap;
+            align-items: baseline;
 
             h2 {
                 font-size: 20px;
                 font-weight: 500;
                 color: $blue5;
                 display: inline-block;
+                margin-right: auto;
             }
-            hr{
+            hr {
                 margin: 3px 0px 4px 0px; 
+                width: 100%;
                 height: 1px;
                 background-color: $secondary;
             }
diff --git a/src/admin/components/lists/filters-list.vue b/src/admin/components/lists/filters-list.vue
index 5d4b5bb2b..e8585add0 100644
--- a/src/admin/components/lists/filters-list.vue
+++ b/src/admin/components/lists/filters-list.vue
@@ -96,7 +96,7 @@
                             <span   
                                 v-if="filter.filter_type_object != undefined"
                                 class="label-details">  
-                                ({{ $i18n.get(filter.filter_type_object.component) }})  
+                                ({{ filter.filter_type_object.name }})  
                                     <span 
                                             class="not-saved" 
                                             v-if="(editForms[filter.id] != undefined && editForms[filter.id].saved != true) ||filter.status == 'auto-draft'"> 
@@ -235,7 +235,9 @@
                 ref="filterTypeModal"
                 :width="680"
                 :active.sync="isSelectingFilterType"
-                trap-focus>
+                trap-focus
+                aria-modal
+                aria-role="dialog">
             <div 
                     autofocus
                     role="dialog"
@@ -1172,6 +1174,10 @@ export default {
                     font-size: 1rem;
                     margin-left: -16px;
                 }
+                
+                .field .collapse-handle {
+                    display: flex;
+                }
 
                 input, select, textarea, 
                 .input, .tags, .tag  {
diff --git a/src/admin/components/lists/metadata-list.vue b/src/admin/components/lists/metadata-list.vue
index 898f5a332..dac1be525 100644
--- a/src/admin/components/lists/metadata-list.vue
+++ b/src/admin/components/lists/metadata-list.vue
@@ -98,19 +98,17 @@
                                             {{ metadatum.name }}
                                     </span>
                                     <span   
-                                            v-if="metadatum.id != undefined"
+                                            v-if="metadatum.id != undefined && metadatum.metadata_type_object"
                                             class="label-details">  
-                                        ({{ $i18n.get(metadatum.metadata_type_object.component) }}) 
+                                        ({{ metadatum.metadata_type_object.name }}) 
                                         <em v-if="metadatum.collection_id != collectionId">{{ $i18n.get('label_inherited') }}</em>
                                         <em 
-                                                v-if="metadatum.metadata_type_object && 
-                                                    metadatum.metadata_type_object.core && 
+                                                v-if="metadatum.metadata_type_object.core && 
                                                     metadatum.metadata_type_object.related_mapped_prop == 'title'">
                                                 {{ $i18n.get('label_core_title') }}
                                         </em>
                                         <em 
-                                                v-if="metadatum.metadata_type_object && 
-                                                    metadatum.metadata_type_object.core && 
+                                                v-if="metadatum.metadata_type_object.core && 
                                                     metadatum.metadata_type_object.related_mapped_prop == 'description'">
                                                 {{ $i18n.get('label_core_description') }}
                                         </em>
@@ -235,7 +233,7 @@
                 </div>
             </b-tab-item>
 
-            <!-- Exposer --------------- -->
+            <!-- Mapping --------------- -->
             <b-tab-item :label="$i18n.get('mapping')">
                 <div>
                     <section 
@@ -247,11 +245,10 @@
                                     <i class="tainacan-icon tainacan-icon-36px tainacan-icon-metadata"/>
                                 </span>
                             </p>
-                            <p>{{ $i18n.get('info_there_is_no_metadatum') }}</p>  
-                            <p>{{ $i18n.get('info_create_metadata') }}</p>
+                            <p>{{ $i18n.get('info_there_is_no_metadatum') }}</p>
                         </div>
                     </section>
-                    <section>
+                    <section v-else>
                         <div class="field is-grouped form-submit">
                             <b-select
                                     id="mappers-options-dropdown"
@@ -373,7 +370,9 @@
                         <b-modal
                                 @close="onCancelNewMetadataMapperMetadata"
                                 :active.sync="isMapperMetadataCreating"
-                                trap-focus>
+                                trap-focus
+                                aria-modal
+                                aria-role="dialog">
                             <div 
                                     autofocus
                                     role="dialog"
diff --git a/src/admin/components/other/activity-details-modal.vue b/src/admin/components/other/activity-details-modal.vue
index d0d8aeb52..b9e624167 100644
--- a/src/admin/components/other/activity-details-modal.vue
+++ b/src/admin/components/other/activity-details-modal.vue
@@ -477,7 +477,7 @@
                                     v-for="(attributeValue, attributeName, index) in activity.new_value">
                                 <p class="is-capitalized has-text-blue5 has-text-weight-bold">
                                     {{ attributeName }}
-                                    <small class="has-text-gray4 has-text-weight-normal"> {{ `(${$i18n.get('info_logs_before')})` }}</small>
+                                    <small class="has-text-gray4 has-text-weight-normal"> {{ `(${$i18n.get('info_logs_after')})` }}</small>
                                 </p>
 
                                 <div class="content">
diff --git a/src/admin/components/other/checkbox-radio-modal.vue b/src/admin/components/other/checkbox-radio-modal.vue
index 33fc82151..2ed103415 100644
--- a/src/admin/components/other/checkbox-radio-modal.vue
+++ b/src/admin/components/other/checkbox-radio-modal.vue
@@ -363,35 +363,35 @@
                 let selected = this.selected instanceof Array ? this.selected : [this.selected];
 
                 if (this.taxonomy_id && selected.length) {
-                    for (const term of selected) {
 
-                        this.isSelectedTermsLoading = true;
+                    this.isSelectedTermsLoading = true;
 
-                        axios.get(`/taxonomy/${this.taxonomy_id}/terms/${term}`)
-                            .then((res) => {
-                                this.saveSelectedTagName(res.data.id, res.data.name);
-                                this.isSelectedTermsLoading = false;
-                            })
-                            .catch((error) => {
-                                this.$console.log(error);
-                                this.isSelectedTermsLoading = false;
-                            });
-                    }
+                    axios.get(`/taxonomy/${this.taxonomy_id}/terms/?${qs.stringify({ hideempty: 0, include: selected})}`)
+                        .then((res) => {
+                            for (const term of res.data)
+                                this.saveSelectedTagName(term.id, term.name);
+
+                            this.isSelectedTermsLoading = false;
+                        })
+                        .catch((error) => {
+                            this.$console.log(error);
+                            this.isSelectedTermsLoading = false;
+                        });
+                    
                 } else if (this.metadatum_type === 'Tainacan\\Metadata_Types\\Relationship' && selected.length) {
                     this.isSelectedTermsLoading = true;
 
-                    for (const item of selected) {
+                    axios.get(`/items/?${qs.stringify({ fetch_only: 'title', postin: selected})}`)
+                        .then((res) => {
+                            for (const item of res.data)
+                                this.saveSelectedTagName(item.id, item.title);
 
-                        axios.get('/items/' + item + '?fetch_only=title')
-                            .then((res) => {
-                                this.saveSelectedTagName(res.data.id, res.data.title);
-                                this.isSelectedTermsLoading = false;
-                            })
-                            .catch((error) => {
-                                this.$console.log(error);
-                                this.isSelectedTermsLoading = false;
-                            });
-                    }
+                            this.isSelectedTermsLoading = false;
+                        })
+                        .catch((error) => {
+                            this.$console.log(error);
+                            this.isSelectedTermsLoading = false;
+                        });
                 }
             },
             saveSelectedTagName(value, label){
diff --git a/src/admin/components/other/collections-modal.vue b/src/admin/components/other/collections-modal.vue
index 39e38aa5f..665de1135 100644
--- a/src/admin/components/other/collections-modal.vue
+++ b/src/admin/components/other/collections-modal.vue
@@ -25,14 +25,20 @@
                             :key="index"
                             @click="onSelectCollection(collection)">
                         <h4>{{ collection.name }}</h4>
-                        <p>{{ collection.length > 200 ? (collection.description.substring(0,197) + '...') : collection.description }}</p>            
+                        <p>{{ collection.description.length > 200 ? (collection.description.substring(0,197) + '...') : collection.description }}</p>            
                     </div>
-
-                     <b-loading 
+                    <div 
+                            v-if="collections.length <= 0"
+                            class="block">
+                        <p class="has-text-gray">
+                            {{ $i18n.get('info_no_collection_created') }}
+                        </p>
+                    </div>
+                </div>
+                <b-loading 
                         :is-full-page="false"
                         :active.sync="isLoading" 
                         :can-cancel="false"/>
-                </div>
                 
                  <footer class="field is-grouped form-submit">
                     <div class="control">
diff --git a/src/admin/components/other/document-item.vue b/src/admin/components/other/document-item.vue
index 38790c0ec..03d0acca0 100644
--- a/src/admin/components/other/document-item.vue
+++ b/src/admin/components/other/document-item.vue
@@ -12,7 +12,9 @@
         <b-modal
                 :active.sync="isPreviewModalActive"
                 scroll="keep"
-                trap-focus>
+                trap-focus
+                aria-modal
+                aria-role="dialog">
             <!-- <div class="tainacan-modal-content">
                 <div class="tainacan-modal-title">
                     <h2>{{ $i18n.get('label_document') }}</h2>
diff --git a/src/admin/components/other/file-item.vue b/src/admin/components/other/file-item.vue
index 0613f9bc9..6ecb7f186 100644
--- a/src/admin/components/other/file-item.vue
+++ b/src/admin/components/other/file-item.vue
@@ -33,7 +33,9 @@
                     :active.sync="isPreviewModalActive"
                     :width="1024"
                     scroll="keep"
-                    trap-focus>
+                    trap-focus
+                    aria-modal
+                    aria-role="dialog">
                 <div 
                         autofocus
                         role="dialog"
@@ -85,13 +87,12 @@ export default {
         getIconForMimeType(mimeType) {
 
             let type = mimeType.split('/');
-            
             if (type[0] == 'application' && type[1] != undefined){
                 switch (type[1]) {
                     case 'pdf':
                         return 'pdf';
                     default:
-                        return '';
+                        return 'attachments';
                 }
             } else {
                 switch (type[0]) {
@@ -102,7 +103,7 @@ export default {
                     case 'text':
                         return 'text';
                     default:
-                        return '';
+                        return 'attachments';
                 }
             }
         }
diff --git a/src/admin/components/repository/collection-filter/collection-filter.vue b/src/admin/components/repository/collection-filter/collection-filter.vue
index c7adb3773..cabaa6080 100644
--- a/src/admin/components/repository/collection-filter/collection-filter.vue
+++ b/src/admin/components/repository/collection-filter/collection-filter.vue
@@ -18,6 +18,7 @@
             </label>
 
             <div
+                    v-if="collections && collections.length"
                     class="block">
                 <div
                         v-for="(collection, key) in collections"
@@ -31,6 +32,13 @@
                     </b-checkbox>
                 </div>
             </div>
+            <div 
+                    v-else
+                    class="block">
+                <p class="has-text-gray">
+                    {{ $i18n.get('info_no_collection_created') }}
+                </p>
+            </div>
         </b-collapse>
     </b-field>
 </template>
diff --git a/src/admin/js/main.js b/src/admin/js/main.js
index 54eae30ef..a40fd4ed1 100644
--- a/src/admin/js/main.js
+++ b/src/admin/js/main.js
@@ -22,8 +22,8 @@ import Taxonomy from '../../classes/metadata-types/taxonomy/Taxonomy.vue';
 import FormRelationship from '../../classes/metadata-types/relationship/FormRelationship.vue';
 import FormTaxonomy from '../../classes/metadata-types/taxonomy/FormTaxonomy.vue';
 import FormSelectbox from '../../classes/metadata-types/selectbox/FormSelectbox.vue';
+import FormNumeric from '../../classes/metadata-types/numeric/FormNumeric.vue';
 
-import FilterCustomInterval from '../../classes/filter-types/custom-interval/CustomInterval.vue';
 import FilterNumeric from '../../classes/filter-types/numeric/Numeric.vue';
 import FilterDate from '../../classes/filter-types/date/Date.vue';
 import FilterSelectbox from '../../classes/filter-types/selectbox/Selectbox.vue';
@@ -32,12 +32,13 @@ import FilterCheckbox from '../../classes/filter-types/checkbox/Checkbox.vue';
 import FilterTaginput from '../../classes/filter-types/taginput/Taginput.vue';
 import FilterNumericInterval from '../../classes/filter-types/numeric-interval/NumericInterval.vue';
 import FilterDateInterval from '../../classes/filter-types/date-interval/DateInterval.vue';
-
+import FilterNumericListInterval from '../../classes/filter-types/numeric-list-interval/NumericListInterval.vue';
 import FilterTaxonomyCheckbox from '../../classes/filter-types/taxonomy/Checkbox.vue';
 import FilterTaxonomyTaginput from '../../classes/filter-types/taxonomy/Taginput.vue';
 
-import FormNumeric from '../../classes/filter-types/numeric/FormNumeric.vue';
-import FormNumericInterval from '../../classes/filter-types/numeric-interval/FormNumericInterval.vue';
+import FormFilterNumeric from '../../classes/filter-types/numeric/FormNumeric.vue';
+import FormFilterNumericInterval from '../../classes/filter-types/numeric-interval/FormNumericInterval.vue';
+import FormFilterNumericListInterval from '../../classes/filter-types/numeric-list-interval/FormNumericListInterval.vue';
 // import FormDate from '../../classes/filter-types/date/FormDate.vue';
 
 import TainacanFormItem from '../../classes/metadata-types/tainacan-form-item.vue';
@@ -53,13 +54,9 @@ import eventBusSearch from '../../js/event-bus-search';
 import termsListBus from './terms-list-bus.js';
 import { I18NPlugin, UserPrefsPlugin, RouterHelperPlugin, ConsolePlugin, UserCapabilitiesPlugin, StatusHelperPlugin } from './utilities';
 
-import FilterNumericListInterval from '../../classes/filter-types/numeric-list-interval/NumericListInterval.vue';
-import FormNumericListInterval from '../../classes/filter-types/numeric-list-interval/FormNumericListInterval.vue';
-
-
 // Configure and Register Plugins
 Vue.use(Buefy, {
-    defaultTooltipAnimated: true   
+    defaultTooltipAnimated: true
 });
 Vue.use(VTooltip);
 Vue.use(VueMasonry);
@@ -79,15 +76,16 @@ Vue.component('tainacan-numeric', Numeric);
 Vue.component('tainacan-date', Date);
 Vue.component('tainacan-relationship', Relationship);
 Vue.component('tainacan-taxonomy', Taxonomy);
+
 /* Metadata Option forms */
 Vue.component('tainacan-form-relationship', FormRelationship);
 Vue.component('tainacan-form-taxonomy', FormTaxonomy);
 Vue.component('tainacan-form-selectbox', FormSelectbox);
+Vue.component('tainacan-form-numeric', FormNumeric);
 Vue.component('tainacan-form-item', TainacanFormItem);
 Vue.component('tainacan-filter-item', TainacanFiltersList);
 
 /* Filters */
-Vue.component('tainacan-filter-custom-interval', FilterCustomInterval);
 Vue.component('tainacan-filter-numeric', FilterNumeric);
 Vue.component('tainacan-filter-date', FilterDate);
 Vue.component('tainacan-filter-selectbox', FilterSelectbox);
@@ -101,9 +99,9 @@ Vue.component('tainacan-filter-numeric-list-interval', FilterNumericListInterval
 Vue.component('tainacan-filter-date-interval', FilterDateInterval);
 
 /* Filter Metadata Option forms */
-Vue.component('tainacan-filter-form-numeric', FormNumeric);
-Vue.component('tainacan-filter-form-numeric-interval', FormNumericInterval);
-Vue.component('tainacan-filter-form-numeric-list-interval', FormNumericListInterval);
+Vue.component('tainacan-filter-form-numeric', FormFilterNumeric);
+Vue.component('tainacan-filter-form-numeric-interval', FormFilterNumericInterval);
+Vue.component('tainacan-filter-form-numeric-list-interval', FormFilterNumericListInterval);
 // Vue.component('tainacan-filter-form-date', FormDate);
 
 /* Others */
@@ -128,7 +126,7 @@ new Vue({
     render: h => h(AdminPage)
 });
 
-// Display Icons only once everything is loaded 
+// Display Icons only once everything is loaded
 function listen(evnt, elem, func) {
     if (elem.addEventListener)  // W3C DOM
         elem.addEventListener(evnt,func,false);
diff --git a/src/admin/js/theme-main.js b/src/admin/js/theme-main.js
index 2dfb8b9c7..92841fa21 100644
--- a/src/admin/js/theme-main.js
+++ b/src/admin/js/theme-main.js
@@ -5,7 +5,6 @@ import VTooltip from 'v-tooltip';
 import VueMasonry from 'vue-masonry-css';
 
 // Custom elements
-import FilterCustomInterval from '../../classes/filter-types/custom-interval/CustomInterval.vue';
 import FilterNumeric from '../../classes/filter-types/numeric/Numeric.vue';
 import FilterDate from '../../classes/filter-types/date/Date.vue';
 import FilterSelectbox from '../../classes/filter-types/selectbox/Selectbox.vue';
@@ -34,7 +33,7 @@ import { I18NPlugin, UserPrefsPlugin, RouterHelperPlugin, ConsolePlugin, StatusH
 
 // Configure and Register Plugins
 Vue.use(Buefy, {
-    defaultTooltipAnimated: true   
+    defaultTooltipAnimated: true
 });
 Vue.use(VTooltip);
 Vue.use(VueMasonry);
@@ -44,11 +43,9 @@ Vue.use(RouterHelperPlugin);
 Vue.use(StatusHelperPlugin);
 Vue.use(ConsolePlugin, {visual: false});
 
-
 Vue.component('tainacan-filter-item', TaincanFiltersList);
 
 /* Filters */
-Vue.component('tainacan-filter-custom-interval', FilterCustomInterval);
 Vue.component('tainacan-filter-numeric', FilterNumeric);
 Vue.component('tainacan-filter-date', FilterDate);
 Vue.component('tainacan-filter-selectbox', FilterSelectbox);
@@ -79,7 +76,7 @@ import ThemeItemsList from '../theme-items-list.vue';
 export const ThemeItemsListing =  new Vue({
     el: '#tainacan-items-page',
     store,
-    router: routerTheme, 
+    router: routerTheme,
     data: {
         termId: '',
         taxonomy: '',
@@ -90,9 +87,9 @@ export const ThemeItemsListing =  new Vue({
     },
     render: h => h(ThemeItemsList),
     beforeMount () {
-        
+
         this.collectionId = this.$el.attributes['collection-id'] != undefined ? this.$el.attributes['collection-id'].value : undefined;
-        
+
         if (this.$el.attributes['default-view-mode'] != undefined)
             this.defaultViewMode = this.$el.attributes['default-view-mode'].value;
         else
@@ -107,10 +104,10 @@ export const ThemeItemsListing =  new Vue({
             this.taxonomy = this.$el.attributes['taxonomy'].value;
 
     }
-    
+
 });
 
-// Display Icons only once everything is loaded 
+// Display Icons only once everything is loaded
 function listen(evnt, elem, func) {
     if (elem.addEventListener)  // W3C DOM
         elem.addEventListener(evnt,func,false);
diff --git a/src/admin/pages/home-page.vue b/src/admin/pages/home-page.vue
index 98314670d..a1d43d274 100644
--- a/src/admin/pages/home-page.vue
+++ b/src/admin/pages/home-page.vue
@@ -140,7 +140,7 @@
                     {{ $i18n.getWithVariables('label_view_all_%s_collections', [collectionsTotal]) }}
                 </span>
                 <span
-                        v-if="collectionsTotal != undefined && collectionsTotal == 1"
+                        v-if="collectionsTotal != undefined && collectionsTotal <= 1"
                         class="menu-text">
                     {{ $i18n.get('label_view_collections_list') }}
                 </span>
diff --git a/src/admin/pages/lists/activities-page.vue b/src/admin/pages/lists/activities-page.vue
index f893e1675..bffbd1b33 100644
--- a/src/admin/pages/lists/activities-page.vue
+++ b/src/admin/pages/lists/activities-page.vue
@@ -43,6 +43,7 @@
                                 :date-parser="(date) => dateParser(date)"
                                 size="is-small"
                                 icon="calendar-today"
+                                :years-range="[-50, 3]"
                                 :day-names="[
                                     $i18n.get('datepicker_short_sunday'),
                                     $i18n.get('datepicker_short_monday'),
@@ -77,6 +78,40 @@
                         </p>
                     </b-field>
 
+                    <b-field 
+                            style="margin-left: auto"
+                            class="header-item">
+                        <div class="control has-icons-right  is-small is-clearfix">
+                            <b-autocomplete
+                                    :data="users"
+                                    :placeholder="$i18n.get('instruction_type_search_users_filter')"
+                                    keep-first
+                                    open-on-focus
+                                    @input="fetchUsersForFiltering"
+                                    @focus.once="($event) => fetchUsersForFiltering($event.target.value)"
+                                    @select="filterActivitiesByUser"
+                                    :loading="isFetchingUsers"
+                                    field="name"
+                                    icon="account">
+                                <template slot-scope="props">
+                                    <div class="media">
+                                        <div
+                                                v-if="props.option.avatar_urls && props.option.avatar_urls['24']"
+                                                class="media-left">
+                                            <img
+                                                    width="24"
+                                                    :src="props.option.avatar_urls['24']">
+                                        </div>
+                                        <div class="media-content">
+                                            {{ props.option.name }}
+                                        </div>
+                                    </div>
+                                </template>
+                            <template slot="empty">{{ $i18n.get('info_no_user_found') }}</template>
+                            </b-autocomplete>
+                        </div>
+                    </b-field>
+
                     <b-field class="header-item">
                         <div class="control has-icons-right  is-small is-clearfix">
                             <input
@@ -236,7 +271,10 @@
                 tab: '',
                 isItemLevel: false,
                 searchQuery: '',
-                searchDates: []
+                searchDates: [],
+                users: [],
+                isFetchingUsers: false,
+                userIdForFiltering: null
             }
         },
         components: {
@@ -247,7 +285,8 @@
             ...mapActions('activity', [
                 'fetchActivities',
                 'fetchCollectionActivities',
-                'fetchItemActivities'
+                'fetchItemActivities',
+                'fetchUsers'
             ]),
             ...mapGetters('activity', [
                 'getActivities'
@@ -314,10 +353,11 @@
 
                 if(this.isRepositoryLevel) {
                     this.fetchActivities({
-                        'page': this.activitiesPage,
-                        'activitiesPerPage': this.activitiesPerPage,
-                        'search': this.searchQuery,
-                        'searchDates': [dataInit, dataEnd]
+                        page: this.activitiesPage,
+                        activitiesPerPage: this.activitiesPerPage,
+                        search: this.searchQuery,
+                        searchDates: [dataInit, dataEnd],
+                        authorId: this.userIdForFiltering
                     })
                         .then((res) => {
                             this.isLoading = false;
@@ -328,11 +368,12 @@
                         });
                 } else if (!this.isRepositoryLevel && !this.isItemLevel) {
                     this.fetchCollectionActivities({
-                        'page': this.activitiesPage,
-                        'activitiesPerPage': this.activitiesPerPage,
-                        'collectionId': this.$route.params.collectionId,
-                        'search': this.searchQuery,
-                        'searchDates': [dataInit, dataEnd]
+                        page: this.activitiesPage,
+                        activitiesPerPage: this.activitiesPerPage,
+                        collectionId: this.$route.params.collectionId,
+                        search: this.searchQuery,
+                        searchDates: [dataInit, dataEnd],
+                        authorId: this.userIdForFiltering
                     })
                         .then((res) => {
                             this.isLoading = false;
@@ -343,11 +384,12 @@
                         });
                 } else {
                     this.fetchItemActivities({
-                        'page': this.activitiesPage,
-                        'activitiesPerPage': this.activitiesPerPage,
-                        'itemId': this.$route.params.itemId,
-                        'search': this.searchQuery,
-                        'searchDates': [dataInit, dataEnd]
+                        page: this.activitiesPage,
+                        activitiesPerPage: this.activitiesPerPage,
+                        itemId: this.$route.params.itemId,
+                        search: this.searchQuery,
+                        searchDates: [dataInit, dataEnd],
+                        authorId: this.userIdForFiltering
                     })
                         .then((res) => {
                             this.isLoading = false;
@@ -390,6 +432,10 @@
                 this.searchDates = null;
                 this.searchActivities();
             },
+            filterActivitiesByUser(user) {
+                this.userIdForFiltering = user != null && user.id != undefined ? user.id : null;
+                this.loadActivities();
+            },
             dateFormatter(dateObject) {
                 if (dateObject == null || dateObject.length == 0 || dateObject[0] == null || dateObject[1] == null)
                     return "";
@@ -400,7 +446,21 @@
                     moment(dateString[0], this.dateFormat).toDate(),
                     moment(dateString[1], this.dateFormat).toDate()
                 ];
-            }
+            },
+            fetchUsersForFiltering: _.debounce(function (search) {
+
+                this.isFetchingUsers = true;
+
+                this.fetchUsers({ search: search })
+                    .then((users) => {
+                        this.users = users;
+                        this.isFetchingUsers = false;
+                    })
+                    .catch((error) => {
+                        this.$console.error(error);
+                        this.isFetchingPages = false;
+                    });
+            }, 500)
         },
         computed: {
             activities(){
@@ -485,7 +545,7 @@
             .button {
                 display: flex;
                 align-items: center;
-                border-radius: 0 !important;
+                border-radius: 0px !important;
                 height: 1.95rem !important;
             }
             
diff --git a/src/admin/pages/lists/items-page.vue b/src/admin/pages/lists/items-page.vue
index e85c9dced..0a0459615 100644
--- a/src/admin/pages/lists/items-page.vue
+++ b/src/admin/pages/lists/items-page.vue
@@ -791,13 +791,20 @@
                         </p>
 
                         <router-link
-                                v-if="!isSortingByCustomMetadata && !hasFiltered && (status == undefined || status == '') && !$route.query.iframemode"
+                                v-if="!isRepositoryLevel && !isSortingByCustomMetadata && !hasFiltered && (status == undefined || status == '') && !$route.query.iframemode"
                                 id="button-create-item"
                                 tag="button"
                                 class="button is-secondary"
                                 :to="{ path: $routerHelper.getNewItemPath(collectionId) }">
                             {{ $i18n.getFrom('items', 'add_new') }}
                         </router-link> 
+                        <button
+                                v-else-if="isRepositoryLevel && !isSortingByCustomMetadata && !hasFiltered && (status == undefined || status == '') && !$route.query.iframemode"
+                                id="button-create-item"
+                                class="button is-secondary"
+                                @click="onOpenCollectionsModal">
+                            {{ $i18n.get('add_one_item') }}
+                        </button>
                     </div>
                 </section>
 
@@ -818,7 +825,9 @@
                 :active.sync="isFilterModalActive"
                 :width="736"
                 animation="slide-menu"
-                trap-focus>
+                trap-focus
+                aria-modal
+                aria-role="dialog">
             <div 
                     ref="filters-mobile-modal"
                     class="modal-inner-content"
diff --git a/src/admin/pages/lists/term-items-page.vue b/src/admin/pages/lists/term-items-page.vue
index 3e754121b..79a109345 100644
--- a/src/admin/pages/lists/term-items-page.vue
+++ b/src/admin/pages/lists/term-items-page.vue
@@ -796,7 +796,9 @@
                 :active.sync="isFilterModalActive"
                 :width="736"
                 animation="slide-menu"
-                trap-focus>
+                trap-focus
+                aria-modal
+                aria-role="dialog">
             <div
                     autofocus="true"
                     tabindex="-1"
diff --git a/src/admin/scss/_dropdown-and-autocomplete.scss b/src/admin/scss/_dropdown-and-autocomplete.scss
index 271f81387..407dde574 100644
--- a/src/admin/scss/_dropdown-and-autocomplete.scss
+++ b/src/admin/scss/_dropdown-and-autocomplete.scss
@@ -20,12 +20,17 @@
             cursor: default;
         }
     }
+    &>.control.has-icons-left .icon {
+        height: 2.125rem;
+        width: 2.125rem;
+    }
     .dropdown-menu {
         padding: 0px;
         margin-top: 0;
         border-radius: 0px;
         min-width: 6rem;
         border: none;
+        z-index: 99;
         
         .dropdown-content {
             padding: 0px;
@@ -50,25 +55,29 @@
                 .is-small { color: $gray4; }
                 &.is-active { background-color: $turquoise2; }
 
-                .media-left {
-                    margin-right: 0.5rem;
-                }
-                .media-content {
-                    display: flex;
-                    width: 80%;
+                .media {
+                    align-items: center;
+                
+                    .media-left {
+                        margin-right: 0.5rem;
+                    }
+                    .media-content {
+                        display: flex;
+                        width: 80%;
 
-                    .ellipsed-text {
-                        overflow-x: hidden;
-                        text-overflow: ellipsis;
-                        white-space: nowrap;
-                        margin-right: 3px;
+                        .ellipsed-text {
+                            overflow-x: hidden;
+                            text-overflow: ellipsis;
+                            white-space: nowrap;
+                            margin-right: 3px;
+                        }
                     }
                 }
             }
         } 
     }
     &.is-mobile-modal {
-        @media screen and (max-width: 1088px) {
+        @media screen and (max-width: 768px) {
             .dropdown-content {
                 max-height: 100vh;
             }
@@ -130,16 +139,16 @@
     .tag {
         background: white;
         padding-right: 0;
-        padding-left: 0.5em;
+        padding-left: 0.6em;
 
         &.is-delete {
             color: $gray4;
             &::after {
-                height: 30% !important;
+                height: 47% !important;
                 width: 1px !important;
             } 
             &::before {
-                width: 30% !important;
+                width: 47% !important;
                 height: 1px !important;
             } 
             &:hover, &:focus {
@@ -278,7 +287,7 @@
         }
     }
 
-    @media screen and (min-width: 1024px) {
+    @media screen and (min-width: 768px) {
 
         .datepicker-header {
             margin-bottom: 0.5rem;
diff --git a/src/admin/scss/_inputs.scss b/src/admin/scss/_inputs.scss
index ee2749724..c2cba47bc 100644
--- a/src/admin/scss/_inputs.scss
+++ b/src/admin/scss/_inputs.scss
@@ -1,17 +1,37 @@
-.input, .textarea {
+input[type="color"].input,
+input[type="date"].input,
+input[type="datetime-local"].input,
+input[type="datetime"].input,
+input[type="email"].input,
+input[type="number"].input,
+input[type="month"].input,
+input[type="password"].input,
+input[type="search"].input,
+input[type="tel"].input,
+input[type="text"].input,
+input[type="time"].input,
+input[type="url"].input,
+input[type="week"].input,
+input.input,
+.input,
+textarea.textarea, 
+.textarea {
     font-size: 0.875rem;
     border-radius: 1px !important;
     box-shadow: none !important;
     background-color: white;
     border: 1px solid $gray2;
     color: $tainacan-input-color;
-    transition: background-color 0.1s, border 0.3s;
+    transition: background-color 0.1s ease, border-color 0.3s ease;
 
     &:focus, &:active {
         box-shadow: none !important;
         background-color: white;
         border: 1px solid $gray4 !important;
     }  
+    &:hover {
+        border: 1px solid $gray3;
+    }  
     &[disabled] {
         color: $gray4 !important;
         background-color: $gray2 !important;
diff --git a/src/admin/scss/_selects.scss b/src/admin/scss/_selects.scss
index 7435d52b2..7990e480b 100644
--- a/src/admin/scss/_selects.scss
+++ b/src/admin/scss/_selects.scss
@@ -6,6 +6,7 @@
         height: 30px;
     }
     select {
+        background: transparent; // WordPress 5.3 adds arrows here
         border: none;
         border-radius: 1px !important;
         font-weight: normal;
@@ -16,14 +17,14 @@
         margin-bottom: 0px !important;
         color: $tainacan-input-color;
         option:checked, option:hover {
-            background-color: $gray2 !important;
+            background: $gray2 !important;
         }
         &:focus, &:active {
             box-shadow: none !important;
             text-decoration: none !important;
         }
         &[disabled=disabled] {
-            background-color: white !important;
+            background: $gray1 !important;
         }
     }
     &:not(.is-loading)::after {
diff --git a/src/admin/scss/_tags.scss b/src/admin/scss/_tags.scss
index 022c0d4ba..0a1b5e0ca 100644
--- a/src/admin/scss/_tags.scss
+++ b/src/admin/scss/_tags.scss
@@ -6,12 +6,9 @@
     margin-right: 0.375rem;
     max-width: 100%;
     overflow: hidden;
+    transition: all 0.2s ease;
     animation-name: appear;
-    animation-duration: 0.2s;
-
-    &:hover, &:hover .tag {
-        background-color: $gray2;
-    }
+    animation-duration: 0.3s;
 
     .tag {
         background-color: white;
@@ -22,6 +19,8 @@
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;
+        animation-name: appear;
+        animation-duration: 0.3s;
 
         &.is-delete, 
         &.is-delete:hover, 
@@ -29,12 +28,28 @@
         &.is-delete:active {
             border-radius: 50px !important;
             border-radius: 50px !important;
+            margin-right: 0px !important;
             color: $gray4;
-            background-color: transparent;
+            background-color: white;
+            transition: border-width 0.15s linear, background-color 0.15s linear;
 
-            &:hover {
-                background-color: transparent;
-                color: $gray4;
+            &:after,
+            &:before {
+                transition: transform 0.15s linear;
+            }
+
+            &:hover,
+            &:focus {
+                border: solid 1px $gray3 !important;
+                background-color: $gray2;
+                color: $gray5;
+
+                &:after {
+                    transform: translateX(-50%) translateY(-50%) rotate(45deg) scale(1.15);
+                }
+                &:before {
+                    transform: translateX(-50%) translateY(-50%) rotate(45deg) scale(1.15);
+                }
             }
         }
     }
diff --git a/src/admin/scss/_tainacan-form.scss b/src/admin/scss/_tainacan-form.scss
index d111824ef..867415115 100644
--- a/src/admin/scss/_tainacan-form.scss
+++ b/src/admin/scss/_tainacan-form.scss
@@ -51,6 +51,7 @@
     }
     .b-numberinput {
         height: 30px;
+        padding: 0 !important;
         
         .control {
             margin-right: 0 !important;
@@ -62,6 +63,7 @@
         button, 
         input {
             height: 30px !important;
+            text-align: start;
         }
         button.is-primary,
         button.is-primary:hover,
diff --git a/src/admin/scss/_variables.scss b/src/admin/scss/_variables.scss
index e9b15d4ac..8fc66c6b6 100644
--- a/src/admin/scss/_variables.scss
+++ b/src/admin/scss/_variables.scss
@@ -111,8 +111,9 @@ $addColors: (
 );
 $colors: map-merge($colors, $addColors);
 
-// Small size
+// Bulma Variables
 $size-small: 0.85em; // 0.75em on Bulma.
+$dropdown-mobile-breakpoint: $tablet;
 
 // Tainacan Header and side menus
 $header-height: 52px;
@@ -120,7 +121,7 @@ $subheader-height: 42px;
 $side-menu-width: 160px;
 $filter-menu-width: 16.666666667%;
 $filter-menu-width-theme: 20.833333333%;
-$page-height: calc(100% - 94px);
+$page-height: calc(100vh - 94px);
 
 // Overall Pages padding:
 $page-side-padding: 4.166666667%;//82px;
@@ -149,11 +150,19 @@ $table-foot-cell-border-width: 1px 0 0 !important;
 $table-cell-padding: 1.0em 0.75em;
 
 // Roboto font
-$family-sans-serif: 'Roboto', sans-serif;
+$family-sans-serif: 'Roboto', 'Source Sans', 'Helvetica', sans-serif;
  
 // Bulma's modal (needs to be greather than tainacan-admin-app)
 $modal-z: 9999999;
 
+// Grid mixin for display: grid compatibility
+@mixin display-grid {
+    flex-wrap: wrap;
+    display: flex;
+    display: -ms-grid;
+    display: grid;
+}
+
 // A copy of bootstrap's screen reader only class to be used for accessibility.
 .sr-only {
     position: absolute;
diff --git a/src/admin/scss/_view-mode-cards.scss b/src/admin/scss/_view-mode-cards.scss
index d6eca1274..c6a221ee8 100644
--- a/src/admin/scss/_view-mode-cards.scss
+++ b/src/admin/scss/_view-mode-cards.scss
@@ -1,8 +1,8 @@
 .tainacan-cards-container {
     min-height: 50vh;
     padding: 0;
-    display: -ms-grid;
-    display: grid;
+    @include display-grid;
+    -ms-grid-columns: 455px 455px;
     grid-template-columns: repeat(auto-fill, 455px);
     grid-gap: 0px;
     justify-content: space-evenly;
@@ -11,6 +11,7 @@
 
     @media screen and (max-width: 480px) {    
         width: 91.666666667%;  
+        -ms-grid-columns: 100%;
         grid-template-columns: repeat(auto-fill, 100%);
     }
 
diff --git a/src/admin/scss/_view-mode-grid.scss b/src/admin/scss/_view-mode-grid.scss
index 086d0a682..8dc5e4f45 100644
--- a/src/admin/scss/_view-mode-grid.scss
+++ b/src/admin/scss/_view-mode-grid.scss
@@ -1,8 +1,7 @@
 .tainacan-grid-container {
     min-height: 50vh;
     padding: 0;
-    display: -ms-grid;
-    display: grid;
+    @include display-grid;
     grid-template-columns: repeat(auto-fill, 285px);
     grid-gap: 0px;
     justify-content: space-evenly;
diff --git a/src/admin/scss/tainacan-admin.scss b/src/admin/scss/tainacan-admin.scss
index a904f487a..fd4588aa1 100644
--- a/src/admin/scss/tainacan-admin.scss
+++ b/src/admin/scss/tainacan-admin.scss
@@ -96,8 +96,10 @@ a:hover {
     text-decoration: underline;
 }
 .add-link {
-    display: inline;
+    display: inline-flex;
+    align-items: center;
     font-size: 0.75rem; 
+    margin: 3px 0 6px 0;
     &.disabled {
         pointer-events: none;
         cursor: default;
@@ -107,6 +109,9 @@ a:hover {
             color: $gray2 !important;
         }
     }
+    .tainacan-icon::before {
+        font-size: 0.875rem;
+    }
 }
 
 // Generic page container
diff --git a/src/admin/scss/theme-basics.sass b/src/admin/scss/theme-basics.sass
index fd30980b6..8692c6049 100644
--- a/src/admin/scss/theme-basics.sass
+++ b/src/admin/scss/theme-basics.sass
@@ -8,4 +8,4 @@
 @import "../../../node_modules/bulma/sass/elements/button.sass"
 @import "../../../node_modules/bulma/sass/grid/columns.sass"
 @import "../../../node_modules/bulma/sass/components/dropdown.sass"
-@import "../../../node_modules/bulma/sass/components/modal.sass"
+@import "../../../node_modules/bulma/sass/components/modal.sass"
\ No newline at end of file
diff --git a/src/admin/tainacan-admin-i18n.php b/src/admin/tainacan-admin-i18n.php
index ba42fd76f..cb6aed248 100644
--- a/src/admin/tainacan-admin-i18n.php
+++ b/src/admin/tainacan-admin-i18n.php
@@ -200,7 +200,9 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'label_select_taxonomy_input_type'               => __( 'Input type', 'tainacan' ),
 	'label_taxonomy_allow_new_terms'                 => __( 'Allow new terms', 'tainacan' ),
 	'label_selectbox_init'                           => __( 'Select', 'tainacan' ),
-	'label_options'                                  => __( 'Insert options', 'tainacan' ),
+	'label_insert_options'                           => __( 'Insert options', 'tainacan'),
+	'label_available_terms'                          => __( 'Available terms', 'tainacan' ),
+	'label_some_available_terms'                     => __( 'Some available terms', 'tainacan' ),
 	'label_attachments'                              => __( 'Attachments', 'tainacan' ),
 	'label_attachment'                               => __( 'Attachment', 'tainacan' ),
 	'label_enabled'                                  => __( 'Enabled', 'tainacan' ),
@@ -213,6 +215,7 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'label_parent_term'                              => __( 'Parent Term', 'tainacan' ),
 	'label_children_terms'                           => __( 'children terms', 'tainacan' ),
 	'label_new_term'                                 => __( 'Create New Term', 'tainacan' ),
+	'label_create_and_select'                        => __( 'Create and Select', 'tainacan' ),
 	'label_new_child'                                => __( 'New Child', 'tainacan' ),
 	'label_taxonomy_terms'                           => __( 'Taxonomy Terms', 'tainacan' ),
 	'label_no_parent_term'                           => __( 'No parent term', 'tainacan' ),
@@ -348,6 +351,7 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'label_show_metadata'                            => __( 'Show metadata', 'tainacan' ),
 	'label_all_terms'                                => __( 'All terms', 'tainacan' ),
 	'label_selected_terms'                           => __( 'Selected terms', 'tainacan' ),
+	'label_selected_term'                           => __( 'Selected term', 'tainacan' ),
 	'label_all_metadatum_values'                     => __( 'All metadatum values', 'tainacan' ),
 	'label_selected_metadatum_values'                => __( 'Selected metadatum values', 'tainacan' ),
 	'label_editing_item_number'                      => __( 'Editing item n.', 'tainacan' ),
@@ -446,11 +450,12 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'instruction_image_upload_box'                   => __( 'Drop an image here or click to upload.', 'tainacan' ),
 	'instruction_select_a_status'                    => __( 'Select a status:', 'tainacan' ),
 	'instruction_select_a_status2'                   => __( 'Select a status', 'tainacan' ),
-	'instruction_click_to_select_a_filter_type'               => __( 'Click to select a filter type:', 'tainacan' ),
+	'instruction_click_to_select_a_filter_type'      => __( 'Click to select a filter type:', 'tainacan' ),
 	'instruction_select_a_parent_term'               => __( 'Select a parent term:', 'tainacan' ),
 	'instruction_select_a_metadatum'                 => __( 'Select a metadatum', 'tainacan' ),
 	'instruction_cover_page'                         => __( 'Type to search a Page to choose.', 'tainacan' ),
 	'instruction_moderators'                         => __( 'Type to search a User to add.', 'tainacan' ),
+	'instruction_type_search_users_filter'           => __( 'Type to search users to filter...', 'tainacan' ),
 	'instruction_select_a_parent_collection'         => __( 'Select a parent collection.', 'tainacan' ),
 	'instruction_select_collection_thumbnail'        => __( 'Select a thumbnail image for collection', 'tainacan' ),
 	'instruction_select_item_thumbnail'              => __( 'Select a thumbnail image for item', 'tainacan' ),
@@ -534,7 +539,7 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'info_no_terms_created_on_taxonomy'              => __( 'No term was created for this taxonomy.', 'tainacan' ),
 	'info_no_terms_found'				 			 => __( 'No term was found here', 'tainacan' ),
 	'info_no_more_terms_found'				 		 => __( 'No more terms found', 'tainacan' ),
-	'info_no_item_created'                           => __( 'No item was created in this collection.', 'tainacan' ),
+	'info_no_item_created'                           => __( 'No item was created so far.', 'tainacan' ),
 	'info_no_page_found'                             => __( 'No page was found with this name.', 'tainacan' ),
 	'info_no_user_found'                             => __( 'No user was found with this name.', 'tainacan' ),
 	'info_no_item_found_filter'                      => __( 'No item was found here with these filters.', 'tainacan' ),
@@ -570,6 +575,7 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'info_showing_taxonomies'                        => __( 'Showing taxonomies ', 'tainacan' ),
 	'info_showing_activities'                        => __( 'Showing activities ', 'tainacan' ),
 	'info_showing_processes'                         => __( 'Showing processes ', 'tainacan' ),
+	'info_showing_terms'                        	 => __( 'Showing terms ', 'tainacan' ),
 	'info_warning_remove_from_trash_first'           => __( 'Remove this item from trash first' ),
 	'info_to'                                        => __( ' to ', 'tainacan' ),
 	'info_of'                                        => __( ' of ', 'tainacan' ),
@@ -584,7 +590,7 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'info_warning_taxonomy_not_saved'                => __( 'Are you sure? The taxonomy is not saved, changes will be lost.', 'tainacan' ),
 	'info_warning_terms_not_saved'                   => __( 'Are you sure? There are terms not saved, changes will be lost.', 'tainacan' ),
 	'info_warning_orphan_terms'                      => __( 'Are you sure? This term is parent of other terms. These will be converted to root terms.', 'tainacan' ),
-	'info_no_activities'                             => __( 'No activities', 'tainacan' ),
+	'info_no_activities'                             => __( 'No activities yet.', 'tainacan' ),
 	'info_logs_before'                               => __( 'Before', 'tainacan' ),
 	'info_logs_after'                                => __( 'After', 'tainacan' ),
 	'info_there_is_no_metadatum'                     => __( 'There is no metadata here yet.', 'tainacan' ),
@@ -669,31 +675,6 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'info_show_interval_on_tag'                      => __( 'Show applied interval on tags', 'tainacan' ),
 	'info_title_mapping'							 => __( 'The title is the most relevant metadata, that shall identify your item on lists for different view modes. Select the title source metadata first, or skip to continue manual mapping.', 'taincan'),
 
-	// Tainacan Metadatum Types
-	'tainacan-text'                                  => __( 'Text', 'tainacan' ),
-	'tainacan-textarea'                              => __( 'Text area', 'tainacan' ),
-	'tainacan-date'                                  => __( 'Date', 'tainacan' ),
-	'tainacan-numeric'                               => __( 'Numeric', 'tainacan' ),
-	'tainacan-selectbox'                             => __( 'Select box', 'tainacan' ),
-	'tainacan-relationship'                          => __( 'Relationship', 'tainacan' ),
-	'tainacan-taxonomy'                              => __( 'Taxonomy', 'tainacan' ),
-	'tainacan-compound'                              => __( 'Compound', 'tainacan' ),
-
-	// Tainacan Filter Types
-	'tainacan-filter-custom-interval'                => __( 'Custom Interval', 'tainacan' ),
-	'tainacan-filter-numeric'		                 => __( 'Numeric', 'tainacan' ),
-	'tainacan-filter-date'			                 => __( 'Date', 'tainacan' ),
-	'tainacan-filter-selectbox'                      => __( 'Select Box', 'tainacan' ),
-	'tainacan-filter-autocomplete'                   => __( 'Autocomplete', 'tainacan' ),
-	'tainacan-filter-taginput'                       => __( 'Tag Input', 'tainacan' ),
-	'tainacan-filter-checkbox'                       => __( 'Check Box', 'tainacan' ),
-	'tainacan-filter-taxonomy-taginput'              => __( 'Taxonomy Tag Input', 'tainacan' ),
-	'tainacan-filter-taxonomy-checkbox'              => __( 'Taxonomy Check Box', 'tainacan' ),
-	'tainacan-filter-taxonomy-selectbox'             => __( 'Taxonomy Select Box', 'tainacan' ),
-	'tainacan-filter-numeric-interval'               => __( 'Numeric Interval', 'tainacan' ),
-	'tainacan-filter-date-interval'               	 => __( 'Date Interval', 'tainacan' ),
-	'tainacan-filter-numeric-list-interval'          => __( 'Numeric Interval List', 'tainacan' ),
-
 	// Datepicker months
 	'datepicker_month_january'			=> __( 'January', 'tainacan' ),
 	'datepicker_month_february'			=> __( 'February', 'tainacan' ),
diff --git a/src/api/class-tainacan-rest-controller.php b/src/api/class-tainacan-rest-controller.php
index fb9087b5d..76cb560c6 100644
--- a/src/api/class-tainacan-rest-controller.php
+++ b/src/api/class-tainacan-rest-controller.php
@@ -66,7 +66,7 @@ class REST_Controller extends \WP_REST_Controller {
 			'name'         => 'title',
 			'title'        => 'title',
 			'id'           => 'p',
-			'authorid'     => 'author_id',
+			'authorid'     => 'author',
 			'authorname'   => 'author_name',
 			'search'       => 's',
 			'searchterm'   => 'search',
@@ -148,37 +148,39 @@ class REST_Controller extends \WP_REST_Controller {
 
 		return apply_filters('tainacan-api-prepare-items-args', $args, $request);
 	}
-	
+
 	public function add_support_to_tax_query_like($args) {
-		
+
 		if (!isset($args['tax_query']) || !is_array($args['tax_query'])) {
 			return $args;
 		}
-		
+
 		$new_tax_query = [];
-		
+
 		foreach ($args['tax_query'] as $index => $tax_query) {
-			
+
 			if ( isset($tax_query['operator']) && $tax_query['operator'] == 'LIKE' &&
 		 		isset($tax_query['terms']) && is_string($tax_query['terms']) ) {
-				
+
 				$terms = get_terms([
 					'taxonomy' => $tax_query['taxonomy'],
 					'fields' => 'ids',
+					'hide_empty' => isset($args['hide_empty']) ? $args['hide_empty'] : true,
 					'search' => $tax_query['terms']
 				]);
-				
+
 				$new_tax_query[] = [
 					'taxonomy' => $tax_query['taxonomy'],
 					'terms' => $terms,
 				];
-				
+
 			} elseif ( isset($tax_query['operator']) && $tax_query['operator'] == 'NOT LIKE' &&
 		 		isset($tax_query['terms']) && is_string($tax_query['terms']) ) {
-				
+
 				$terms = get_terms([
 					'taxonomy' => $tax_query['taxonomy'],
 					'fields' => 'ids',
+					'hide_empty' => isset($args['hide_empty']) ? $args['hide_empty'] : true,
 					'search' => $tax_query['terms']
 				]);
 				if ($terms) {
@@ -188,18 +190,18 @@ class REST_Controller extends \WP_REST_Controller {
 						'operator' => 'NOT IN'
 					];
 				}
-				
-				
+
+
 			} else {
 				$new_tax_query[] = $tax_query;
 			}
 
 		}
-		
+
 		$args['tax_query'] = $new_tax_query;
-		
+
 		return $args;
-		
+
 	}
 
 	/**
@@ -229,7 +231,7 @@ class REST_Controller extends \WP_REST_Controller {
 						$args[ $mapped_v ][ $index1 ][ $meta_v ] = $request[ $mapped ][ $index1 ][ $meta_v ];
 					}
 				}
-				
+
 			}
 
 		} else {
@@ -260,7 +262,7 @@ class REST_Controller extends \WP_REST_Controller {
 
 		return false;
 	}
-	
+
 	/**
 	 * Return the fetch_only param
 	 *
@@ -270,11 +272,11 @@ class REST_Controller extends \WP_REST_Controller {
 	 */
 	public function get_fetch_only_param(){
 		return [
-			'fetch_only' => [
+			'fetch_only' => array(
 				'type'        => 'string/array',
 				'description' => __( 'Fetch only specific attribute. The specifics attributes are the same in schema.', 'tainacan' ),
 				//TODO: explicar o fetch only meta.. cabe aqui?
-			]
+			)
 		];
 	}
 
@@ -286,11 +288,22 @@ class REST_Controller extends \WP_REST_Controller {
 	 * @return array|void
 	 */
 	public function get_wp_query_params(){
+
 		$query_params['id'] = array(
 			'description' => __("Limit result to objects with specific id.", 'tainacan'),
 			'type'        => 'integer',
 		);
 
+		$query_params['context'] = array(
+			'type'    	  => 'string',
+			'default' 	  => 'view',
+			'description' => 'The context in which the request is made.',
+			'enum'    	  => array(
+				'view',
+				'edit'
+			),
+		);
+
 		$query_params['search'] = array(
 			'description'        => __( 'Limit results to those matching a string.', 'tainacan' ),
 			'type'               => 'string',
@@ -300,10 +313,7 @@ class REST_Controller extends \WP_REST_Controller {
 
 		$query_params['authorid'] = array(
 			'description' => __("Limit result set to objects assigned to specific authors by id.", 'tainacan'),
-			'type'        => 'array',
-			'items'       => array(
-				'type'    => 'integer',
-			),
+			'type'        => 'integer',
 		);
 
 		$query_params['authorname'] = array(
@@ -329,7 +339,7 @@ class REST_Controller extends \WP_REST_Controller {
 			'description'        => __( 'Order sort attribute ascending or descending.', 'tainacan' ),
 			'type'               => 'string/array',
 			'default'            => 'desc',
-			'enum'               => array( 'asc', 'desc' ),
+			'enum'               => array( 'asc', 'desc', 'ASC', 'DESC' ),
 		);
 
 		$query_params['orderby'] = array(
@@ -387,8 +397,26 @@ class REST_Controller extends \WP_REST_Controller {
 			),
 			'metacompare'  => array(
 				'type'        => 'string',
-				'description' => __('Operator to test the meta_value. Possible values are =, !=, >, >=, <, <=, LIKE, NOT LIKE, IN, NOT IN, BETWEEN, NOT BETWEEN, NOT EXISTS, REGEXP, NOT REGEXP or RLIKE.'),
+				'description' => __('Operator to test the metavalue'),
 				'default'     => '=',
+				'enum'        => array(
+					'=',
+					'!=',
+					'>',
+					'>=',
+					'<',
+					'<=',
+					'LIKE',
+					'NOT LIKE',
+					'IN',
+					'NOT IN',
+					'BETWEEN',
+					'NOT BETWEEN',
+					'NOT EXISTS',
+					'REGEXP',
+					'NOT REGEXP',
+					'RLIKE'
+				)
 			),
 			'metaquery'    => array(
 				'description' => __('Limits result set to items that have specific custom metadata'),
@@ -406,8 +434,24 @@ class REST_Controller extends \WP_REST_Controller {
 						),
 						'compare'  => array(
 							'type'        => 'string',
-							'description' => __('Operator to test. Possible values are =, !=, >, >=, <, <=, LIKE, NOT LIKE, IN, NOT IN, BETWEEN, NOT BETWEEN, EXISTS and NOT EXISTS.'),
-							'default'     => '='
+							'description' => __('Operator to test.'),
+							'default'     => '=',
+							'enum'		  => array(
+								'=',
+								'!=',
+								'>',
+								'>=',
+								'<',
+								'<=',
+								'LIKE',
+								'NOT LIKE',
+								'IN',
+								'NOT IN',
+								'BETWEEN',
+								'NOT BETWEEN',
+								'EXISTS',
+								'NOT EXISTS'
+							)
 						),
 						'relation' => array(
 							'type'        => 'string',
@@ -457,8 +501,24 @@ class REST_Controller extends \WP_REST_Controller {
 						),
 						'compare'   => array(
 							'type'        => 'string',
-							'description' => __('Operator to test. Possible values are =, !=, >, >=, <, <=, LIKE, NOT LIKE, IN, NOT IN, BETWEEN, NOT BETWEEN, EXISTS and NOT EXISTS.'),
-							'default'     => '='
+							'description' => __('Operator to test.'),
+							'default'     => '=',
+							'enum'        => array(
+								'=',
+								'!=',
+								'>',
+								'>=',
+								'<',
+								'<=',
+								'LIKE',
+								'NOT LIKE',
+								'IN',
+								'NOT IN',
+								'BETWEEN',
+								'NOT BETWEEN',
+								'EXISTS',
+								'NOT EXISTS'
+							)
 						),
 						'dayofweek' => array('type' => 'array'),
 						'inclusive' => array(
@@ -488,7 +548,14 @@ class REST_Controller extends \WP_REST_Controller {
 						),
 						'metadatum'    => array(
 							'type'        => 'string',
-							'description' => __('Select taxonomy term by. Possible values are term_id, name, slug or term_taxonomy_id. Default value is term_id.')
+							'default'	  => 'term_id',
+							'description' => __('Select taxonomy term by'),
+							'enum'		  => array(
+								'term_id',
+								'name',
+								'slug',
+								'term_taxonomy_id'
+							)
 						),
 						'terms'    => array(
 							'type'        => 'int/string/array',
@@ -496,13 +563,24 @@ class REST_Controller extends \WP_REST_Controller {
 						),
 						'operator' => array(
 							'type'        => 'string',
-							'description' => __('Operator to test. Possible values are IN, NOT IN, AND, EXISTS and NOT EXISTS'),
-							'default'     => 'IN'
+							'description' => __('Operator to test.'),
+							'default'     => 'IN',
+							'enum'        => array(
+								'IN',
+								'NOT IN',
+								'AND',
+								'EXISTS',
+								'NOT EXISTS'
+							)
 						),
 						'relation' => array(
 							'type'        => 'string',
-							'description' => __('The logical relationship between each inner taxonomy array when there is more than one. Possible values are AND, OR. Do not use with a single inner taxonomy array.'),
-							'default'     => 'AND'
+							'description' => __('The logical relationship between each inner taxonomy array when there is more than one. Do not use with a single inner taxonomy array.'),
+							'default'     => 'AND',
+							'enum'		  => array(
+								'AND',
+								'OR'
+							)
 						),
 					),
 					'type'     => 'array'
@@ -510,11 +588,11 @@ class REST_Controller extends \WP_REST_Controller {
 			),
 		);
 	}
-	
+
 	function get_repository_schema( \Tainacan\Repositories\Repository $repository ) {
-		
+
 		$schema = [];
-		
+
 		$map = $repository->get_map();
 
 		foreach ($map as $mapped => $value){
@@ -523,14 +601,14 @@ class REST_Controller extends \WP_REST_Controller {
 				'type' => $value['type']
 			];
 		}
-		
+
 		return $schema;
-		
+
 	}
-	
-	
+
+
 	function get_permissions_schema() {
-		
+
 		return [
 			'current_user_can_edit' => [
 				'description' => esc_html__('Whether current user can edit this object', 'tainacan'),
@@ -543,12 +621,12 @@ class REST_Controller extends \WP_REST_Controller {
 				'context' => 'edit'
 			]
 		];
-		
+
 	}
-	
+
 	function get_base_properties_schema() {
 		return [
-			
+
 			'id' => [
 				'description'  => esc_html__( 'Unique identifier for the object.', 'tainacan' ),
 				'type'         => 'integer',
@@ -557,7 +635,7 @@ class REST_Controller extends \WP_REST_Controller {
 			]
 		];
 	}
-	
+
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/src/api/endpoints/class-tainacan-rest-background-processes-controller.php b/src/api/endpoints/class-tainacan-rest-background-processes-controller.php
index 917f6257d..8e0f2264b 100644
--- a/src/api/endpoints/class-tainacan-rest-background-processes-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-background-processes-controller.php
@@ -42,38 +42,48 @@ class REST_Background_Processes_Controller extends REST_Controller {
                     ],
                     'all_users' => [
                         'type'        => 'bool',
-                        'description' => __( 'Whether to return processes from all users (if current user is admin). Default false.', 'tainacan' ),
+                        'description' => __( 'Whether to return processes from all users (if current user is admin).', 'tainacan' ),
+                        'default'     => false,
                     ],
                     'status' => [
                         'type'        => 'string',
-                        'description' => __( '"open" returns only processes currently running. "closed" returns only finished or aborted. "all" returns all. Default "all"', 'tainacan' ),
+                        'description' => __( '"open" returns only processes currently running. "closed" returns only finished or aborted. "all" returns all.', 'tainacan' ),
+                        'default'     => 'all',
+                        'enum'        => array(
+                            'open',
+                            'closed',
+                            'all'
+                        )
                     ],
                     'perpage' => [
                         'type'        => 'integer',
-                        'description' => __( 'Number of processes to return per page. Default 10', 'tainacan' ),
+                        'description' => __( 'Number of processes to return per page', 'tainacan' ),
+                        'default'     => 10,
                     ],
                     'paged' => [
                         'type'        => 'integer',
-                        'description' => __( 'Page to retrieve. Default 1', 'tainacan' ),
+                        'description' => __( 'Page to retrieve', 'tainacan' ),
+                        'default'     => 1
                     ],
 					'recent' => [
                         'type'        => 'bool',
                         'description' => __( 'Returns only processes created or updated recently', 'tainacan' ),
+                        'default' => false
                     ],
                 ],
 	        ),
         ));
         register_rest_route($this->namespace, '/' . $this->rest_base . '/(?P<id>[0-9]+)', array(
-            
+
             array(
                 'methods'             => \WP_REST_Server::READABLE,
                 'callback'            => array($this, 'get_item'),
                 'permission_callback' => array($this, 'bg_processes_permissions_check'),
             ),
-            
+
         ));
         register_rest_route($this->namespace, '/' . $this->rest_base . '/(?P<id>[0-9]+)', array(
-            
+
             array(
                 'methods'             => \WP_REST_Server::EDITABLE,
                 'callback'            => array($this, 'update_item'),
@@ -82,27 +92,31 @@ class REST_Background_Processes_Controller extends REST_Controller {
                     'status' => [
                         'type'        => 'string',
                         'description' => __( '"open" or "closed" ', 'tainacan' ),
+                        'enum'    	  => array(
+                            'open',
+                            'closed'
+                        )
                     ]
                 ],
             ),
-            
+
         ));
 
         register_rest_route($this->namespace, '/' . $this->rest_base . '/(?P<id>[0-9]+)', array(
-            
+
             array(
                 'methods'             => \WP_REST_Server::DELETABLE,
                 'callback'            => array($this, 'delete_item'),
                 'permission_callback' => array($this, 'bg_processes_permissions_check'),
-                
+
             ),
-            
+
         ));
 
 
     }
 
-	
+
 	/**
 	 *
 	 * @param \WP_REST_Request $request
@@ -141,7 +155,7 @@ class REST_Background_Processes_Controller extends REST_Controller {
                 $user_q = $wpdb->prepare("AND user_id = %d", $request['user_id']);
             }
 
-            if ( isset($user_q['all_users']) && $user_q['all_users'] ) {
+            if ( isset($request['all_users']) && $request['all_users'] ) {
                 $user_q = "";
             }
         }
@@ -154,7 +168,7 @@ class REST_Background_Processes_Controller extends REST_Controller {
                 $status_q = "AND done = 1";
             }
         }
-		
+
 		$recent_q = '';
 		if ( isset($request['recent']) && $request['recent'] !== false ) {
             $recent_q = "AND (processed_last >= NOW() - INTERVAL 10 MINUTE OR queued_on >= NOW() - INTERVAL 10 MINUTE)";
@@ -180,7 +194,7 @@ class REST_Background_Processes_Controller extends REST_Controller {
 
 		$rest_response->header('X-WP-Total', (int) $total_items);
         $rest_response->header('X-WP-TotalPages', (int) $max_pages);
-        
+
         return $rest_response;
 
     }
@@ -314,9 +328,9 @@ class REST_Background_Processes_Controller extends REST_Controller {
 
     public function get_log_url($id, $action, $type = '') {
         $suffix = $type ? '-' . $type : '';
-		
+
         $filename = 'bg-' . $action . '-' . $id . $suffix . '.log';
-        
+
         $upload_url = wp_upload_dir();
 
         if (!file_exists( $upload_url['basedir'] . '/tainacan/' . $filename )) {
@@ -325,7 +339,7 @@ class REST_Background_Processes_Controller extends REST_Controller {
 
 		$upload_url = trailingslashit( $upload_url['baseurl'] );
         $logs_url = $upload_url . 'tainacan/' . $filename;
-        
+
         return $logs_url;
 
     }
diff --git a/src/api/endpoints/class-tainacan-rest-bulkedit-controller.php b/src/api/endpoints/class-tainacan-rest-bulkedit-controller.php
index f393be794..b91476d07 100644
--- a/src/api/endpoints/class-tainacan-rest-bulkedit-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-bulkedit-controller.php
@@ -455,9 +455,6 @@ class REST_Bulkedit_Controller extends REST_Controller {
 	 * @return array|void
 	 */
 	public function get_create_params($object_name = null) {
-		$query_params['context']['default'] = 'view';
-
-		array_merge($query_params, parent::get_wp_query_params());
 
 		$query_params['title'] = array(
 			'description' => __('Limits the result set to items with a specific title'),
@@ -477,7 +474,11 @@ class REST_Bulkedit_Controller extends REST_Controller {
             'description' => __( 'Whether to use the current query to select posts', 'tainacan' ),
         ];
 
-		$query_params = array_merge($query_params, parent::get_meta_queries_params());
+        $query_params = array_merge(
+            $query_params,
+            parent::get_wp_query_params(),
+            parent::get_meta_queries_params()
+        );
 
 		return $query_params;
 	}
diff --git a/src/api/endpoints/class-tainacan-rest-collections-controller.php b/src/api/endpoints/class-tainacan-rest-collections-controller.php
index 5ea7eb747..2868335f2 100644
--- a/src/api/endpoints/class-tainacan-rest-collections-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-collections-controller.php
@@ -43,7 +43,7 @@ class REST_Collections_Controller extends REST_Controller {
                 'methods'             => \WP_REST_Server::READABLE,
                 'callback'            => array($this, 'get_items'),
                 'permission_callback' => array($this, 'get_items_permissions_check'),
-	            'args'                => $this->get_wp_query_params(),
+	            'args'                => $this->get_endpoint_args_for_item_schema(\WP_REST_Server::READABLE),
             ),
 	        array(
 		        'methods'             => \WP_REST_Server::CREATABLE,
@@ -58,7 +58,7 @@ class REST_Collections_Controller extends REST_Controller {
                 'methods'             => \WP_REST_Server::READABLE,
                 'callback'            => array($this, 'get_item'),
                 'permission_callback' => array($this, 'get_item_permissions_check'),
-	            'args'                => $this->get_endpoint_args_for_item_schema(\WP_REST_Server::READABLE),
+	            'args'                => $this->get_wp_query_params(),
 				
             ),
             array(
@@ -73,8 +73,8 @@ class REST_Collections_Controller extends REST_Controller {
                 'permission_callback' => array($this, 'delete_item_permissions_check'),
 	            'args'                => array(
 	            	'permanently' => array(
-		                'description' => __('To delete permanently, you can pass \'permanently\' as true. By default this will only trash collection'),
-			            'default'     => 'false'
+		                'description' => __('To delete permanently, you can pass \'permanently\' as 1. By default this will only trash collection'),
+						'default'     => '0',
 		            ),
 	            )
             ),
@@ -478,12 +478,6 @@ class REST_Collections_Controller extends REST_Controller {
 		$endpoint_args = [];
 		if($method === \WP_REST_Server::READABLE) {
             
-			$endpoint_args['context'] = array(
-				'type'    => 'string',
-				'default' => 'view',
-				'items'   => array( 'view, edit' )
-			);
-            
             $endpoint_args['name'] = array(
     	    	'description' => __('Limits the result set to collections with a specific name'),
     		    'type'        => 'string',
diff --git a/src/api/endpoints/class-tainacan-rest-export-controller.php b/src/api/endpoints/class-tainacan-rest-export-controller.php
deleted file mode 100644
index 3bf2e237f..000000000
--- a/src/api/endpoints/class-tainacan-rest-export-controller.php
+++ /dev/null
@@ -1,336 +0,0 @@
-<?php
-
-namespace Tainacan\API\EndPoints;
-
-use \Tainacan\API\REST_Controller;
-use Tainacan\Entities;
-use Tainacan\Repositories;
-use Tainacan\Entities\Entity;
-use Tainacan\Tests\TAINACAN_REST_Collections_Controller;
-
-class REST_Export_Controller extends REST_Controller {
-	private $item_metadata_repository;
-	private $items_repository;
-	private $collection_repository;
-	private $metadatum_repository;
-
-	public function __construct() {
-		$this->rest_base = 'export';
-		parent::__construct();
-		add_action('init', array(&$this, 'init_objects'), 11);
-	}
-
-	/**
-	 * Initialize objects after post_type register
-	 *
-	 * @throws \Exception
-	 */
-	public function init_objects() {
-		$this->metadatum_repository = Repositories\Metadata::get_instance();
-		$this->item_metadata_repository = Repositories\Item_Metadata::get_instance();
-		$this->items_repository = Repositories\Items::get_instance();
-		$this->collection_repository = Repositories\Collections::get_instance();
-	}
-
-	/**
-	 * If POST on metadatum/collection/<collection_id>, then
-	 * a metadatum will be created in matched collection and all your item will receive this metadatum
-	 *
-	 * If POST on metadatum/item/<item_id>, then a value will be added in a metadatum and metadatum passed
-	 * id body of requisition
-	 *
-	 * Both of GETs return the metadatum of matched objects
-	 *
-	 * @throws \Exception
-	 */
-	public function register_routes() {
-		register_rest_route($this->namespace, '/' . $this->rest_base. '/collection/(?P<collection_id>[\d]+)',
-			array(
-				array(
-					'methods'             => \WP_REST_Server::READABLE,
-					'callback'            => array($this, 'get_items'),
-					'permission_callback' => array($this, 'get_items_permissions_check'),
-					'args'                => $this->get_endpoint_args_for_item_schema(\WP_REST_Server::READABLE),
-				),
-			)
-		);
-		register_rest_route($this->namespace, '/' . $this->rest_base. '/item/(?P<item_id>[\d]+)',
-			array(
-				array(
-					'methods'             => \WP_REST_Server::READABLE,
-					'callback'            => array($this, 'get_item'),
-					'permission_callback' => array($this, 'get_item_permissions_check'),
-					'args'                => $this->get_endpoint_args_for_item_schema(\WP_REST_Server::READABLE),
-				),
-			)
-		);
-		register_rest_route($this->namespace, '/' . $this->rest_base,
-			array(
-				array(
-					'methods'             => \WP_REST_Server::READABLE,
-					'callback'            => array($this, 'get_items'),
-					'permission_callback' => array($this, 'get_items_permissions_check'),
-					'args'                => $this->get_wp_query_params(),
-				)
-			)
-		);
-	}
-
-	/**
-	 * @param \WP_REST_Request $request
-	 *
-	 * @return \WP_Error|\WP_REST_Response
-	 */
-	public function get_item( $request ) { }
-
-	/**
-	 * @param \WP_REST_Request $request
-	 *
-	 * @return bool|\WP_Error
-	 * @throws \Exception
-	 */
-	public function get_item_permissions_check( $request ) {
-		if(isset($request['collection_id'])) {
-			$collection = $this->collection_repository->fetch($request['collection_id']);
-			if($collection instanceof Entities\Collection) {
-				if (! $collection->can_read()) {
-					return false;
-				}
-				return true;
-			}
-		} elseif(isset($request['item_id'])) {
-			$item = $this->items_repository->fetch($request['item_id']);
-			if($item instanceof Entities\Item) {
-				if (! $item->can_read()) {
-					return false;
-				}
-				return true;
-			}
-		} else { // Exporting all
-			$dummy = new Entities\Collection();
-			return current_user_can($dummy->get_capabilities()->read); // Need to check Colletion by collection
-		}
-		return false;
-	}
-
-	/**
-	 * @param \Tainacan\Entities\Item $item
-	 * @param \WP_REST_Request $request
-	 *
-	 * @return array|\WP_Error|\WP_REST_Response
-	 */
-	public function prepare_item_for_response( $item, $request ) {
-		$items_metadata = $item->get_metadata();
-		
-		$prepared_item = [];
-		
-		foreach ($items_metadata as $item_metadata){
-			$prepared_item[] =  $item_metadata->_toArray();
-		}
-
-		return $prepared_item;
-	}
-	
-	/**
-	 * 
-	 * @param \WP_REST_Request $request
-	 * @param \WP_Query|Entities\Item $query
-	 * @param array $args
-	 * @return \WP_Error|number
-	 */
-	public function export($request, $query, $args) {
-		
-		$type = \Tainacan\Exposers_Handler::request_has_type($request);
-		$path = wp_upload_dir();
-		$path = $path['path'];
-		$filename = $path.date('YmdHis').'-tainacan-export.'.$type->get_extension();
-		$pid = -1;
-
-		$log = \Tainacan\Entities\Log::create(
-			__('Export Process', 'tainacan'),
-			__('Exporting Data', 'tainacan').'\nArgs: '.print_r($args, true),
-			['file' => $filename],
-			[],
-			'processing'
-		);
-		
-		$body = json_decode( $request->get_body(), true );
-		$background = ! (isset($body['export-background']) && $body['export-background'] == false);
-		if( $background ) {
-			$pid = pcntl_fork();
-		} else {
-			$pid = true;
-		}
-		if ($pid === -1) {
-			$error = new \WP_Error('could not fork');
-			$log = \Tainacan\Entities\Log::create(
-				__('Export Process Error', 'tainacan'),
-				__('Exporting Error', 'tainacan').'\\nArgs: '.print_r($args, true).'\\nError: could not fork',
-				$error,
-				[],
-				'error'
-			);
-			remove_filter( 'rest_request_after_callbacks', [\Tainacan\Exposers_Handler::get_instance(), 'rest_request_after_callbacks'], 10, 3 ); //exposer mapping
-			remove_filter( 'tainacan-rest-response', [\Tainacan\Exposers_Handler::get_instance(), 'rest_response'], 10, 2 ); // exposer types
-			return $log;
-		} elseif ($pid) { // we are the parent or run at foreground
-			try {
-				ignore_user_abort(true);
-				set_time_limit(0);
-				ini_set("memory_limit", "256M");
-				
-				if($background) { // wait for child to respond and exit and reconnect database if is forked
-					$status = null;
-					pcntl_wait($status);
-					global $wpdb;
-					$wpdb->db_connect();
-				}
-				
-				$response = [];
-				if(isset($request['collection_id'])) { // One Colletion
-					$collection_id = $request['collection_id'];
-					$items = $query;
-					if ($items->have_posts()) {
-						while ( $items->have_posts() ) { //TODO write line by line
-							$items->the_post();
-							
-							$item = new Entities\Item($items->post);
-							
-							$prepared_item = $this->prepare_item_for_response($item, $request);
-							
-							array_push($response, $prepared_item);
-						}
-						wp_reset_postdata();
-					}
-				} elseif (isset($request['item_id'])) { // One Item
-					
-					$item = new Entities\Item($request['item_id']);
-					if($item->get_id() > 0) {
-						$prepared_item = $this->prepare_item_for_response($item, $request);
-						
-						$response = [$prepared_item];
-					}
-				} else { // Export All
-				    $collections = $query;
-				    $collection_controller = new REST_Collections_Controller();
-				    if ($collections->have_posts()) {
-				        while ($collections->have_posts()) {
-				            $collections->the_post();
-				            $collection_id = $collections->post->ID;
-				            $collection = \Tainacan\Repositories\Repository::get_entity_by_post($collections->post);
-				            
-				            $prepared_collection = $collection_controller->prepare_item_for_response($collection, $request);
-				            
-				            $prepared_items = [];
-				            
-				            $items = $this->items_repository->fetch($args, $collection_id, 'WP_Query');
-        				    if ($items->have_posts()) {
-        				        while ( $items->have_posts() ) { //TODO write line by line
-        				            $items->the_post();
-        				            
-        				            $item = new Entities\Item($items->post);
-        				            
-        				            $prepared_item = $this->prepare_item_for_response($item, $request);
-        				            
-        				            array_push($prepared_items, $prepared_item);
-        				        }
-        				        wp_reset_postdata();
-        				    }
-        				    
-        				    $prepared_collection['items'] = $prepared_items;
-        				    array_push($prepared_collection, $response);
-				        }
-				        wp_reset_postdata();
-				    }
-				}
-				
-				$rest_response = new \WP_REST_Response(apply_filters('tainacan-rest-response', $response, $request));
-				$data = $rest_response->get_data();
-				file_put_contents($filename, is_string($data) ? $data : print_r($data, true));
-				
-				if($background) {
-					$log->set_status('publish');
-					$logs = \Tainacan\Repositories\Logs::get_instance();
-					$logs->update($log);
-					exit(1);
-				} else {
-					return $rest_response->get_data();
-				}
-			} catch (\Exception $e) {
-				if($background) {
-					exit(1);
-				} else {
-					throw $e;
-				}
-			}
-		} else { // we are the child
-
-			remove_filter( 'rest_request_after_callbacks', [\Tainacan\Exposers_Handler::get_instance(), 'rest_request_after_callbacks'], 10, 3 ); //exposer mapping
-			remove_filter( 'tainacan-rest-response', [\Tainacan\Exposers_Handler::get_instance(), 'rest_response'], 10, 2 ); // exposer types
-			return $log;
-		}
-		
-	}
-
-	/**
-	 * @param \WP_REST_Request $request
-	 *
-	 * @return \WP_Error|\WP_REST_Response
-	 */
-	public function get_items( $request ) {
-		$args = $this->prepare_filters($request); // TODO default args
-		$rest_response = new \WP_REST_Response([], 200); // TODO error, empty response
-		
-		if(isset($request['collection_id'])) { // One Colletion
-			$collection_id = $request['collection_id'];
-			$items = $this->items_repository->fetch($args, $collection_id, 'WP_Query');
-			
-			$response = $this->export($request, $items, $args);
-			
-			$total_items  = $items->found_posts;
-			$ret = $response instanceof Entity ? $response->__toArray() : $response;
-			$rest_response = new \WP_REST_Response($ret, 200);
-			
-			$rest_response->header('X-WP-Total', (int) $total_items);
-		} elseif (isset($request['item_id'])) { // One Item
-					
-			$item = new Entities\Item($request['item_id']);
-			if($item->get_id() > 0) {
-				$response = $this->export($request, $item, $args);
-				
-				$total_items  = 1;
-				$max_pages = 1;
-				
-				$rest_response = new \WP_REST_Response($response->__toArray(), 200);
-				
-				$rest_response->header('X-WP-Total', 1);
-				$rest_response->header('X-WP-TotalPages', 1);
-			}
-		} else { // Export All
-		    $Tainacan_Collection = \Tainacan\Repositories\Collections::get_instance();
-		    $collections = $Tainacan_Collection->fetch(['post_status' => 'publish'], 'WP_Query');
-    		    
-		    $response = $this->export($request, $collections, $args);
-   		    $total_items = $collections->found_posts;
-   		    $ret = $response instanceof Entity ? $response->__toArray() : $response;
-   		    $rest_response = new \WP_REST_Response($ret, 200);
-
-   		    $rest_response->header('X-WP-Total', (int) $total_items);
-		}
-		
-		return $rest_response;
-	}
-
-	/**
-	 * @param \WP_REST_Request $request
-	 *
-	 * @return bool|\WP_Error
-	 * @throws \Exception
-	 */
-	public function get_items_permissions_check( $request ) {
-		return $this->get_item_permissions_check($request);
-	}
-
-}
-
-?>
diff --git a/src/api/endpoints/class-tainacan-rest-filters-controller.php b/src/api/endpoints/class-tainacan-rest-filters-controller.php
index 0255db1db..17cfe0fc3 100644
--- a/src/api/endpoints/class-tainacan-rest-filters-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-filters-controller.php
@@ -83,8 +83,8 @@ class REST_Filters_Controller extends REST_Controller {
 				'permission_callback' => array($this, 'delete_item_permissions_check'),
 				'args'                => array(
 	            	'permanently' => array(
-		                'description' => __('To delete permanently, you can pass \'permanently\' as true. By default this will only trash collection'),
-			            'default'     => 'false'
+		                'description' => __('To delete permanently, you can pass \'permanently\' as 1. By default this will only trash collection'),
+			            'default'     => '0'
 		            ),
 	            )
 			),
@@ -469,11 +469,10 @@ class REST_Filters_Controller extends REST_Controller {
 	public function get_endpoint_args_for_item_schema( $method = null ) {
 		$endpoint_args = [];
 		if($method === \WP_REST_Server::READABLE) {
-			$endpoint_args['context'] = array(
-				'type'    => 'string',
-				'default' => 'view',
-				'items'   => array( 'view, edit' )
-			);
+			$endpoint_args = array_merge(
+                $endpoint_args, 
+                parent::get_wp_query_params()
+            );
 		} elseif ($method === \WP_REST_Server::CREATABLE || $method === \WP_REST_Server::EDITABLE) {
 			$map = $this->filter_repository->get_map();
 
@@ -498,16 +497,17 @@ class REST_Filters_Controller extends REST_Controller {
 	 * @return array|void
 	 */
 	public function get_wp_query_params() {
-		$query_params['context']['default'] = 'view';
-
-		$query_params = array_merge($query_params, parent::get_wp_query_params());
 
 		$query_params['name'] = array(
 			'description' => __('Limits the result set to filters with a specific name'),
 			'type'        => 'string',
 		);
 
-		$query_params = array_merge($query_params, parent::get_meta_queries_params());
+		$query_params = array_merge(
+			$query_params, 
+			parent::get_wp_query_params(),
+			parent::get_meta_queries_params()
+		);
 
 		return $query_params;
 	}
diff --git a/src/api/endpoints/class-tainacan-rest-importers-controller.php b/src/api/endpoints/class-tainacan-rest-importers-controller.php
index 2897bf72d..51dddbd92 100644
--- a/src/api/endpoints/class-tainacan-rest-importers-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-importers-controller.php
@@ -267,7 +267,7 @@ class REST_Importers_Controller extends REST_Controller {
         if ( method_exists($importer, 'get_source_special_fields') ) {
             $response['source_special_fields'] = $importer->get_source_special_fields();
         }
-
+        $Tainacan_Importer_Handler->save_importer_instance($importer);
         return new \WP_REST_Response( $response, 200 );
 
     }
diff --git a/src/api/endpoints/class-tainacan-rest-item-metadata-controller.php b/src/api/endpoints/class-tainacan-rest-item-metadata-controller.php
index ea9b3dc6d..30cdef1f6 100644
--- a/src/api/endpoints/class-tainacan-rest-item-metadata-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-item-metadata-controller.php
@@ -56,7 +56,7 @@ class REST_Item_Metadata_Controller extends REST_Controller {
 					'methods'             => \WP_REST_Server::READABLE,
 					'callback'            => array($this, 'get_items'),
 					'permission_callback' => array($this, 'get_items_permissions_check'),
-					'args'                => $this->get_wp_query_params(),
+					'args'                => $this->get_endpoint_args_for_item_schema(\WP_REST_Server::READABLE),
 				)
 			)
 		);
@@ -268,7 +268,12 @@ class REST_Item_Metadata_Controller extends REST_Controller {
 	public function get_endpoint_args_for_item_schema( $method = null ) {
 		$endpoint_args = [];
 
-		if ($method === \WP_REST_Server::EDITABLE) {
+		if($method === \WP_REST_Server::READABLE) {
+			$endpoint_args = array_merge(
+				$endpoint_args,
+				$this->get_wp_query_params()
+            );
+		} elseif ($method === \WP_REST_Server::EDITABLE) {
 			$endpoint_args['values'] = [
 				'type'        => 'array/string/object/integer',
 				'items'       => [
@@ -290,7 +295,15 @@ class REST_Item_Metadata_Controller extends REST_Controller {
 	 * @return array
 	 */
 	public function get_wp_query_params() {
-		$query_params['context']['default'] = 'view';
+		$query_params['context'] = array(
+			'type'    	  => 'string',
+			'default' 	  => 'view',
+			'description' => 'The context in which the request is made.',
+			'enum'    	  => array(
+				'view',
+				'edit'
+			),
+		);
 
 		return $query_params;
 	}
diff --git a/src/api/endpoints/class-tainacan-rest-items-controller.php b/src/api/endpoints/class-tainacan-rest-items-controller.php
index 9d06a0cfa..fb07f33ec 100644
--- a/src/api/endpoints/class-tainacan-rest-items-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-items-controller.php
@@ -80,8 +80,8 @@ class REST_Items_Controller extends REST_Controller {
 					'permission_callback' => array($this, 'delete_item_permissions_check'),
 					'args'                => array(
 						'permanently' => array(
-							'description' => __('To delete permanently, you can pass \'permanently\' as true. By default this will only trash collection', 'tainacan'),
-							'default'     => 'false'
+							'description' => __('To delete permanently, you can pass \'permanently\' as 1. By default this will only trash collection', 'tainacan'),
+							'default'     => '0'
 						),
 					)
 				),
@@ -757,15 +757,18 @@ class REST_Items_Controller extends REST_Controller {
 		$endpoint_args = [];
 
 		if($method === \WP_REST_Server::READABLE) {
-			$endpoint_args['fetch_only'] = array(
-				'type'        => 'string/array',
-				'description' => __( 'Fetch only specific attribute. The specifics attributes are the same in schema.' ),
-			);
-
 			$endpoint_args['context'] = array(
-				'type'    => 'string',
-				'default' => 'view',
-				'items'   => array( 'view, edit' )
+				'type'    	  => 'string',
+				'default' 	  => 'view',
+				'description' => 'The context in which the request is made.',
+				'enum'    	  => array(
+					'view',
+					'edit'
+				),
+			);
+			$endpoint_args = array_merge(
+				$endpoint_args, 
+				parent::get_fetch_only_param()
 			);
 		} elseif ($method === \WP_REST_Server::CREATABLE || $method === \WP_REST_Server::EDITABLE) {
 			$map = $this->items_repository->get_map();
@@ -791,16 +794,16 @@ class REST_Items_Controller extends REST_Controller {
 	 * @return array|void
 	 */
 	public function get_wp_query_params() {
-		$query_params['context']['default'] = 'view';
-
-		array_merge($query_params, parent::get_wp_query_params());
-
 		$query_params['title'] = array(
 			'description' => __('Limits the result set to items with a specific title'),
 			'type'        => 'string',
 		);
 
-		$query_params = array_merge($query_params, parent::get_meta_queries_params());
+		$query_params = array_merge(
+			$query_params, 
+			parent::get_wp_query_params(),
+			parent::get_meta_queries_params()
+		);
 
 		return $query_params;
 	}
diff --git a/src/api/endpoints/class-tainacan-rest-logs-controller.php b/src/api/endpoints/class-tainacan-rest-logs-controller.php
index 920b4258a..c64aebcbb 100644
--- a/src/api/endpoints/class-tainacan-rest-logs-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-logs-controller.php
@@ -38,7 +38,17 @@ class REST_Logs_Controller extends REST_Controller {
 					'methods'             => \WP_REST_Server::READABLE,
 					'callback'            => array($this, 'get_item'),
 					'permission_callback' => array($this, 'get_item_permissions_check'),
-					'args'                => $this->get_endpoint_args_for_item_schema(\WP_REST_Server::READABLE)
+					'args'                => array(
+						'context' => array(
+							'type'    	  => 'string',
+							'default' 	  => 'view',
+							'description' => 'The context in which the request is made.',
+							'enum'    	  => array(
+								'view',
+								'edit'
+							)
+						),
+					),
 				),
 				'schema'                  => [$this, 'get_schema']
 			)
@@ -351,11 +361,10 @@ class REST_Logs_Controller extends REST_Controller {
 	public function get_endpoint_args_for_item_schema( $method = null ) {
 		$endpoint_args = [];
 		if($method === \WP_REST_Server::READABLE) {
-			$endpoint_args['context'] = array(
-				'type'    => 'string',
-				'default' => 'view',
-				'items'   => array( 'view' )
-			);
+			$endpoint_args = array_merge(
+                $endpoint_args, 
+                parent::get_wp_query_params()
+            );
 		}
 
 		return $endpoint_args;
diff --git a/src/api/endpoints/class-tainacan-rest-metadata-controller.php b/src/api/endpoints/class-tainacan-rest-metadata-controller.php
index 5cbba59e1..3820130ba 100644
--- a/src/api/endpoints/class-tainacan-rest-metadata-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-metadata-controller.php
@@ -44,24 +44,33 @@ class REST_Metadata_Controller extends REST_Controller {
 	public function register_routes() {
 		register_rest_route($this->namespace, '/collection/(?P<collection_id>[\d]+)/' . $this->rest_base . '/(?P<metadatum_id>[\d]+)',
 			array(
+				array(
+					'methods'             => \WP_REST_Server::READABLE,
+					'callback'            => array($this, 'get_item'),
+					'permission_callback' => array($this, 'get_item_permissions_check'),
+					'args'                => array(
+						'context' => array(
+							'type'    	  => 'string',
+							'default' 	  => 'view',
+							'description' => 'The context in which the request is made.',
+							'enum'    	  => array(
+								'view',
+								'edit'
+							)
+						),
+					),
+				),
 				array(
 					'methods'             => \WP_REST_Server::EDITABLE,
 					'callback'            => array($this, 'update_item'),
 					'permission_callback' => array($this, 'update_item_permissions_check'),
 					'args'                => $this->get_endpoint_args_for_item_schema(\WP_REST_Server::EDITABLE)
 				),
-				// ENDPOINT X. THIS ENDPOINT DO THE SAME THING OF ENDPOINT Z. I hope in a brief future it function changes.
 				array(
 					'methods'             => \WP_REST_Server::DELETABLE,
 					'callback'            => array($this, 'delete_item'),
 					'permission_callback' => array($this, 'delete_item_permissions_check'),
 				),
-				array(
-					'methods'             => \WP_REST_Server::READABLE,
-					'callback'            => array($this, 'get_item'),
-					'permission_callback' => array($this, 'get_item_permissions_check'),
-					'args'                => $this->get_endpoint_args_for_item_schema(\WP_REST_Server::READABLE),
-				),
 				'schema'                  => [$this, 'get_schema']
 			)
 		);
@@ -84,28 +93,38 @@ class REST_Metadata_Controller extends REST_Controller {
 		);
 		register_rest_route($this->namespace, '/' . $this->rest_base,
 			array(
-				array(
-					'methods'             => \WP_REST_Server::CREATABLE,
-					'callback'            => array($this, 'create_item'),
-					'permission_callback' => array($this, 'create_item_permissions_check'),
-					'args'                => $this->get_endpoint_args_for_item_schema(\WP_REST_Server::CREATABLE),
-				),
 				array(
 					'methods'             => \WP_REST_Server::READABLE,
 					'callback'            => array($this, 'get_items'),
 					'permission_callback' => array($this, 'get_items_permissions_check'),
 					'args'                => $this->get_wp_query_params(),
 				),
+				array(
+					'methods'             => \WP_REST_Server::CREATABLE,
+					'callback'            => array($this, 'create_item'),
+					'permission_callback' => array($this, 'create_item_permissions_check'),
+					'args'                => $this->get_endpoint_args_for_item_schema(\WP_REST_Server::CREATABLE),
+				),
 				'schema'                  => [$this, 'get_schema'],
 			)
 		);
 		register_rest_route($this->namespace, '/'. $this->rest_base . '/(?P<metadatum_id>[\d]+)',
 			array(
-				// ENDPOINT Z.
 				array(
-					'methods'             => \WP_REST_Server::DELETABLE,
-					'callback'            => array($this, 'delete_item'),
-					'permission_callback' => array($this, 'delete_item_permissions_check')
+					'methods'             => \WP_REST_Server::READABLE,
+					'callback'            => array($this, 'get_item'),
+					'permission'          => array($this, 'get_item_permissions_check'),
+					'args'                => array(
+						'context' => array(
+							'type'    	  => 'string',
+							'default' 	  => 'view',
+							'description' => 'The context in which the request is made.',
+							'enum'    	  => array(
+								'view',
+								'edit'
+							)
+						),
+					),
 				),
 				array(
 					'methods'             => \WP_REST_Server::EDITABLE,
@@ -114,10 +133,9 @@ class REST_Metadata_Controller extends REST_Controller {
 					'args'                => $this->get_endpoint_args_for_item_schema(\WP_REST_Server::EDITABLE)
 				),
 				array(
-					'methods'             => \WP_REST_Server::READABLE,
-					'callback'            => array($this, 'get_item'),
-					'permission'          => array($this, 'get_item_permissions_check'),
-					'args'                => $this->get_endpoint_args_for_item_schema(\WP_REST_Server::READABLE)
+					'methods'             => \WP_REST_Server::DELETABLE,
+					'callback'            => array($this, 'delete_item'),
+					'permission_callback' => array($this, 'delete_item_permissions_check')
 				),
 				'schema'                  => [$this, 'get_schema'],
 			)
@@ -564,11 +582,10 @@ class REST_Metadata_Controller extends REST_Controller {
 	public function get_endpoint_args_for_item_schema( $method = null ) {
 		$endpoint_args = [];
 		if($method === \WP_REST_Server::READABLE) {
-			$endpoint_args['context'] = array(
-				'type'    => 'string',
-				'default' => 'view',
-				'items'   => array( 'view, edit' )
-			);
+			$endpoint_args = array_merge(
+                $endpoint_args, 
+                parent::get_wp_query_params()
+            );
 		} elseif ($method === \WP_REST_Server::CREATABLE || $method === \WP_REST_Server::EDITABLE) {
 			$map = $this->metadatum_repository->get_map();
 
diff --git a/src/api/endpoints/class-tainacan-rest-taxonomies-controller.php b/src/api/endpoints/class-tainacan-rest-taxonomies-controller.php
index a1f71856e..7004eb5da 100644
--- a/src/api/endpoints/class-tainacan-rest-taxonomies-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-taxonomies-controller.php
@@ -54,7 +54,21 @@ class REST_Taxonomies_Controller extends REST_Controller {
 					'methods'             => \WP_REST_Server::READABLE,
 					'callback'            => array($this, 'get_item'),
 					'permission_callback' => array($this, 'get_item_permissions_check'),
-					'args'                => $this->get_endpoint_args_for_item_schema(\WP_REST_Server::READABLE)
+					'args'				  => array(
+						'context' => array(
+							'type'    	  => 'string',
+							'default' 	  => 'view',
+							'description' => 'The context in which the request is made.',
+							'enum'    	  => array(
+								'view',
+								'edit'
+							)
+						),
+						'fetch_only' => array(
+							'type'        => 'string/array',
+							'description' => __( 'Fetch only specific attribute. The specifics attributes are the same in schema.', 'tainacan' ),
+						)
+					)
 				),
 				array(
 					'methods'             => \WP_REST_Server::DELETABLE,
@@ -62,8 +76,8 @@ class REST_Taxonomies_Controller extends REST_Controller {
 					'permission_callback' => array($this, 'delete_item_permissions_check'),
 					'args'                => array(
 						'permanently' => array(
-							'description' => __('To delete permanently, you can pass \'permanently\' as true. By default this will only trash collection'),
-							'default'     => 'false',
+							'description' => __('To delete permanently, you can pass \'permanently\' as 1. By default this will only trash collection'),
+							'default'     => '0',
 						),
 					)
 				),
@@ -452,16 +466,11 @@ class REST_Taxonomies_Controller extends REST_Controller {
 	public function get_endpoint_args_for_item_schema( $method = null ) {
 		$endpoint_args = [];
 		if($method === \WP_REST_Server::READABLE) {
-			$endpoint_args['fetch_only'] = array(
-				'type'        => 'string/array',
-				'description' => __( 'Fetch only specific attribute. The specifics attributes are the same in schema.' ),
-			);
-
-			$endpoint_args['context'] = array(
-				'type'    => 'string',
-				'default' => 'view',
-				'items'   => array( 'view, edit' )
-			);
+			$endpoint_args = array_merge(
+                $endpoint_args, 
+				parent::get_wp_query_params(),
+                parent::get_fetch_only_param()
+            );
 		} elseif ($method === \WP_REST_Server::CREATABLE || $method === \WP_REST_Server::EDITABLE) {
 			$map = $this->taxonomy_repository->get_map();
 
diff --git a/src/api/endpoints/class-tainacan-rest-terms-controller.php b/src/api/endpoints/class-tainacan-rest-terms-controller.php
index cf74853d6..e1debad91 100644
--- a/src/api/endpoints/class-tainacan-rest-terms-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-terms-controller.php
@@ -56,8 +56,9 @@ class REST_Terms_Controller extends REST_Controller {
 					'callback'            => array($this, 'delete_item'),
 					'permission_callback' => array($this, 'delete_item_permissions_check'),
 					'args'                => [
-						'info' => [
-							'description' => __('Delete term permanently.')
+						'permanently' => [
+							'description' => __('Delete term permanently.'),
+							'default'     => '1'
 						]
 					]
 				),
@@ -420,11 +421,10 @@ class REST_Terms_Controller extends REST_Controller {
 	public function get_endpoint_args_for_item_schema( $method = null ) {
 		$endpoint_args = [];
 		if($method === \WP_REST_Server::READABLE) {
-			$endpoint_args['context'] = array(
-				'type'    => 'string',
-				'default' => 'view',
-				'items'   => array( 'view, edit' )
-			);
+			$endpoint_args = array_merge(
+                $endpoint_args, 
+                parent::get_wp_query_params()
+            );
 		} elseif ($method === \WP_REST_Server::CREATABLE || $method === \WP_REST_Server::EDITABLE) {
 			$map = $this->terms_repository->get_map();
 
diff --git a/src/api/tainacan-rest-creator.php b/src/api/tainacan-rest-creator.php
index 34201111b..2d5efc972 100644
--- a/src/api/tainacan-rest-creator.php
+++ b/src/api/tainacan-rest-creator.php
@@ -18,7 +18,6 @@ $rest_exporters_controller    = new \Tainacan\API\EndPoints\REST_Exporters_Contr
 $rest_background_processes_controller    = new \Tainacan\API\EndPoints\REST_Background_Processes_Controller();
 $rest_bulkedit_controller    = new \Tainacan\API\EndPoints\REST_Bulkedit_Controller();
 $rest_exposers_controller    = new \Tainacan\API\EndPoints\REST_Exposers_Controller();
-new \Tainacan\API\EndPoints\REST_Export_Controller();
 new \Tainacan\API\EndPoints\REST_Metadatum_Mappers_Controller();
 $rest_facets_controller         = new \Tainacan\API\EndPoints\REST_Facets_Controller();
 $rest_oaipmh_expose_controller = new \Tainacan\API\EndPoints\REST_Oaipmh_Expose_Controller();
diff --git a/src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css b/src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css
index 2522e72d9..865c75a64 100644
--- a/src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css
+++ b/src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css
@@ -95,8 +95,11 @@
   .wp-block-tainacan-modal .modal-checkbox-list,
   .wp-block-tainacan-modal .modal-radio-list .components-base-control__field {
     padding: 0;
+    flex-wrap: wrap;
+    display: flex;
     display: -ms-grid;
     display: grid;
+    -ms-grid-columns: 250px 250px;
     grid-template-columns: repeat(auto-fill, 250px);
     grid-gap: 0px;
     justify-content: space-evenly;
@@ -171,8 +174,13 @@
     .components-panel__body .collection-carousel-view-modes button.collection-carousel-view-mode-grid {
       margin-right: 6px; }
       .components-panel__body .collection-carousel-view-modes button.collection-carousel-view-mode-grid div {
+        flex-wrap: wrap;
+        display: flex;
+        display: -ms-grid;
         display: grid;
+        -ms-grid-columns: 33% 33% 33%;
         grid-template-columns: 33% 33% 33%;
+        -ms-grid-rows: 50% 50%;
         grid-template-rows: 50% 50%;
         grid-column-gap: 2px;
         grid-row-gap: 2px;
@@ -180,13 +188,17 @@
         height: 40px;
         margin: 4px auto 8px auto; }
         .components-panel__body .collection-carousel-view-modes button.collection-carousel-view-mode-grid div > div:first-of-type {
-          grid-column-start: 1;
-          grid-column-end: span 2;
-          grid-row-start: 1;
-          grid-row-end: span 2;
+          flex-basis: 100%;
+          -ms-grid-column: 1;
+          -ms-grid-column-span: 2;
+          -ms-grid-row: 1;
+          -ms-grid-row-span: 2;
+          grid-column: 1/3;
+          grid-row: 1/3;
           width: 41px;
           height: 42px; }
         .components-panel__body .collection-carousel-view-modes button.collection-carousel-view-mode-grid div > div {
+          flex-basis: 50%;
           width: 20px;
           height: 20px;
           background: #555758;
@@ -214,7 +226,7 @@
         background: #f2f2f2; }
 
 .wp-block-tainacan-carousel-collections-list {
-  margin: 2rem 0px; }
+  margin: 2rem auto; }
   .wp-block-tainacan-carousel-collections-list .spinner-container {
     min-height: 56px;
     padding: 1rem;
@@ -270,7 +282,7 @@
         text-decoration: none;
         padding: 8px 16px;
         display: block;
-        line-height: 1.2rem; }
+        line-height: 1.2em; }
       .wp-block-tainacan-carousel-collections-list .tainacan-carousel .swiper-container a > img {
         width: 100%;
         height: auto; }
@@ -280,16 +292,23 @@
         width: 100%;
         display: block; }
       .wp-block-tainacan-carousel-collections-list .tainacan-carousel .swiper-container .swiper-slide.collection-list-item-grid .collection-items-grid {
+        flex-wrap: wrap;
+        display: flex;
+        display: -ms-grid;
         display: grid;
         grid-template-columns: 33% 33% 33%;
         grid-template-rows: 50% 50%;
         width: 100%; }
         .wp-block-tainacan-carousel-collections-list .tainacan-carousel .swiper-container .swiper-slide.collection-list-item-grid .collection-items-grid img:first-of-type {
-          grid-column-start: 1;
-          grid-column-end: span 2;
-          grid-row-start: 1;
-          grid-row-end: span 2; }
+          flex-basis: 100%;
+          -ms-grid-column: 1;
+          -ms-grid-column-span: 2;
+          -ms-grid-row: 1;
+          -ms-grid-row-span: 2;
+          grid-column: 1/3;
+          grid-row: 1/3; }
         .wp-block-tainacan-carousel-collections-list .tainacan-carousel .swiper-container .swiper-slide.collection-list-item-grid .collection-items-grid img {
+          flex-basis: 50%;
           width: 100%;
           height: auto;
           padding: 2px;
@@ -389,15 +408,22 @@
         background-color: white !important;
         border: 1px solid #cbcbcb !important; }
       .wp-block-tainacan-carousel-collections-list ul.collections-list-edit li.collection-list-item .collection-items-grid {
+        flex-wrap: wrap;
+        display: flex;
+        display: -ms-grid;
         display: grid;
         grid-template-columns: 33% 33% 33%;
         grid-template-rows: 50% 50%; }
         .wp-block-tainacan-carousel-collections-list ul.collections-list-edit li.collection-list-item .collection-items-grid img:first-of-type {
-          grid-column-start: 1;
-          grid-column-end: span 2;
-          grid-row-start: 1;
-          grid-row-end: span 2; }
+          flex-basis: 100%;
+          -ms-grid-column: 1;
+          -ms-grid-column-span: 2;
+          -ms-grid-row: 1;
+          -ms-grid-row-span: 2;
+          grid-column: 1/3;
+          grid-row: 1/3; }
         .wp-block-tainacan-carousel-collections-list ul.collections-list-edit li.collection-list-item .collection-items-grid img {
+          flex-basis: 50%;
           padding: 2px;
           margin-bottom: 0px; }
   @media only screen and (max-width: 1686px) {
diff --git a/src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css.map b/src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css.map
index 2a65292a2..0b270bf1d 100644
--- a/src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css.map
+++ b/src/assets/css/tainacan-gutenberg-block-carousel-collections-list.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../../gutenberg-blocks/gutenberg-blocks-style.scss","../../gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list.scss"],
 "names": [],
 "file": "tainacan-gutenberg-block-carousel-collections-list.css"
diff --git a/src/assets/css/tainacan-gutenberg-block-carousel-items-list.css b/src/assets/css/tainacan-gutenberg-block-carousel-items-list.css
index e3e58412f..4ecf4c467 100644
--- a/src/assets/css/tainacan-gutenberg-block-carousel-items-list.css
+++ b/src/assets/css/tainacan-gutenberg-block-carousel-items-list.css
@@ -95,8 +95,11 @@
   .wp-block-tainacan-modal .modal-checkbox-list,
   .wp-block-tainacan-modal .modal-radio-list .components-base-control__field {
     padding: 0;
+    flex-wrap: wrap;
+    display: flex;
     display: -ms-grid;
     display: grid;
+    -ms-grid-columns: 250px 250px;
     grid-template-columns: repeat(auto-fill, 250px);
     grid-gap: 0px;
     justify-content: space-evenly;
@@ -156,7 +159,7 @@
       color: #454647; }
 
 .wp-block-tainacan-carousel-items-list {
-  margin: 2rem 0px; }
+  margin: 2rem auto; }
   .wp-block-tainacan-carousel-items-list .spinner-container {
     min-height: 56px;
     padding: 1rem;
@@ -222,12 +225,13 @@
       .wp-block-tainacan-carousel-items-list .carousel-items-collection-header .collection-name h3 {
         color: white;
         text-decoration: none;
-        font-size: 1.3rem; }
+        font-size: 1.3em;
+        margin: 0; }
         .wp-block-tainacan-carousel-items-list .carousel-items-collection-header .collection-name h3:hover {
           text-decoration: none; }
       .wp-block-tainacan-carousel-items-list .carousel-items-collection-header .collection-name span.label {
         font-weight: normal;
-        font-size: 1rem; }
+        font-size: 0.75em; }
       .wp-block-tainacan-carousel-items-list .carousel-items-collection-header .collection-name.only-collection-name {
         justify-content: center;
         padding: 1rem; }
@@ -284,7 +288,7 @@
         text-decoration: none;
         padding: 8px 16px;
         display: block;
-        line-height: 1.2rem; }
+        line-height: 1.2em; }
       .wp-block-tainacan-carousel-items-list .tainacan-carousel .swiper-container a > img {
         width: 100%;
         height: auto; }
diff --git a/src/assets/css/tainacan-gutenberg-block-carousel-items-list.css.map b/src/assets/css/tainacan-gutenberg-block-carousel-items-list.css.map
index 8acc5b26c..875e14313 100644
--- a/src/assets/css/tainacan-gutenberg-block-carousel-items-list.css.map
+++ b/src/assets/css/tainacan-gutenberg-block-carousel-items-list.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../../gutenberg-blocks/gutenberg-blocks-style.scss","../../gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-list.scss"],
 "names": [],
 "file": "tainacan-gutenberg-block-carousel-items-list.css"
diff --git a/src/assets/css/tainacan-gutenberg-block-carousel-terms-list.css b/src/assets/css/tainacan-gutenberg-block-carousel-terms-list.css
index 59f0778cc..6107df071 100644
--- a/src/assets/css/tainacan-gutenberg-block-carousel-terms-list.css
+++ b/src/assets/css/tainacan-gutenberg-block-carousel-terms-list.css
@@ -95,8 +95,11 @@
   .wp-block-tainacan-modal .modal-checkbox-list,
   .wp-block-tainacan-modal .modal-radio-list .components-base-control__field {
     padding: 0;
+    flex-wrap: wrap;
+    display: flex;
     display: -ms-grid;
     display: grid;
+    -ms-grid-columns: 250px 250px;
     grid-template-columns: repeat(auto-fill, 250px);
     grid-gap: 0px;
     justify-content: space-evenly;
@@ -171,8 +174,13 @@
     .components-panel__body .term-carousel-view-modes button.term-carousel-view-mode-grid {
       margin-right: 6px; }
       .components-panel__body .term-carousel-view-modes button.term-carousel-view-mode-grid div {
+        flex-wrap: wrap;
+        display: flex;
+        display: -ms-grid;
         display: grid;
+        -ms-grid-columns: 33% 33% 33%;
         grid-template-columns: 33% 33% 33%;
+        -ms-grid-rows: 50% 50%;
         grid-template-rows: 50% 50%;
         grid-column-gap: 2px;
         grid-row-gap: 2px;
@@ -180,13 +188,17 @@
         height: 40px;
         margin: 4px auto 8px auto; }
         .components-panel__body .term-carousel-view-modes button.term-carousel-view-mode-grid div > div:first-of-type {
-          grid-column-start: 1;
-          grid-column-end: span 2;
-          grid-row-start: 1;
-          grid-row-end: span 2;
+          flex-basis: 100%;
+          -ms-grid-column: 1;
+          -ms-grid-column-span: 2;
+          -ms-grid-row: 1;
+          -ms-grid-row-span: 2;
+          grid-column: 1/3;
+          grid-row: 1/3;
           width: 41px;
           height: 42px; }
         .components-panel__body .term-carousel-view-modes button.term-carousel-view-mode-grid div > div {
+          flex-basis: 50%;
           width: 20px;
           height: 20px;
           background: #555758;
@@ -214,7 +226,7 @@
         background: #f2f2f2; }
 
 .wp-block-tainacan-carousel-terms-list {
-  margin: 2rem 0px; }
+  margin: 2rem auto; }
   .wp-block-tainacan-carousel-terms-list .spinner-container {
     min-height: 56px;
     padding: 1rem;
@@ -270,7 +282,7 @@
         text-decoration: none;
         padding: 8px 16px;
         display: block;
-        line-height: 1.2rem; }
+        line-height: 1.2em; }
       .wp-block-tainacan-carousel-terms-list .tainacan-carousel .swiper-container a > img {
         width: 100%;
         height: auto; }
@@ -280,16 +292,23 @@
         width: 100%;
         display: block; }
       .wp-block-tainacan-carousel-terms-list .tainacan-carousel .swiper-container .swiper-slide.term-list-item-grid .term-items-grid {
+        flex-wrap: wrap;
+        display: flex;
+        display: -ms-grid;
         display: grid;
         grid-template-columns: 33% 33% 33%;
         grid-template-rows: 50% 50%;
         width: 100%; }
         .wp-block-tainacan-carousel-terms-list .tainacan-carousel .swiper-container .swiper-slide.term-list-item-grid .term-items-grid img:first-of-type {
-          grid-column-start: 1;
-          grid-column-end: span 2;
-          grid-row-start: 1;
-          grid-row-end: span 2; }
+          flex-basis: 100%;
+          -ms-grid-column: 1;
+          -ms-grid-column-span: 2;
+          -ms-grid-row: 1;
+          -ms-grid-row-span: 2;
+          grid-column: 1/3;
+          grid-row: 1/3; }
         .wp-block-tainacan-carousel-terms-list .tainacan-carousel .swiper-container .swiper-slide.term-list-item-grid .term-items-grid img {
+          flex-basis: 50%;
           width: 100%;
           height: auto;
           padding: 2px;
@@ -389,15 +408,22 @@
         background-color: white !important;
         border: 1px solid #cbcbcb !important; }
       .wp-block-tainacan-carousel-terms-list ul.terms-list-edit li.term-list-item .term-items-grid {
+        flex-wrap: wrap;
+        display: flex;
+        display: -ms-grid;
         display: grid;
         grid-template-columns: 33% 33% 33%;
         grid-template-rows: 50% 50%; }
         .wp-block-tainacan-carousel-terms-list ul.terms-list-edit li.term-list-item .term-items-grid img:first-of-type {
-          grid-column-start: 1;
-          grid-column-end: span 2;
-          grid-row-start: 1;
-          grid-row-end: span 2; }
+          flex-basis: 100%;
+          -ms-grid-column: 1;
+          -ms-grid-column-span: 2;
+          -ms-grid-row: 1;
+          -ms-grid-row-span: 2;
+          grid-column: 1/3;
+          grid-row: 1/3; }
         .wp-block-tainacan-carousel-terms-list ul.terms-list-edit li.term-list-item .term-items-grid img {
+          flex-basis: 50%;
           padding: 2px;
           margin-bottom: 0px; }
   @media only screen and (max-width: 1686px) {
diff --git a/src/assets/css/tainacan-gutenberg-block-carousel-terms-list.css.map b/src/assets/css/tainacan-gutenberg-block-carousel-terms-list.css.map
index 1154d64f7..be9878222 100644
--- a/src/assets/css/tainacan-gutenberg-block-carousel-terms-list.css.map
+++ b/src/assets/css/tainacan-gutenberg-block-carousel-terms-list.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../../gutenberg-blocks/gutenberg-blocks-style.scss","../../gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list.scss"],
 "names": [],
 "file": "tainacan-gutenberg-block-carousel-terms-list.css"
diff --git a/src/assets/css/tainacan-gutenberg-block-collections-list.css b/src/assets/css/tainacan-gutenberg-block-collections-list.css
index 91013494f..e6697328b 100644
--- a/src/assets/css/tainacan-gutenberg-block-collections-list.css
+++ b/src/assets/css/tainacan-gutenberg-block-collections-list.css
@@ -95,8 +95,11 @@
   .wp-block-tainacan-modal .modal-checkbox-list,
   .wp-block-tainacan-modal .modal-radio-list .components-base-control__field {
     padding: 0;
+    flex-wrap: wrap;
+    display: flex;
     display: -ms-grid;
     display: grid;
+    -ms-grid-columns: 250px 250px;
     grid-template-columns: repeat(auto-fill, 250px);
     grid-gap: 0px;
     justify-content: space-evenly;
@@ -156,7 +159,7 @@
       color: #454647; }
 
 .wp-block-tainacan-collections-list {
-  margin: 2rem 0px; }
+  margin: 2rem auto; }
   .wp-block-tainacan-collections-list .components-spinner {
     position: absolute;
     right: 0; }
@@ -178,8 +181,11 @@
   .wp-block-tainacan-collections-list ul.collections-list.collections-layout-grid,
   .wp-block-tainacan-collections-list ul.collections-list-edit.collections-layout-grid {
     padding: 0;
+    flex-wrap: wrap;
+    display: flex;
     display: -ms-grid;
     display: grid;
+    -ms-grid-columns: 220px 220px 220px 220px 220px;
     grid-template-columns: repeat(auto-fill, 220px);
     grid-gap: 0px;
     justify-content: space-evenly;
diff --git a/src/assets/css/tainacan-gutenberg-block-collections-list.css.map b/src/assets/css/tainacan-gutenberg-block-collections-list.css.map
index b1e936598..56fd31195 100644
--- a/src/assets/css/tainacan-gutenberg-block-collections-list.css.map
+++ b/src/assets/css/tainacan-gutenberg-block-collections-list.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../../gutenberg-blocks/gutenberg-blocks-style.scss","../../gutenberg-blocks/tainacan-collections/collections-list/collections-list.scss"],
 "names": [],
 "file": "tainacan-gutenberg-block-collections-list.css"
diff --git a/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css b/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css
index 3ae19eb4a..76f29e468 100644
--- a/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css
+++ b/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css
@@ -95,8 +95,11 @@
   .wp-block-tainacan-modal .modal-checkbox-list,
   .wp-block-tainacan-modal .modal-radio-list .components-base-control__field {
     padding: 0;
+    flex-wrap: wrap;
+    display: flex;
     display: -ms-grid;
     display: grid;
+    -ms-grid-columns: 250px 250px;
     grid-template-columns: repeat(auto-fill, 250px);
     grid-gap: 0px;
     justify-content: space-evenly;
@@ -156,7 +159,7 @@
       color: #454647; }
 
 .wp-block-tainacan-dynamic-items-list {
-  margin: 2rem 0px; }
+  margin: 2rem auto; }
   .wp-block-tainacan-dynamic-items-list .spinner-container {
     min-height: 56px;
     padding: 1rem;
@@ -164,6 +167,8 @@
     justify-content: center;
     align-items: center;
     color: #555758; }
+  .wp-block-tainacan-dynamic-items-list:hover .components-resizable-box__handle {
+    display: block; }
 @-webkit-keyframes skeleton-animation {
   0% {
     opacity: 1.0; }
@@ -221,12 +226,13 @@
       .wp-block-tainacan-dynamic-items-list .dynamic-items-collection-header .collection-name h3 {
         color: white;
         text-decoration: none;
-        font-size: 1.3rem; }
+        font-size: 1.3em;
+        margin: 0; }
         .wp-block-tainacan-dynamic-items-list .dynamic-items-collection-header .collection-name h3:hover {
           text-decoration: none; }
       .wp-block-tainacan-dynamic-items-list .dynamic-items-collection-header .collection-name span.label {
         font-weight: normal;
-        font-size: 1rem; }
+        font-size: 0.75em; }
       .wp-block-tainacan-dynamic-items-list .dynamic-items-collection-header .collection-name.only-collection-name {
         justify-content: center;
         padding: 1rem; }
@@ -334,57 +340,28 @@
         width: 100%;
         border: 1px solid #cbcbcb;
         box-shadow: none; }
-  .wp-block-tainacan-dynamic-items-list ul.items-list.items-list-without-margin,
-  .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-list-without-margin {
+  .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-list.items-list-without-margin,
+  .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-list.items-list-without-margin,
+  .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-grid.items-list-without-margin,
+  .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-grid.items-list-without-margin {
     grid-template-columns: repeat(auto-fill, 185px);
     justify-content: center !important;
     grid-template-rows: auto !important;
     list-style: none; }
-    .wp-block-tainacan-dynamic-items-list ul.items-list.items-list-without-margin li,
-    .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-list-without-margin li {
+    .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-list.items-list-without-margin li,
+    .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-list.items-list-without-margin li,
+    .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-grid.items-list-without-margin li,
+    .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-grid.items-list-without-margin li {
       margin-top: 0 !important;
       margin-right: 0 !important;
       margin-left: 0 !important;
       height: 185px !important; }
-      .wp-block-tainacan-dynamic-items-list ul.items-list.items-list-without-margin li img,
-      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-list-without-margin li img {
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-list.items-list-without-margin li img,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-list.items-list-without-margin li img,
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-grid.items-list-without-margin li img,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-grid.items-list-without-margin li img {
         height: 185px !important;
         margin-bottom: 0px !important; }
-  .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-grid,
-  .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-grid {
-    padding: 0;
-    display: -ms-grid;
-    display: grid;
-    grid-template-columns: repeat(auto-fill, 220px);
-    grid-gap: 0px;
-    justify-content: space-evenly;
-    list-style-type: none; }
-    .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-grid li.item-list-item,
-    .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-grid li.item-list-item {
-      position: relative;
-      display: block;
-      margin: 12px 12px 24px 12px;
-      margin-bottom: 12px;
-      width: 185px; }
-      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-grid li.item-list-item a,
-      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-grid li.item-list-item a {
-        color: #454647;
-        font-weight: bold;
-        line-height: normal; }
-      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-grid li.item-list-item img,
-      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-grid li.item-list-item img {
-        height: auto;
-        width: 185px;
-        min-width: 185px;
-        padding: 0px;
-        margin-bottom: 0.5rem; }
-      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-grid li.item-list-item a.item-without-title span,
-      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-grid li.item-list-item a.item-without-title span {
-        display: none; }
-      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-grid li.item-list-item:hover a,
-      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-grid li.item-list-item:hover a {
-        color: #454647;
-        text-decoration: none; }
   .wp-block-tainacan-dynamic-items-list ul.items-list-edit li.item-list-item {
     display: flex;
     align-items: flex-start; }
@@ -414,6 +391,45 @@
     .wp-block-tainacan-dynamic-items-list ul.items-list-edit li.item-list-item:hover button:hover {
       background-color: white !important;
       border: 1px solid #cbcbcb !important; }
+  .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-grid,
+  .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-grid {
+    padding: 0;
+    flex-wrap: wrap;
+    display: flex;
+    display: -ms-grid;
+    display: grid;
+    -ms-grid-columns: 220px 220px 220px 220px 220px;
+    grid-template-columns: repeat(auto-fill, 220px);
+    grid-gap: 0px;
+    justify-content: space-evenly;
+    list-style-type: none;
+    margin: 0; }
+    .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-grid li.item-list-item,
+    .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-grid li.item-list-item {
+      position: relative;
+      display: block;
+      margin: 12px 12px 24px 12px;
+      margin-bottom: 12px;
+      width: 185px; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-grid li.item-list-item a,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-grid li.item-list-item a {
+        color: #454647;
+        font-weight: bold;
+        line-height: normal; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-grid li.item-list-item img,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-grid li.item-list-item img {
+        height: auto;
+        width: 185px;
+        min-width: 185px;
+        padding: 0px;
+        margin-bottom: 0.5rem; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-grid li.item-list-item a.item-without-title span,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-grid li.item-list-item a.item-without-title span {
+        display: none; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-grid li.item-list-item:hover a,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-grid li.item-list-item:hover a {
+        color: #454647;
+        text-decoration: none; }
   @media only screen and (max-width: 498px) {
     .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-grid,
     .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-grid {
@@ -430,7 +446,8 @@
     display: flex;
     flex-wrap: wrap;
     align-items: center;
-    list-style-type: none; }
+    list-style-type: none;
+    margin: 0; }
     .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-list li.item-list-item,
     .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-list li.item-list-item {
       position: relative;
@@ -481,5 +498,389 @@
         .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-list li.item-list-item {
           min-width: calc(100% - 24px);
           width: calc(100% - 24px); } }
+  .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic,
+  .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic {
+    width: auto;
+    display: flex;
+    list-style: none;
+    min-height: 280px;
+    margin: 0; }
+    .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container,
+    .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container {
+      padding: 0;
+      justify-content: stretch;
+      flex-wrap: wrap;
+      display: flex;
+      display: -ms-grid;
+      display: grid;
+      -ms-grid-columns: 150px 150px 150px;
+      grid-template-columns: repeat(3, 150px);
+      grid-auto-flow: dense;
+      width: 100%;
+      list-style-type: none; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container:not(:first-of-type),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container:not(:first-of-type) {
+        margin-left: 0 !important; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container li.item-list-item,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container li.item-list-item {
+        flex-grow: 1;
+        justify-self: stretch;
+        position: relative;
+        min-width: 100%;
+        background-size: cover;
+        background-position: center;
+        margin: 0; }
+        .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container li.item-list-item a,
+        .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container li.item-list-item a {
+          width: 100%;
+          height: 100%;
+          display: block;
+          color: #454647;
+          font-weight: bold;
+          line-height: normal; }
+        .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container li.item-list-item img,
+        .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container li.item-list-item img {
+          display: none; }
+        .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container li.item-list-item a span,
+        .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container li.item-list-item a span {
+          display: block;
+          position: absolute;
+          background: rgba(255, 255, 255, 0.75);
+          bottom: 0;
+          opacity: 0;
+          padding: 8px 12px;
+          word-break: break-word;
+          transition: opacity 0.5s ease; }
+        .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container li.item-list-item:hover a span,
+        .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container li.item-list-item:hover a span {
+          opacity: 1; }
+        .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container li.item-list-item a.item-without-title span,
+        .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container li.item-list-item a.item-without-title span {
+          display: none; }
+        .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container li.item-list-item:hover a,
+        .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container li.item-list-item:hover a {
+          color: #454647;
+          text-decoration: none; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--1-2x3 li.item-list-item,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--1-2x3 li.item-list-item {
+        grid-row: span 2;
+        grid-column: span 3; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--2-2x3 li.item-list-item,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--2-2x3 li.item-list-item {
+        grid-row: span 1;
+        grid-column: span 3; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--3-2x3 li.item-list-item:nth-of-type(1),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--3-2x3 li.item-list-item:nth-of-type(1) {
+        grid-row: span 1;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-2x3 li.item-list-item:nth-of-type(1), .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-2x3 li.item-list-item:nth-of-type(3),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-2x3 li.item-list-item:nth-of-type(1),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-2x3 li.item-list-item:nth-of-type(3) {
+        grid-row: span 1;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--5-2x3 li.item-list-item:nth-of-type(2),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--5-2x3 li.item-list-item:nth-of-type(2) {
+        grid-row: span 2;
+        grid-column: span 1; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--1-3x2 li.item-list-item,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--1-3x2 li.item-list-item {
+        grid-row: span 3;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--2-3x2 li.item-list-item,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--2-3x2 li.item-list-item {
+        grid-row: span 3;
+        grid-column: span 1; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--3-3x2 li.item-list-item:nth-of-type(1),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--3-3x2 li.item-list-item:nth-of-type(1) {
+        grid-row: span 2;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-3x2 li.item-list-item:nth-of-type(1), .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-3x2 li.item-list-item:nth-of-type(3),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-3x2 li.item-list-item:nth-of-type(1),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-3x2 li.item-list-item:nth-of-type(3) {
+        grid-row: span 2;
+        grid-column: span 1; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--5-3x2 li.item-list-item:nth-of-type(3),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--5-3x2 li.item-list-item:nth-of-type(3) {
+        grid-row: span 1;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--1-3x3 li.item-list-item,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--1-3x3 li.item-list-item {
+        grid-row: span 3;
+        grid-column: span 3; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--2-3x3 li.item-list-item:first-of-type,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--2-3x3 li.item-list-item:first-of-type {
+        grid-row: span 1;
+        grid-column: span 3; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--2-3x3 li.item-list-item:last-of-type,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--2-3x3 li.item-list-item:last-of-type {
+        grid-row: span 2;
+        grid-column: span 3; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--3-3x3 li.item-list-item:nth-of-type(1),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--3-3x3 li.item-list-item:nth-of-type(1) {
+        grid-row: span 2;
+        grid-column: span 3; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--3-3x3 li.item-list-item:nth-of-type(3),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--3-3x3 li.item-list-item:nth-of-type(3) {
+        grid-row: span 1;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-3x3 li.item-list-item:nth-of-type(1),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-3x3 li.item-list-item:nth-of-type(1) {
+        grid-row: span 2;
+        grid-column: span 1; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-3x3 li.item-list-item:nth-of-type(2),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-3x3 li.item-list-item:nth-of-type(2) {
+        grid-row: span 2;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-3x3 li.item-list-item:nth-of-type(3),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-3x3 li.item-list-item:nth-of-type(3) {
+        grid-row: span 1;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--5-3x3 li.item-list-item:nth-of-type(1),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--5-3x3 li.item-list-item:nth-of-type(1) {
+        grid-row: span 1;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--5-3x3 li.item-list-item:nth-of-type(4),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--5-3x3 li.item-list-item:nth-of-type(4) {
+        grid-row: span 2;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-3x3 li.item-list-item:nth-of-type(3),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-3x3 li.item-list-item:nth-of-type(3) {
+        grid-row: span 2;
+        grid-column: span 1; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-3x3 li.item-list-item:nth-of-type(4), .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-3x3 li.item-list-item:nth-of-type(6),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-3x3 li.item-list-item:nth-of-type(4),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-3x3 li.item-list-item:nth-of-type(6) {
+        grid-row: span 1;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--1-3x4 li.item-list-item,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--1-3x4 li.item-list-item {
+        grid-row: span 3;
+        grid-column: span 4; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--2-3x4 li.item-list-item,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--2-3x4 li.item-list-item {
+        grid-row: span 3;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--3-3x4 li.item-list-item:nth-of-type(1),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--3-3x4 li.item-list-item:nth-of-type(1) {
+        grid-row: span 3;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--3-3x4 li.item-list-item:nth-of-type(2),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--3-3x4 li.item-list-item:nth-of-type(2) {
+        grid-row: span 2;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--3-3x4 li.item-list-item:nth-of-type(3),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--3-3x4 li.item-list-item:nth-of-type(3) {
+        grid-row: span 1;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-3x4 li.item-list-item:nth-of-type(1), .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-3x4 li.item-list-item:nth-of-type(4),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-3x4 li.item-list-item:nth-of-type(1),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-3x4 li.item-list-item:nth-of-type(4) {
+        grid-row: span 2;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-3x4 li.item-list-item:nth-of-type(2), .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-3x4 li.item-list-item:nth-of-type(3),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-3x4 li.item-list-item:nth-of-type(2),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-3x4 li.item-list-item:nth-of-type(3) {
+        grid-row: span 1;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--5-3x4 li.item-list-item:nth-of-type(1), .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--5-3x4 li.item-list-item:nth-of-type(3),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--5-3x4 li.item-list-item:nth-of-type(1),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--5-3x4 li.item-list-item:nth-of-type(3) {
+        grid-row: span 2;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--5-3x4 li.item-list-item:nth-of-type(2),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--5-3x4 li.item-list-item:nth-of-type(2) {
+        grid-row: span 1;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-3x4 li.item-list-item:nth-of-type(2), .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-3x4 li.item-list-item:nth-of-type(6),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-3x4 li.item-list-item:nth-of-type(2),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-3x4 li.item-list-item:nth-of-type(6) {
+        grid-row: span 1;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-3x4 li.item-list-item:nth-of-type(3),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-3x4 li.item-list-item:nth-of-type(3) {
+        grid-row: span 2;
+        grid-column: span 1; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-3x4 li.item-list-item:nth-of-type(4),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-3x4 li.item-list-item:nth-of-type(4) {
+        grid-row: span 2;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--1-4x3 li.item-list-item,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--1-4x3 li.item-list-item {
+        grid-row: span 4;
+        grid-column: span 3; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--2-4x3 li.item-list-item,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--2-4x3 li.item-list-item {
+        grid-row: span 2;
+        grid-column: span 3; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--3-4x3 li.item-list-item:nth-of-type(1),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--3-4x3 li.item-list-item:nth-of-type(1) {
+        grid-row: span 2;
+        grid-column: span 3; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--3-4x3 li.item-list-item:nth-of-type(2),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--3-4x3 li.item-list-item:nth-of-type(2) {
+        grid-row: span 2;
+        grid-column: span 1; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--3-4x3 li.item-list-item:nth-of-type(3),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--3-4x3 li.item-list-item:nth-of-type(3) {
+        grid-row: span 2;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-4x3 li.item-list-item:nth-of-type(1),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-4x3 li.item-list-item:nth-of-type(1) {
+        grid-row: span 2;
+        grid-column: span 1; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-4x3 li.item-list-item:nth-of-type(2),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-4x3 li.item-list-item:nth-of-type(2) {
+        grid-row: span 1;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-4x3 li.item-list-item:nth-of-type(4),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-4x3 li.item-list-item:nth-of-type(4) {
+        grid-row: span 2;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--5-4x3 li.item-list-item:nth-of-type(2), .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--5-4x3 li.item-list-item:nth-of-type(4),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--5-4x3 li.item-list-item:nth-of-type(2),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--5-4x3 li.item-list-item:nth-of-type(4) {
+        grid-row: span 2;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--5-4x3 li.item-list-item:nth-of-type(5),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--5-4x3 li.item-list-item:nth-of-type(5) {
+        grid-row: span 2;
+        grid-column: span 1; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-4x3 li.item-list-item:nth-of-type(2),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-4x3 li.item-list-item:nth-of-type(2) {
+        grid-row: span 2;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-4x3 li.item-list-item:nth-of-type(3), .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-4x3 li.item-list-item:nth-of-type(6),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-4x3 li.item-list-item:nth-of-type(3),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-4x3 li.item-list-item:nth-of-type(6) {
+        grid-row: span 2;
+        grid-column: span 1; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-4x3 li.item-list-item:nth-of-type(5),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-4x3 li.item-list-item:nth-of-type(5) {
+        grid-row: span 1;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--1-4x5 li.item-list-item,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--1-4x5 li.item-list-item {
+        grid-row: span 4;
+        grid-column: span 5; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--2-4x5 li.item-list-item,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--2-4x5 li.item-list-item {
+        grid-row: span 2;
+        grid-column: span 5; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--3-4x5 li.item-list-item:nth-of-type(1),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--3-4x5 li.item-list-item:nth-of-type(1) {
+        grid-row: span 2;
+        grid-column: span 5; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--3-4x5 li.item-list-item:nth-of-type(2),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--3-4x5 li.item-list-item:nth-of-type(2) {
+        grid-row: span 2;
+        grid-column: span 3; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--3-4x5 li.item-list-item:nth-of-type(3),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--3-4x5 li.item-list-item:nth-of-type(3) {
+        grid-row: span 2;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-4x5 li.item-list-item:nth-of-type(1), .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-4x5 li.item-list-item:nth-of-type(4),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-4x5 li.item-list-item:nth-of-type(1),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-4x5 li.item-list-item:nth-of-type(4) {
+        grid-row: span 2;
+        grid-column: span 3; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-4x5 li.item-list-item:nth-of-type(2), .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-4x5 li.item-list-item:nth-of-type(3),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-4x5 li.item-list-item:nth-of-type(2),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-4x5 li.item-list-item:nth-of-type(3) {
+        grid-row: span 2;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--5-4x5 li.item-list-item:nth-of-type(3), .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--5-4x5 li.item-list-item:nth-of-type(5),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--5-4x5 li.item-list-item:nth-of-type(3),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--5-4x5 li.item-list-item:nth-of-type(5) {
+        grid-row: span 2;
+        grid-column: span 3; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--5-4x5 li.item-list-item:nth-of-type(4),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--5-4x5 li.item-list-item:nth-of-type(4) {
+        grid-row: span 3;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-4x5 li.item-list-item:nth-of-type(1),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-4x5 li.item-list-item:nth-of-type(1) {
+        grid-row: span 2;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-4x5 li.item-list-item:nth-of-type(3),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-4x5 li.item-list-item:nth-of-type(3) {
+        grid-row: span 3;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-4x5 li.item-list-item:nth-of-type(5),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-4x5 li.item-list-item:nth-of-type(5) {
+        grid-row: span 2;
+        grid-column: span 3; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-4x5 li.item-list-item:nth-of-type(6),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-4x5 li.item-list-item:nth-of-type(6) {
+        grid-row: span 1;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--1-5x4 li.item-list-item,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--1-5x4 li.item-list-item {
+        grid-row: span 5;
+        grid-column: span 4; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--2-5x4 li.item-list-item,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--2-5x4 li.item-list-item {
+        grid-row: span 5;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--3-5x4 li.item-list-item:nth-of-type(1),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--3-5x4 li.item-list-item:nth-of-type(1) {
+        grid-row: span 3;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--3-5x4 li.item-list-item:nth-of-type(2),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--3-5x4 li.item-list-item:nth-of-type(2) {
+        grid-row: span 5;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--3-5x4 li.item-list-item:nth-of-type(3),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--3-5x4 li.item-list-item:nth-of-type(3) {
+        grid-row: span 2;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-5x4 li.item-list-item:nth-of-type(1), .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-5x4 li.item-list-item:nth-of-type(3),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-5x4 li.item-list-item:nth-of-type(1),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-5x4 li.item-list-item:nth-of-type(3) {
+        grid-row: span 3;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-5x4 li.item-list-item:nth-of-type(2), .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--4-5x4 li.item-list-item:nth-of-type(4),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-5x4 li.item-list-item:nth-of-type(2),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--4-5x4 li.item-list-item:nth-of-type(4) {
+        grid-row: span 2;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--5-5x4 li.item-list-item:nth-of-type(1), .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--5-5x4 li.item-list-item:nth-of-type(3), .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--5-5x4 li.item-list-item:nth-of-type(5),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--5-5x4 li.item-list-item:nth-of-type(1),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--5-5x4 li.item-list-item:nth-of-type(3),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--5-5x4 li.item-list-item:nth-of-type(5) {
+        grid-row: span 2;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--5-5x4 li.item-list-item:nth-of-type(2),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--5-5x4 li.item-list-item:nth-of-type(2) {
+        grid-row: span 1;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--5-5x4 li.item-list-item:nth-of-type(4),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--5-5x4 li.item-list-item:nth-of-type(4) {
+        grid-row: span 3;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-5x4 li.item-list-item:nth-of-type(1), .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-5x4 li.item-list-item:nth-of-type(5),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-5x4 li.item-list-item:nth-of-type(1),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-5x4 li.item-list-item:nth-of-type(5) {
+        grid-row: span 2;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-5x4 li.item-list-item:nth-of-type(2),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-5x4 li.item-list-item:nth-of-type(2) {
+        grid-row: span 3;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-5x4 li.item-list-item:nth-of-type(3),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-5x4 li.item-list-item:nth-of-type(3) {
+        grid-row: span 1;
+        grid-column: span 2; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-5x4 li.item-list-item:nth-of-type(4), .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container.mosaic-container--6-5x4 li.item-list-item:nth-of-type(6),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-5x4 li.item-list-item:nth-of-type(4),
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container.mosaic-container--6-5x4 li.item-list-item:nth-of-type(6) {
+        grid-row: span 2;
+        grid-column: span 1; }
+  @media only screen and (max-width: 1024px) {
+    .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic,
+    .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic {
+      overflow-x: auto; }
+      .wp-block-tainacan-dynamic-items-list ul.items-list.items-layout-mosaic .mosaic-container,
+      .wp-block-tainacan-dynamic-items-list ul.items-list-edit.items-layout-mosaic .mosaic-container {
+        min-width: 240px; } }
 
 /*# sourceMappingURL=tainacan-gutenberg-block-dynamic-items-list.css.map */
diff --git a/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css.map b/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css.map
index d4da35c98..dbf676d9f 100644
--- a/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css.map
+++ b/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../../gutenberg-blocks/gutenberg-blocks-style.scss","../../gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list.scss"],
 "names": [],
 "file": "tainacan-gutenberg-block-dynamic-items-list.css"
diff --git a/src/assets/css/tainacan-gutenberg-block-facets-list.css b/src/assets/css/tainacan-gutenberg-block-facets-list.css
index a82d0bb40..109d0a0ef 100644
--- a/src/assets/css/tainacan-gutenberg-block-facets-list.css
+++ b/src/assets/css/tainacan-gutenberg-block-facets-list.css
@@ -95,8 +95,11 @@
   .wp-block-tainacan-modal .modal-checkbox-list,
   .wp-block-tainacan-modal .modal-radio-list .components-base-control__field {
     padding: 0;
+    flex-wrap: wrap;
+    display: flex;
     display: -ms-grid;
     display: grid;
+    -ms-grid-columns: 250px 250px;
     grid-template-columns: repeat(auto-fill, 250px);
     grid-gap: 0px;
     justify-content: space-evenly;
@@ -156,7 +159,7 @@
       color: #454647; }
 
 .wp-block-tainacan-facets-list {
-  margin: 2rem 0px; }
+  margin: 2rem auto; }
   .wp-block-tainacan-facets-list .spinner-container {
     min-height: 56px;
     padding: 1rem;
@@ -221,12 +224,13 @@
       .wp-block-tainacan-facets-list .facets-collection-header .collection-name h3 {
         color: white;
         text-decoration: none;
-        font-size: 1.3rem; }
+        font-size: 1.3em;
+        margin: 0; }
         .wp-block-tainacan-facets-list .facets-collection-header .collection-name h3:hover {
           text-decoration: none; }
       .wp-block-tainacan-facets-list .facets-collection-header .collection-name span.label {
         font-weight: normal;
-        font-size: 1rem; }
+        font-size: 0.75em; }
       .wp-block-tainacan-facets-list .facets-collection-header .collection-name.only-collection-name {
         justify-content: center;
         padding: 1rem; }
@@ -337,8 +341,11 @@
   .wp-block-tainacan-facets-list ul.facets-list.facets-layout-grid,
   .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-grid {
     padding: 0;
+    flex-wrap: wrap;
+    display: flex;
     display: -ms-grid;
     display: grid;
+    -ms-grid-columns: 220px 220px 220px 220px 220px;
     grid-template-columns: repeat(auto-fill, 220px);
     grid-gap: 0px;
     justify-content: space-evenly;
@@ -493,9 +500,8 @@
       .wp-block-tainacan-facets-list ul.facets-list.facets-layout-cloud li.facet-list-item a,
       .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-cloud li.facet-list-item a {
         color: #454647;
-        display: flex;
-        align-items: center;
-        height: 54px; }
+        display: inline;
+        min-height: 54px; }
       .wp-block-tainacan-facets-list ul.facets-list.facets-layout-cloud li.facet-list-item img,
       .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-cloud li.facet-list-item img {
         height: auto;
diff --git a/src/assets/css/tainacan-gutenberg-block-facets-list.css.map b/src/assets/css/tainacan-gutenberg-block-facets-list.css.map
index 5573e94ba..e221797cb 100644
--- a/src/assets/css/tainacan-gutenberg-block-facets-list.css.map
+++ b/src/assets/css/tainacan-gutenberg-block-facets-list.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../../gutenberg-blocks/gutenberg-blocks-style.scss","../../gutenberg-blocks/tainacan-facets/facets-list/facets-list.scss"],
 "names": [],
 "file": "tainacan-gutenberg-block-facets-list.css"
diff --git a/src/assets/css/tainacan-gutenberg-block-items-list.css b/src/assets/css/tainacan-gutenberg-block-items-list.css
index eba9f0fd8..66db5a5da 100644
--- a/src/assets/css/tainacan-gutenberg-block-items-list.css
+++ b/src/assets/css/tainacan-gutenberg-block-items-list.css
@@ -95,8 +95,11 @@
   .wp-block-tainacan-modal .modal-checkbox-list,
   .wp-block-tainacan-modal .modal-radio-list .components-base-control__field {
     padding: 0;
+    flex-wrap: wrap;
+    display: flex;
     display: -ms-grid;
     display: grid;
+    -ms-grid-columns: 250px 250px;
     grid-template-columns: repeat(auto-fill, 250px);
     grid-gap: 0px;
     justify-content: space-evenly;
@@ -156,7 +159,7 @@
       color: #454647; }
 
 .wp-block-tainacan-items-list {
-  margin: 2rem 0px; }
+  margin: 2rem auto; }
   .wp-block-tainacan-items-list .components-spinner {
     position: absolute;
     right: 0; }
@@ -178,8 +181,11 @@
   .wp-block-tainacan-items-list ul.items-list.items-layout-grid,
   .wp-block-tainacan-items-list ul.items-list-edit.items-layout-grid {
     padding: 0;
+    flex-wrap: wrap;
+    display: flex;
     display: -ms-grid;
     display: grid;
+    -ms-grid-columns: 220px 220px 220px 220px 220px;
     grid-template-columns: repeat(auto-fill, 220px);
     grid-gap: 0px;
     justify-content: space-evenly;
diff --git a/src/assets/css/tainacan-gutenberg-block-items-list.css.map b/src/assets/css/tainacan-gutenberg-block-items-list.css.map
index 090b01a1b..c264a1c4b 100644
--- a/src/assets/css/tainacan-gutenberg-block-items-list.css.map
+++ b/src/assets/css/tainacan-gutenberg-block-items-list.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../../gutenberg-blocks/gutenberg-blocks-style.scss","../../gutenberg-blocks/tainacan-items/items-list/items-list.scss"],
 "names": [],
 "file": "tainacan-gutenberg-block-items-list.css"
diff --git a/src/assets/css/tainacan-gutenberg-block-search-bar.css b/src/assets/css/tainacan-gutenberg-block-search-bar.css
index 848c2c2f9..1641a7501 100644
--- a/src/assets/css/tainacan-gutenberg-block-search-bar.css
+++ b/src/assets/css/tainacan-gutenberg-block-search-bar.css
@@ -95,8 +95,11 @@
   .wp-block-tainacan-modal .modal-checkbox-list,
   .wp-block-tainacan-modal .modal-radio-list .components-base-control__field {
     padding: 0;
+    flex-wrap: wrap;
+    display: flex;
     display: -ms-grid;
     display: grid;
+    -ms-grid-columns: 250px 250px;
     grid-template-columns: repeat(auto-fill, 250px);
     grid-gap: 0px;
     justify-content: space-evenly;
@@ -160,7 +163,7 @@
   justify-content: center; }
 
 .wp-block-tainacan-search-bar {
-  margin: 2rem 0px; }
+  margin: 2rem auto; }
   .wp-block-tainacan-search-bar .tainacan-search-container {
     width: 100%; }
     .wp-block-tainacan-search-bar .tainacan-search-container #taincan-search-bar-block {
diff --git a/src/assets/css/tainacan-gutenberg-block-search-bar.css.map b/src/assets/css/tainacan-gutenberg-block-search-bar.css.map
index c31372def..8c70f36c2 100644
--- a/src/assets/css/tainacan-gutenberg-block-search-bar.css.map
+++ b/src/assets/css/tainacan-gutenberg-block-search-bar.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../../gutenberg-blocks/gutenberg-blocks-style.scss","../../gutenberg-blocks/tainacan-items/search-bar/search-bar.scss"],
 "names": [],
 "file": "tainacan-gutenberg-block-search-bar.css"
diff --git a/src/assets/css/tainacan-gutenberg-block-terms-list.css b/src/assets/css/tainacan-gutenberg-block-terms-list.css
index 22876c722..786e39d98 100644
--- a/src/assets/css/tainacan-gutenberg-block-terms-list.css
+++ b/src/assets/css/tainacan-gutenberg-block-terms-list.css
@@ -95,8 +95,11 @@
   .wp-block-tainacan-modal .modal-checkbox-list,
   .wp-block-tainacan-modal .modal-radio-list .components-base-control__field {
     padding: 0;
+    flex-wrap: wrap;
+    display: flex;
     display: -ms-grid;
     display: grid;
+    -ms-grid-columns: 250px 250px;
     grid-template-columns: repeat(auto-fill, 250px);
     grid-gap: 0px;
     justify-content: space-evenly;
@@ -156,15 +159,18 @@
       color: #454647; }
 
 .wp-block-tainacan-terms-list {
-  margin: 2rem 0px; }
+  margin: 2rem auto; }
   .wp-block-tainacan-terms-list .components-spinner {
     position: absolute;
     right: 0; }
   .wp-block-tainacan-terms-list ul.terms-list.terms-layout-grid,
   .wp-block-tainacan-terms-list ul.terms-list-edit.terms-layout-grid {
     padding: 0;
+    flex-wrap: wrap;
+    display: flex;
     display: -ms-grid;
     display: grid;
+    -ms-grid-columns: 220px 220px 220px 220px 220px;
     grid-template-columns: repeat(auto-fill, 220px);
     grid-gap: 0px;
     justify-content: space-evenly;
diff --git a/src/assets/css/tainacan-gutenberg-block-terms-list.css.map b/src/assets/css/tainacan-gutenberg-block-terms-list.css.map
index a045be416..bc8811f3b 100644
--- a/src/assets/css/tainacan-gutenberg-block-terms-list.css.map
+++ b/src/assets/css/tainacan-gutenberg-block-terms-list.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../../gutenberg-blocks/gutenberg-blocks-style.scss","../../gutenberg-blocks/tainacan-terms/terms-list/terms-list.scss"],
 "names": [],
 "file": "tainacan-gutenberg-block-terms-list.css"
diff --git a/src/classes/class-tainacan-elastic-press.php b/src/classes/class-tainacan-elastic-press.php
index 10104c2f9..f55822ced 100644
--- a/src/classes/class-tainacan-elastic-press.php
+++ b/src/classes/class-tainacan-elastic-press.php
@@ -81,9 +81,9 @@ class Elastic_Press {
 
 		if ($item instanceof Entities\Item) {
 			$ids_meta = array_keys ($post_args['meta']);
-			\array_filter(function($n) {
+			$ids_meta = \array_filter($ids_meta, function($n) {
 				if (is_numeric($n)) return intval($n);
-			}, $ids_meta);
+			});
 
 			$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
 			$Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
@@ -584,7 +584,7 @@ class Elastic_Press {
 				}
 
 				if($search != '') {
-					$formatted_args['query']['bool']['must'][] = ["wildcard"=>["$field.name.raw" => "*$search*"]];
+					$formatted_args['query']['bool']['must'][] = ["wildcard"=>["$field.name.sortable" => "*$search*"]];
 				}
 			} else {
 				$aggs[$id] = [
@@ -613,7 +613,7 @@ class Elastic_Press {
 					$field_relationship_label = "$field_relationship_label[0].$field_relationship_label[1].relationship_label";
 					//$formatted_args['query']['bool']['must'][] = ["wildcard"=>["$field" => "*$search*"]];
 					$formatted_args['query']['bool']['must'][] = ["bool"=>["should"=>[
-						["wildcard"=>["$field"=>"*$search*"]],
+						["wildcard"=>["$id.value.sortable"=>"*$search*"]],
 						["wildcard"=>["$field_relationship_label"=>"*$search*"]] //pega nome do metadado é melhor!
 					]]];
 				}
diff --git a/src/classes/class-tainacan-media.php b/src/classes/class-tainacan-media.php
index 207f1cdb6..da8d7dcb0 100644
--- a/src/classes/class-tainacan-media.php
+++ b/src/classes/class-tainacan-media.php
@@ -5,58 +5,78 @@ namespace Tainacan;
  * Class withe helpful methods to handle media in Tainacan
  */
 class Media {
-	
+
 	private static $instance = null;
 	private static $file_handle = null;
 	private static $file_name = null;
+	private $attachment_html_url_base = 'tainacan_attachment_html';
 
-		public static function get_instance() {
-				if(!isset(self::$instance)) {
-						self::$instance = new self();
-				}
+	public static function get_instance() {
+			if(!isset(self::$instance)) {
+					self::$instance = new self();
+			}
 
-				return self::$instance;
-		}
+			return self::$instance;
+	}
+
+	protected function __construct() {
+		add_action( 'init', [$this, 'add_attachment_page_rewrite_rule'] );
+		add_filter( 'query_vars', [$this, 'attachment_page_add_var'] );
+		add_action( 'template_redirect', [$this, 'attachment_page'] );
+	}
+
+	public function add_attachment_page_rewrite_rule() {
+		add_rewrite_rule(
+			'^' . $this->attachment_html_url_base . '/([0-9]+)/?',
+			'index.php?tainacan_attachment_page=$matches[1]',
+			'top'
+		);
+	}
+
+	public function attachment_page_add_var($vars) {
+		$vars[] = 'tainacan_attachment_page';
+		return $vars;
+	}
 
 	/**
 	 * Insert an attachment from an URL address.
 	 *
-	 * @param  String $url 
+	 * @param  String $url
 	 * @param  Int    $post_id (optional) the post this attachement should be attached to. empty for none
 	 * @return Int|false    Attachment ID. False on failure
 	 */
 	public function insert_attachment_from_url($url, $post_id = null) {
 		$filename = $this->save_remote_file($url);
-		
+
 		if( !file_exists($filename) ) {
 			return false;
 		}
-		
+
 		$file = fopen($filename,'r');
-		
+
 		if (false === $file) {
 			return false;
 		}
 
 		return $this->insert_attachment_from_blob($file, basename($url), $post_id);
-		
+
 	}
 
 	/**
 	 * Insert an attachment from a local file.
 	 *
-	 * @param  String $filename The path to the file 
+	 * @param  String $filename The path to the file
 	 * @param  Int    $post_id (optional) the post this attachement should be attached to. empty for none
 	 * @return Int|false    Attachment ID. False on failure
 	 */
 	public function insert_attachment_from_file($filename, $post_id = null) {
-		
+
 		if( !file_exists($filename) ) {
 			return false;
 		}
-		
+
 		return $this->insert_attachment_from_blob(fopen($filename,'r'), basename($filename), $post_id);
-		
+
 	}
 
 		/**
@@ -121,7 +141,7 @@ class Media {
 	public function insert_attachment_from_blob($blob, $filename, $post_id = null) {
 
 		do_action('tainacan-pre-insert-attachment', $blob, $filename, $post_id);
-		
+
 		$upload = wp_upload_bits( $filename, null, $blob );
 		if( !empty( $upload['error'] ) ) {
 			return false;
@@ -130,7 +150,7 @@ class Media {
 		if( @filesize($upload['file']) == 0 && is_resource($blob) ){
 			$file_wordpress_stream = fopen( $upload['file'], 'r+');
 			stream_copy_to_stream($blob, $file_wordpress_stream);
-			
+
 			if( file_exists(self::$file_name) ) unlink(self::$file_name);
 		}
 
@@ -139,12 +159,12 @@ class Media {
 		$file_type = wp_check_filetype( $file_name, null );
 		$attachment_title = sanitize_file_name( pathinfo( $file_name, PATHINFO_FILENAME ) );
 		$wp_upload_dir = wp_upload_dir();
-		
+
 		$guid = \str_replace($wp_upload_dir['basedir'], '', $file_path);
 		$guid = $wp_upload_dir['baseurl'] .  $guid;
 
 		$post_info = array(
-			'guid'				=> $guid, 
+			'guid'				=> $guid,
 			'post_mime_type'	=> $file_type['type'],
 			'post_title'		=> $attachment_title,
 			'post_content'		=> '',
@@ -162,12 +182,12 @@ class Media {
 
 		// Assign metadata to attachment
 		wp_update_attachment_metadata( $attach_id,  $attach_data );
-		
+
 		do_action('tainacan-post-insert-attachment', $attach_id,  $attach_data, $post_id);
-		
+
 		return $attach_id;
 	}
-	
+
 	/**
 	 * Add support to get mime type content even when mime_content_type function is not available
 	 * @param  string $filename The file name to check the mime type
@@ -183,10 +203,10 @@ class Media {
 			return $mime_type;
 		}
 	}
-	
+
 	/**
 	 * Extract an image from the first page of a pdf file
-	 * 
+	 *
 	 * @param  string $filepath The pdf filepath in the server
 	 * @return blob           bitstream of the image in jpg format
 	 */
@@ -195,11 +215,11 @@ class Media {
 		if ($blob) {
 			return $blob;
 		}
-		
+
 		if (!class_exists('\Imagick')) {
 			return null;
 		}
-		
+
 		if ( $this->get_mime_content_type($filepath) != 'application/pdf') {
 			return null;
 		}
@@ -207,10 +227,10 @@ class Media {
 		if ( !is_readable( realpath($filepath) ) ) {
 			return null;
 		}
-		
+
 		try {
 			register_shutdown_function(array($this, 'shutdown_function'));
-			$this->THROW_EXCPTION_ON_FATAL_ERROR = true; 
+			$this->THROW_EXCPTION_ON_FATAL_ERROR = true;
 			$imagick = new \Imagick();
 			$imagick->setResolution(72,72);
 			$imagick->readImage($filepath . '[0]');
@@ -227,23 +247,23 @@ class Media {
 
 	private $THROW_EXCPTION_ON_FATAL_ERROR = false;
 	public function shutdown_function() {
-		if( $this->THROW_EXCPTION_ON_FATAL_ERROR ) 
+		if( $this->THROW_EXCPTION_ON_FATAL_ERROR )
 			throw new \Exception("fatal error");
 	}
-	
+
 	public function index_pdf_content($file, $item_id) {
-		
+
 		if ( ! defined('TAINACAN_INDEX_PDF_CONTENT') || true !== TAINACAN_INDEX_PDF_CONTENT ) {
 			return;
 		}
-		
-		$content_index_meta = '_document_content_index';
+
+		$content_index_meta = 'document_content_index';
 
 		if ($file == null) {
 			$meta_id = update_post_meta( $item_id, $content_index_meta, null );
 			return true;
 		}
-		
+
 		if ( ! \file_exists($file) ) {
 			return false;
 		}
@@ -251,8 +271,8 @@ class Media {
 		if ( $this->get_mime_content_type($file) != 'application/pdf') {
 			return null;
 		}
-		
-		// Allow plugins to implement other approach to index pdf contents 
+
+		// Allow plugins to implement other approach to index pdf contents
 		$alternate = apply_filters('tainacan-index-pdf', null, $file, $item_id);
 		if ( ! \is_null($alternate) ) {
 			return $alternate;
@@ -260,7 +280,7 @@ class Media {
 
 		try {
 			$parser = new \Smalot\PdfParser\Parser();
-			$content    = $parser->parseFile($file)->getText();
+			$content = $parser->parseFile($file)->getText();
 
 			$wp_charset = get_bloginfo('charset');
 			$content_charset = mb_detect_encoding($content);
@@ -272,5 +292,71 @@ class Media {
 			return false;
 		}
 	}
-		
-}
\ No newline at end of file
+
+	public function get_attachment_html_url($attachment_id) {
+		return site_url( $this->attachment_html_url_base . '/' . (int) $attachment_id );
+	}
+
+	public function attachment_page() {
+		$att_id = get_query_var('tainacan_attachment_page');
+
+		if ( ! $att_id ) {
+			return; // continue normal execution
+		}
+
+		$attachment = get_post($att_id);
+
+		if ( $attachment instanceof \WP_Post && $attachment->post_type == 'attachment' ) {
+			$parent = $attachment->post_parent;
+
+			$item = \Tainacan\Repositories\Items::get_instance()->fetch( (int) $parent );
+
+			if ( $item instanceof \Tainacan\Entities\Item ) {
+
+				if ( ! $item->can_read() ) {
+
+					http_response_code(401);
+					die;
+
+				}
+
+			} else {
+				http_response_code(404);
+				die;
+			}
+
+		} else {
+			http_response_code(404);
+			die;
+		}
+
+		$output = '';
+
+		if ( wp_attachment_is_image($att_id) ) {
+
+			$img = wp_get_attachment_url($attachment->ID, 'large');
+			$output .= "<img style='max-width: 100%;' src='" . $img . "' />";
+
+		} else {
+
+			global $wp_embed;
+
+			$url = wp_get_attachment_url($att_id);
+
+			$embed = $wp_embed->autoembed($url);
+
+			if ( $embed == $url ) {
+				$output .= sprintf("<a href='%s' target='blank'>%s</a>", $url, $url);
+			} else {
+				$output .= $embed;
+			}
+
+		}
+
+		echo $output;
+
+		exit();
+
+	}
+
+}
diff --git a/src/classes/class-tainacan-private-files.php b/src/classes/class-tainacan-private-files.php
index 56da2f3cf..bca6421cb 100644
--- a/src/classes/class-tainacan-private-files.php
+++ b/src/classes/class-tainacan-private-files.php
@@ -8,9 +8,11 @@ use Tainacan\Entities;
  * Class withe helpful methods to handle media in Tainacan
  */
 class Private_Files {
-	
+
 	private static $instance = null;
 
+	public $dir_separator;
+
     public static function get_instance() {
         if(!isset(self::$instance)) {
             self::$instance = new self();
@@ -18,26 +20,31 @@ class Private_Files {
 
         return self::$instance;
     }
-	
+
 	protected function __construct() {
+
+		// Once upon a time I thought I had to worry about Windows and use DIRECTORY_SEPARATOR
+		// but this only gave me frustration and bugs.
+		$this->dir_separator = '/';
+
 		add_filter('wp_handle_upload_prefilter', [$this, 'pre_upload']);
 		add_filter('wp_handle_sideload_prefilter', [$this, 'pre_upload']);
 		add_filter('wp_handle_upload', [$this, 'post_upload']);
-		
+
 		add_action('tainacan-pre-insert-attachment', [$this, 'pre_tainacan_upload'], 10, 3);
 		add_action('tainacan-post-insert-attachment', [$this, 'post_tainacan_upload'], 10, 3);
-		
+
 		add_action('template_redirect', [$this, 'template_redirect']);
 		add_filter('image_get_intermediate_size', [$this, 'image_get_intermediate_size'], 10, 3);
 		add_filter('wp_get_attachment_url', [$this, 'wp_get_attachment_url'], 10, 2);
-		
+
 		add_action('tainacan-insert', [$this, 'update_item_and_collection']);
-		
+
 		add_action('tainacan-bulk-edit-set-status', [$this, 'bulk_edit'], 10, 4);
-		
-		
+
+
 	}
-	
+
 	function pre_tainacan_upload($blob, $filename, $post_id) {
 		if (is_numeric($post_id)) {
 			global $TAINACAN_UPLOADING_ATTACHMENT_TO_POST;
@@ -45,33 +52,33 @@ class Private_Files {
 			add_filter('upload_dir', [$this, 'change_upload_dir']);
 		}
 	}
-	
+
 	function post_tainacan_upload($attach_id, $attach_data, $post_id) {
 		remove_filter('upload_dir', [$this, 'change_upload_dir']);
 	}
-	
+
 	/**
-	 * Adds a filter to the upload_dir hook when uploading a new file 
-	 * 
+	 * Adds a filter to the upload_dir hook when uploading a new file
+	 *
 	 */
 	function pre_upload($file){
 		add_filter('upload_dir', [$this, 'change_upload_dir']);
 		return $file;
 	}
-	
+
 	/**
-	 * Removes a filter to the upload_dir hook after uploading a new file 
-	 * 
+	 * Removes a filter to the upload_dir hook after uploading a new file
+	 *
 	 */
 	function post_upload($fileinfo){
 		remove_filter('upload_dir', [$this, 'change_upload_dir']);
 		return $fileinfo;
 	}
-	
+
 	/**
-	 * Gets the base directory inside the uploads folder where 
-	 * attachments and documents for items will be uploaded 
-	 * 
+	 * Gets the base directory inside the uploads folder where
+	 * attachments and documents for items will be uploaded
+	 *
 	 * @return string The folder name
 	 */
 	function get_items_uploads_folder() {
@@ -80,11 +87,11 @@ class Private_Files {
 		}
 		return 'tainacan-items';
 	}
-	
+
 	/**
 	 * Gets the directory prefix to be added to folders holding
-	 * attachments and documents for private items or collections 
-	 * 
+	 * attachments and documents for private items or collections
+	 *
 	 * @return string The folder prefix
 	 */
 	function get_private_folder_prefix() {
@@ -93,140 +100,140 @@ class Private_Files {
 		}
 		return '_x_';
 	}
-	
+
 	/**
-	 * Change the upload directory for items attachments and documents 
+	 * Change the upload directory for items attachments and documents
 	 *
-	 * It replaces the default WordPress strucutre, which is YYYY/MM/file 
-	 * with a path containing the collection id and the item id inside the @see get_items_uploads_folder(): 
+	 * It replaces the default WordPress strucutre, which is YYYY/MM/file
+	 * with a path containing the collection id and the item id inside the @see get_items_uploads_folder():
 	 * ex: * tainacan-items/$collection_id/$item_id
 	 *
-	 * It also add a prefix in the folder name of private items or collections: 
+	 * It also add a prefix in the folder name of private items or collections:
 	 * tainacan-items/$collection_id/_x_$item_id ($item_id is a private item)
-	 * 
+	 *
 	 */
 	function change_upload_dir($path) {
 		$post_id = false;
-		
+
 		// regular ajax uploads via Admin Panel will send post_id
 		if ( isset($_REQUEST['post_id']) && $_REQUEST['post_id'] ) {
 			$post_id = $_REQUEST['post_id'];
 		}
-		
+
 		// API requests to media endpoint will send post
 		if ( false === $post_id && isset($_REQUEST['post']) && is_numeric($_REQUEST['post']) ) {
 			$post_id = $_REQUEST['post'];
 		}
-		
-		// tainacan internals, scripts and tests, will set this global 
+
+		// tainacan internals, scripts and tests, will set this global
 		if (false === $post_id) {
 			global $TAINACAN_UPLOADING_ATTACHMENT_TO_POST;
 			if ( isset($TAINACAN_UPLOADING_ATTACHMENT_TO_POST) && is_numeric($TAINACAN_UPLOADING_ATTACHMENT_TO_POST) ) {
 				$post_id = $TAINACAN_UPLOADING_ATTACHMENT_TO_POST;
 			}
 		}
-		
+
 		if (false === $post_id) {
 			return $path;
 		}
-		
+
 		$theme_helper = \Tainacan\Theme_Helper::get_instance();
-		
+
 		$post = get_post($post_id);
-		
+
 		if ( !$theme_helper->is_post_an_item($post) ) {
 			return $path;
 		}
-		
+
 		$item = \Tainacan\Repositories\Items::get_instance()->fetch( (int) $post_id );
-		
+
 		if ($item instanceof \Tainacan\Entities\Item) {
-			
+
 			$tainacan_basepath = $this->get_items_uploads_folder();
 			$col_id_url = $item->get_collection_id();
 			$col_id = $item->get_collection_id();
 			$item_id_url = $item->get_id();
 			$item_id = $item->get_id();
-			
+
 			$col_status = get_post_status_object($item->get_collection()->get_status());
 			$item_status = get_post_status_object($item->get_status());
-			
+
 			if ( ! $col_status->public ) {
 				$col_id = $this->get_private_folder_prefix() . $col_id;
 			}
 			if ( ! $item_status->public ) {
 				$item_id = $this->get_private_folder_prefix() . $item_id;
 			}
-			
+
 			$path['path'] = str_replace($path['subdir'], '', $path['path']); //remove default subdir (year/month)
-			$path['url'] = str_replace($path['subdir'], '/' . $tainacan_basepath . '/' . $col_id_url . '/' . $item_id_url, $path['url']); 
-			$path['path'] .= DIRECTORY_SEPARATOR . $tainacan_basepath . DIRECTORY_SEPARATOR . $col_id . '/' . $item_id;
-			$path['subdir'] = DIRECTORY_SEPARATOR . $tainacan_basepath . DIRECTORY_SEPARATOR . $col_id . '/' . $item_id;
-			
+			$path['url'] = str_replace($path['subdir'], '/' . $tainacan_basepath . '/' . $col_id_url . '/' . $item_id_url, $path['url']);
+			$path['path'] .= $this->dir_separator . $tainacan_basepath . $this->dir_separator . $col_id . $this->dir_separator . $item_id;
+			$path['subdir'] = $this->dir_separator . $tainacan_basepath . $this->dir_separator . $col_id . $this->dir_separator . $item_id;
+
 		}
-		
+
 		return $path;
-		
+
 	}
-	
+
 	/**
-	 * Handles 404 returns looking for attachments inside the tainacan items uploads folder 
+	 * Handles 404 returns looking for attachments inside the tainacan items uploads folder
 	 *
-	 * When looking for a file that does not exists, it checks for relative prefixed folders. 
+	 * When looking for a file that does not exists, it checks for relative prefixed folders.
 	 * If it finds the file, it then checks to see if current user have permission to see this file, based on
 	 * the permission he/she have to read the related item.
-	 * 
+	 *
 	 */
 	function template_redirect() {
-		
+
 		if (is_404()) {
-			
+
 			$upload_dir = wp_get_upload_dir();
 			$base_upload_url = preg_replace('/^https?:\/\//', '', $upload_dir['baseurl']);
-			
+
 			$requested_uri = $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
-			
+
 			if ( strpos($requested_uri, $base_upload_url) === false ) {
-				// Not uploads 
+				// Not uploads
 				return;
 			}
-			
+
 			$requested_uri = str_replace('/' . $this->get_private_folder_prefix(), '/', $requested_uri);
-			
-			$file_path = \str_replace( '/', DIRECTORY_SEPARATOR, str_replace($base_upload_url, '', $requested_uri) );
-			
+
+			$file_path = \str_replace( '/', $this->dir_separator, str_replace($base_upload_url, '', $requested_uri) );
+
 			$file = $upload_dir['basedir'] . $file_path;
-			
+
 			$existing_file = false;
-			
-			$file_dirs = explode(DIRECTORY_SEPARATOR, $file);
+
+			$file_dirs = explode($this->dir_separator, $file);
 			$file_dirs_size = sizeof($file_dirs);
-			
+
 			$item_id = $file_dirs[$file_dirs_size-2];
 			$collection_id = $file_dirs[$file_dirs_size-3];
-			
-			// private item 
-			$prefixed_file = str_replace( DIRECTORY_SEPARATOR . $item_id . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR . $this->get_private_folder_prefix() . $item_id . DIRECTORY_SEPARATOR, $file);
-			
+
+			// private item
+			$prefixed_file = str_replace( $this->dir_separator . $item_id . $this->dir_separator, $this->dir_separator . $this->get_private_folder_prefix() . $item_id . $this->dir_separator, $file);
+
 			if ( \file_exists( $prefixed_file ) ) {
 				$existing_file = $prefixed_file;
 			}
-			// private collection 
-			$prefixed_collection = str_replace( DIRECTORY_SEPARATOR . $collection_id . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR . $this->get_private_folder_prefix() . $collection_id . DIRECTORY_SEPARATOR, $file);
+			// private collection
+			$prefixed_collection = str_replace( $this->dir_separator . $collection_id . $this->dir_separator, $this->dir_separator . $this->get_private_folder_prefix() . $collection_id . $this->dir_separator, $file);
 			if ( !$existing_file && \file_exists( $prefixed_collection ) ) {
 				$existing_file = $prefixed_collection;
 			}
-			// private both 
-			$prefixed_both = str_replace( DIRECTORY_SEPARATOR . $collection_id . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR . $this->get_private_folder_prefix() . $collection_id . DIRECTORY_SEPARATOR, $prefixed_file);
+			// private both
+			$prefixed_both = str_replace( $this->dir_separator . $collection_id . $this->dir_separator, $this->dir_separator . $this->get_private_folder_prefix() . $collection_id . $this->dir_separator, $prefixed_file);
 			if ( !$existing_file && \file_exists( $prefixed_both ) ) {
 				$existing_file = $prefixed_both;
 			}
-			
+
 			if ($existing_file) {
-				
+
 				$item = \Tainacan\Repositories\Items::get_instance()->fetch( (int) $item_id, (int) $collection_id );
 				$mime_type = \Tainacan\Media::get_instance()->get_mime_content_type($existing_file);
-				
+
 				if ($item instanceof \Tainacan\Entities\Item && $item->can_read()) {
 					//header('Content-Description: File Transfer');
 					//header('Content-Type: application/octet-stream');
@@ -237,137 +244,137 @@ class Private_Files {
 					// header('Pragma: public');
 					// header('Content-Length: ' . filesize($file));
 					\readfile($existing_file);
-					
+
 					die;
 				}
-				
+
 			}
-			
-			
-			
+
+
+
 		}
-		
+
 	}
-	
+
 	/**
-	 * Filters the image_get_intermediate_size hook to strip out the 
+	 * Filters the image_get_intermediate_size hook to strip out the
 	 * private uploads folder prefix from the attachments URLs
 	 */
 	function image_get_intermediate_size($data, $post_id, $size) {
-		
-		$data['path'] = str_replace(DIRECTORY_SEPARATOR . $this->get_private_folder_prefix(), DIRECTORY_SEPARATOR, $data['path']);
+
+		$data['path'] = str_replace($this->dir_separator . $this->get_private_folder_prefix(), $this->dir_separator, $data['path']);
 		$data['url'] = str_replace('/' . $this->get_private_folder_prefix(), '/', $data['url']);
-		
+
 		return $data;
-		
+
 	}
-	
+
 	/**
-	 * Filters the wp_get_attachment_url hook to strip out the 
+	 * Filters the wp_get_attachment_url hook to strip out the
 	 * private uploads folder prefix from the attachments URLs
 	 */
 	function wp_get_attachment_url($url, $post_id) {
 		$url = str_replace('/' . $this->get_private_folder_prefix(), '/', $url);
 		return $url;
 	}
-	
+
 	/**
-	 * When an item or collection is saved, it checks if the satus was changed and 
-	 * if the items upload directory mus be renamed to add or remove the 
-	 * private folder prefix 
+	 * When an item or collection is saved, it checks if the satus was changed and
+	 * if the items upload directory mus be renamed to add or remove the
+	 * private folder prefix
 	 */
 	function update_item_and_collection($obj) {
-		
-		$folder = DIRECTORY_SEPARATOR;
-		$check_folder = DIRECTORY_SEPARATOR;
+
+		$folder = $this->dir_separator;
+		$check_folder = $this->dir_separator;
 		$check = false;
-		
+
 		if ( $obj instanceof \Tainacan\Entities\Collection ) {
-			
+
 			$status_obj = get_post_status_object($obj->get_status());
-			
+
 			$folder .= $status_obj->public ? $obj->get_id() : $this->get_private_folder_prefix() . $obj->get_id();
 			$check_folder .= ! $status_obj->public ? $obj->get_id() : $this->get_private_folder_prefix() . $obj->get_id();
-			
+
 			$check = true;
-			
+
 		}
-		
+
 		if ( $obj instanceof \Tainacan\Entities\Item ) {
-			
+
 			$collection = $obj->get_collection();
 			$col_status_object = get_post_status_object($collection->get_status());
-			
-			$folder 	  .= $col_status_object->public ? $collection->get_id() : $this->get_private_folder_prefix() . $collection->get_id() . DIRECTORY_SEPARATOR;
-			$check_folder .= $col_status_object->public ? $collection->get_id() : $this->get_private_folder_prefix() . $collection->get_id() . DIRECTORY_SEPARATOR;
-			
-			$folder 	  .= DIRECTORY_SEPARATOR;
-			$check_folder .= DIRECTORY_SEPARATOR;
-			
+
+			$folder 	  .= $col_status_object->public ? $collection->get_id() : $this->get_private_folder_prefix() . $collection->get_id() . $this->dir_separator;
+			$check_folder .= $col_status_object->public ? $collection->get_id() : $this->get_private_folder_prefix() . $collection->get_id() . $this->dir_separator;
+
+			$folder 	  .= $this->dir_separator;
+			$check_folder .= $this->dir_separator;
+
 			$status_obj = get_post_status_object($obj->get_status());
-			
+
 			$folder .= $status_obj->public ? $obj->get_id() : $this->get_private_folder_prefix() . $obj->get_id();
 			$check_folder .= ! $status_obj->public ? $obj->get_id() : $this->get_private_folder_prefix() . $obj->get_id();
-			
+
 			$check = true;
-			
+
 		}
-		
+
 		if ($check) {
-			
+
 			$upload_dir = wp_get_upload_dir();
 			$base_dir = $upload_dir['basedir'];
-			$full_path = $base_dir . DIRECTORY_SEPARATOR . $this->get_items_uploads_folder() . $folder;
-			$full_path_check = $base_dir . DIRECTORY_SEPARATOR . $this->get_items_uploads_folder() . $check_folder;
-			
+			$full_path = $base_dir . $this->dir_separator . $this->get_items_uploads_folder() . $folder;
+			$full_path_check = $base_dir . $this->dir_separator . $this->get_items_uploads_folder() . $check_folder;
+
 			if (\file_exists($full_path_check)) {
 				rename($full_path_check, $full_path);
 				do_action('tainacan-upload-folder-renamed', $full_path_check, $full_path);
 			}
-			
+
 		}
-			
-		
+
+
 	}
-	
+
 	/**
-	 * Rename all folders from items after a bulk edit operation move their statuses 
+	 * Rename all folders from items after a bulk edit operation move their statuses
 	 *
 	 * TODO: In the upcoming bulk edit refactor this must be handled as there are performance issues
-	 * 
+	 *
 	 */
 	function bulk_edit($status, $group, $select_query, $query) {
 		global $wpdb;
-		
+
 		$ids = $wpdb->get_col($select_query);
-		
+
 		$status_obj = get_post_status_object($status);
 		$prefix = $status_obj->public ? $this->get_private_folder_prefix() : '';
-		
+
 		$upload_dir = wp_get_upload_dir();
 		$base_dir = $upload_dir['basedir'];
-		$full_path = $base_dir . DIRECTORY_SEPARATOR . $this->get_items_uploads_folder() . DIRECTORY_SEPARATOR . '*' . DIRECTORY_SEPARATOR . $prefix;
-		
+		$full_path = $base_dir . $this->dir_separator . $this->get_items_uploads_folder() . $this->dir_separator . '*' . $this->dir_separator . $prefix;
+
 		foreach ($ids as $id) {
 			$folder = $full_path . $id;
 			$found = glob($folder);
-			
+
 			if (sizeof($found) == 1 && isset($found[0])) {
-				
+
 				if ($status_obj->public) {
-					$target = str_replace(DIRECTORY_SEPARATOR . $this->get_private_folder_prefix() . $id, DIRECTORY_SEPARATOR . $id, $found[0]);
+					$target = str_replace($this->dir_separator . $this->get_private_folder_prefix() . $id, $this->dir_separator . $id, $found[0]);
 				} else {
-					$target = str_replace(DIRECTORY_SEPARATOR . $id, DIRECTORY_SEPARATOR . $this->get_private_folder_prefix() . $id, $found[0]);
+					$target = str_replace($this->dir_separator . $id, $this->dir_separator . $this->get_private_folder_prefix() . $id, $found[0]);
 				}
-				
+
 				rename($found[0], $target);
 				do_action('tainacan-upload-folder-renamed', $found[0], $target);
-				
+
 			}
 			if (\file_exists($folder)) {
-				
+
 			}
 		}
 	}
-	
-}
\ No newline at end of file
+
+}
diff --git a/src/classes/entities/class-tainacan-log.php b/src/classes/entities/class-tainacan-log.php
index 9a04b546c..583c717b7 100644
--- a/src/classes/entities/class-tainacan-log.php
+++ b/src/classes/entities/class-tainacan-log.php
@@ -95,6 +95,14 @@ class Log extends Entity {
 		return $this->get_mapped_property( 'date' );
 	}
 
+	/**
+	 * Return the log slug
+	 *
+	 * @return mixed|null
+	 */
+	function get_slug() {
+		return $this->get_mapped_property( 'slug' );
+	}
 
 	/**
 	 * Return the Log description
@@ -125,7 +133,7 @@ class Log extends Entity {
 	public function get_old_value() {
 		return $this->get_mapped_property( 'old_value' );
 	}
-	
+
 	/**
 	 * Get new value of log entry object
 	 *
@@ -183,7 +191,7 @@ class Log extends Entity {
 	public function set_old_value( $value ) {
 		$this->set_mapped_property( 'old_value', $value );
 	}
-	
+
 	/**
 	 * Set new value of log entry
 	 *
@@ -201,19 +209,19 @@ class Log extends Entity {
 	public function get_log_diffs(){
 		return $this->get_mapped_property('log_diffs');
 	}
-	
+
 	public function get_object_type() {
-		$this->get_mapped_property('object_type');
+		return $this->get_mapped_property('object_type');
 	}
-	
+
 	public function set_object_type($value) {
 		$this->set_mapped_property('object_type', $value);
 	}
-	
+
 	public function get_object_id() {
-		$this->get_mapped_property('object_id');
+		return $this->get_mapped_property('object_id');
 	}
-	
+
 	public function set_object_id($value) {
 		$this->set_mapped_property('object_id', $value);
 	}
@@ -231,11 +239,11 @@ class Log extends Entity {
 	public function get_item_id(){
 		return $this->get_mapped_property('item_id');
 	}
-	
+
 	public function get_action() {
-		$this->get_mapped_property('action');
+		return $this->get_mapped_property('action');
 	}
-	
+
 	public function set_action($value) {
 		$this->set_mapped_property('action', $value);
 	}
@@ -249,4 +257,4 @@ class Log extends Entity {
 
 		return $repository->approve( $this );
 	}
-}
\ No newline at end of file
+}
diff --git a/src/classes/entities/class-tainacan-taxonomy.php b/src/classes/entities/class-tainacan-taxonomy.php
index af5c94265..dd11af5d2 100644
--- a/src/classes/entities/class-tainacan-taxonomy.php
+++ b/src/classes/entities/class-tainacan-taxonomy.php
@@ -22,28 +22,28 @@ class Taxonomy extends Entity {
 	 * @var string
 	 */
     static $post_type = 'tainacan-taxonomy';
-    
+
     /**
 	 * {@inheritDoc}
      * @see \Tainacan\Entities\Entity::capability_type
 	 * @var string
 	 */
     protected static $capability_type = ['tainacan-taxonomy', 'tainacan-taxonomies'];
-    
+
     /**
      * {@inheritDoc}
      * @see \Tainacan\Entities\Entity::repository
      * @var string
      */
     protected $repository = 'Taxonomies';
-	
+
 	/**
 	 * Prefix used to create the db_identifier
 	 *
 	 * @var string
 	 */
 	static $db_identifier_prefix = 'tnc_tax_';
-	
+
 	public function  __toString(){
 		return apply_filters("tainacan-taxonomy-to-string", $this->get_name(), $this);
 	}
@@ -67,7 +67,7 @@ class Taxonomy extends Entity {
             'new_item_name'     => __( 'New Genre term', 'tainacan' ),
             'menu_name'         => $this->get_name(),
         );
-		
+
 		$enabled_post_types = $this->get_enabled_post_types();
         $enabled_post_types = sizeof($enabled_post_types) ? $enabled_post_types : null;
 		$show_ui = is_array($enabled_post_types) ? true : false;
@@ -80,21 +80,22 @@ class Taxonomy extends Entity {
             'show_admin_column' => false,
             'rewrite'           => [
                 'slug' => $this->get_slug()
-            ],
+			],
+			'update_count_callback' => '_update_generic_term_count'
         );
-        
+
         if (taxonomy_exists($this->get_db_identifier())){
             unregister_taxonomy($this->get_db_identifier());
         }
-        
-        
-        
-        register_taxonomy( 
-            $this->get_db_identifier(), 
-            $enabled_post_types, 
-            $args 
+
+
+
+        register_taxonomy(
+            $this->get_db_identifier(),
+            $enabled_post_types,
+            $args
         );
-        
+
         return true;
     }
 
@@ -135,7 +136,7 @@ class Taxonomy extends Entity {
 	function get_slug() {
         return $this->get_mapped_property('slug');
     }
-    
+
     /**
 	 * Return the enabled post types
 	 *
@@ -144,7 +145,7 @@ class Taxonomy extends Entity {
 	function get_enabled_post_types() {
         return $this->get_mapped_property('enabled_post_types');
     }
-    
+
     // special Getters
 
 	/**
@@ -194,7 +195,7 @@ class Taxonomy extends Entity {
 	function set_allow_insert($value) {
         $this->set_mapped_property('allow_insert', $value);
     }
-    
+
     /**
 	 * Sets enabled post types
 	 *
@@ -221,19 +222,19 @@ class Taxonomy extends Entity {
 		return parent::validate();
 
 	}
-	
+
 	/**
-	* Check if a term already exists 
+	* Check if a term already exists
 	*
-	* @param string $term_name The term name 
-	* @param int|null $parent The ID of the parent term to look for children or null to look for terms in any hierarchical position. Default is null 
-	* @param bool $return_term wether to return the term object if it exists. default is to false 
-	* 
-	* @return bool|WP_Term return boolean indicating if term exists. If $return_term is true and term exists, return WP_Term object 
+	* @param string $term_name The term name
+	* @param int|null $parent The ID of the parent term to look for children or null to look for terms in any hierarchical position. Default is null
+	* @param bool $return_term wether to return the term object if it exists. default is to false
+	*
+	* @return bool|WP_Term return boolean indicating if term exists. If $return_term is true and term exists, return WP_Term object
 	*/
 	function term_exists($term_name, $parent = null, $return_term = false) {
 		$repo = $this->get_repository();
 		return $repo->term_exists($this, $term_name, $parent, $return_term);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/classes/filter-types/autocomplete/Autocomplete.vue b/src/classes/filter-types/autocomplete/Autocomplete.vue
index 06a968693..a780b119d 100644
--- a/src/classes/filter-types/autocomplete/Autocomplete.vue
+++ b/src/classes/filter-types/autocomplete/Autocomplete.vue
@@ -20,7 +20,7 @@
                         <img
                                 :alt="$i18n.get('label_thumbnail')"
                                 width="24"
-                                :src="`${props.option.img}`">
+                                :src="props.option.img">
                     </div>
                     <div class="media-content">
                         <span class="ellipsed-text">{{ props.option.label }}</span>
@@ -49,8 +49,7 @@
             return {
                 selected:'',
                 options: [],
-                label: '',
-                relatedCollectionId: ''
+                label: ''
             }
         },
         watch: {
@@ -58,15 +57,6 @@
                 this.updateSelectedValues();
             },
         },
-        created() {
-            if (this.metadatumType === 'Tainacan\\Metadata_Types\\Relationship' && 
-                this.filter.metadatum && 
-                this.filter.metadatum.metadata_type_object && 
-                this.filter.metadatum.metadata_type_object.options &&
-                this.filter.metadatum.metadata_type_object.options.collection_id) {
-                    this.relatedCollectionId = this.filter.metadatum.metadata_type_object.options.collection_id;
-                }
-        },
         mounted() {
             this.updateSelectedValues();
         },
@@ -131,14 +121,12 @@
                     let metadata = this.query.metaquery[ index ];
 
                     if (this.metadatumType === 'Tainacan\\Metadata_Types\\Relationship') {
-                        
-                        let endpoint = '/items/' + metadata.value + '?fetch_only=title,thumbnail';
 
-                        if (this.relatedCollectionId != '')
-                            endpoint = '/collection/' + this.relatedCollectionId + endpoint; 
+                        let endpoint = '/items/' + metadata.value + '?fetch_only=title,thumbnail';
 
                         axios.get(endpoint)
                             .then( res => {
+
                                 let item = res.data;
                                 this.label = item.title;
                                 this.selected = item.title;
@@ -151,24 +139,13 @@
                     } else {
                         this.label = metadata.value;
                         this.selected = metadata.value;
-
                         this.$emit( 'sendValuesToTags', { label: this.label, value: this.selected });
                     }
                 } else {
-                    return false;
+                    this.label = '';
+                    this.selected = '';
                 }
             }
         }
     }
-</script>
-<style scoped>
-    #profileImage {
-        width: 32px;
-        height: 32px;
-        font-size: 2.1875rem;
-        color: #fff;
-        text-align: center;
-        line-height: 9.375rem;
-        margin: 20px 0;
-    }
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/src/classes/filter-types/custom-interval/CustomInterval.vue b/src/classes/filter-types/custom-interval/CustomInterval.vue
deleted file mode 100644
index fb08270c6..000000000
--- a/src/classes/filter-types/custom-interval/CustomInterval.vue
+++ /dev/null
@@ -1,259 +0,0 @@
-<template>
-    <div>
-        <!-- Date -->
-        <div v-if="metadatumType === 'Tainacan\\Metadata_Types\\Date'">
-            <b-datepicker
-                    :aria-labelledby="'filter-label-id-' + filter.id"
-                    :placeholder="$i18n.get('label_selectbox_init')"
-                    v-model="dateInit"
-                    size="is-small"
-                    @focus="isTouched = true"
-                    @input="validadeValues()"
-                    editable
-                    :date-formatter="(date) => dateFormatter(date)"
-                    :date-parser="(date) => dateParser(date)"
-                    icon="calendar-today"
-                    :day-names="[
-                        $i18n.get('datepicker_short_sunday'),
-                        $i18n.get('datepicker_short_monday'),
-                        $i18n.get('datepicker_short_tuesday'),
-                        $i18n.get('datepicker_short_wednesday'),
-                        $i18n.get('datepicker_short_thursday'),
-                        $i18n.get('datepicker_short_friday'),
-                        $i18n.get('datepicker_short_saturday'),
-                    ]"/>
-            <p class="is-size-7 has-text-centered is-marginless">{{ $i18n.get('label_until') }}</p>
-            <b-datepicker
-                    :aria-labelledby="'filter-label-id-' + filter.id"
-                    :placeholder="$i18n.get('label_selectbox_init')"
-                    v-model="dateEnd"
-                    size="is-small"
-                    @input="validadeValues()"
-                    @focus="isTouched = true"
-                    editable
-                    :date-formatter="(date) => dateFormatter(date)"
-                    :date-parser="(date) => dateParser(date)"
-                    icon="calendar-today"
-                    :day-names="[
-                        $i18n.get('datepicker_short_sunday'),
-                        $i18n.get('datepicker_short_monday'),
-                        $i18n.get('datepicker_short_tuesday'),
-                        $i18n.get('datepicker_short_wednesday'),
-                        $i18n.get('datepicker_short_thursday'),
-                        $i18n.get('datepicker_short_friday'),
-                        $i18n.get('datepicker_short_saturday'),
-                    ]"/>
-        </div>
-
-        <!-- Numeric -->
-        <div v-else>
-            <b-input
-                    type="number"
-                    :aria-labelledby="'filter-label-id-' + filter.id"
-                    size="is-small"
-                    step="any"
-                    @input="validadeValues"
-                    v-model="valueInit"/>
-            <p class="is-size-7 has-text-centered is-marginless">{{ $i18n.get('label_until') }}</p>
-            <b-input
-                    type="number"
-                    :aria-labelledby="'filter-label-id-' + filter.id"
-                    size="is-small"
-                    step="any"
-                    @input="validadeValues"
-                    @focus="isTouched = true"
-                    v-model="valueEnd"/>
-        </div>
-    </div>
-</template>
-
-<script>
-    import { wpAjax, dateInter } from "../../../admin/js/mixins";
-    import { filterTypeMixin } from '../filter-types-mixin';
-    import moment from 'moment';
-
-    export default {
-        mixins: [ 
-            wpAjax,
-            dateInter, 
-            filterTypeMixin
-        ],
-        mounted() {
-            this.updateSelectedValues();
-        },
-        data(){
-            return {
-                valueInit: '',
-                valueEnd: '',
-                dateInit: undefined,
-                dateEnd: undefined,
-                isTouched: false,
-                type: 'DECIMAL'
-            }
-        },
-        watch: {
-            isTouched( val ){
-              if ( val && this.dateInit === null)
-                  this.dateInit = new Date();
-
-              if ( val && this.dateEnd === null)
-                  this.dateEnd =  new Date();
-            },
-            'query.metaquery'() {
-                this.updateSelectedValues();
-            }
-        },
-        methods: {
-            // only validate if the first value is higher than first
-            validadeValues: _.debounce( function (){
-               
-                if( this.metadatumType === 'Tainacan\\Metadata_Types\\Date' ){
-                    if (this.dateInit === undefined)
-                        this.dateInit = new Date();
-
-                    if (this.dateEnd === undefined)
-                        this.dateEnd =  new Date();
-
-                    if ( this.dateInit > this.dateEnd ) {
-                        this.showErrorMessage();
-                        return
-                    }
-                } else {
-                    if (this.valueInit.constructor == Number)
-                        this.valueInit = this.valueInit.valueOf();
-
-                    if (this.valueEnd.constructor == Number)
-                        this.valueEnd = this.valueEnd.valueOf();
-                        
-                    this.valueInit = parseFloat(this.valueInit);
-                    this.valueEnd = parseFloat(this.valueEnd);
-
-                    if (isNaN(this.valueInit) || isNaN(this.valueEnd))
-                        return
-
-                    if (this.valueInit > this.valueEnd) {                     
-                        this.showErrorMessage();
-                        return;
-                    }
-                }
-                this.emit();
-            }, 800),
-            // message for error
-            showErrorMessage(){
-                if ( !this.isTouched ) return false;
-
-                this.$buefy.toast.open({
-                    duration: 3000,
-                    message: this.$i18n.get('info_error_first_value_greater'),
-                    position: 'is-bottom',
-                    type: 'is-danger'
-                })
-            },
-            dateFormatter(dateObject){ 
-                return moment(dateObject, moment.ISO_8601).format(this.dateFormat);
-            },
-            dateParser(dateString){ 
-                return moment(dateString, this.dateFormat).toDate(); 
-            },
-            updateSelectedValues(){
-                if ( !this.query || !this.query.metaquery || !Array.isArray( this.query.metaquery ) )
-                    return false;
-
-                let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key == this.metadatumId);
-
-                if (index >= 0) {
-                    let metadata = this.query.metaquery[ index ];
-                    
-                    if( metadata.value && metadata.value.length > 0 && this.metadatumType === 'Tainacan\\Metadata_Types\\Numeric'){
-                        this.valueInit = parseFloat(metadata.value[0]);
-                        this.valueEnd = parseFloat(metadata.value[1]);
-                    } else if( metadata.value && metadata.value.length > 0 ){
-                        this.dateInit = new Date(metadata.value[0]);
-                        this.dateEnd = new Date(metadata.value[1]);
-                    }
-
-                    if (metadata.value[0] != undefined && metadata.value[1] != undefined)
-                        this.$emit('sendValuesToTags', { 
-                            label: (this.metadatumType === 'Tainacan\\Metadata_Types\\Numeric' ? (metadata.value[0] + ' - ' + metadata.value[1]) : this.parseDateToNavigatorLanguage(metadata.value[0]) + ' - ' + this.parseDateToNavigatorLanguage(metadata.value[1])),
-                            value: [metadata.value[0], metadata.value[1]]
-                        });
-                } else {
-                    if (this.metadatumType === 'Tainacan\\Metadata_Types\\Numeric') {
-                        this.valueInit = '';
-                        this.valueEnd = '';
-                    } else {
-                        this.dateInit = null;
-                        this.dateEnd = null;
-                    }
-                    
-                }
-            },
-            // emit the operation for listeners
-            emit() {
-                let values = [];
-                
-                if (this.metadatumType === 'Tainacan\\Metadata_Types\\Date') {
-
-                    if (this.dateInit === null && this.dateEnd === null) {
-                      values = [];
-                      this.type = 'DATE';
-                    } else {
-                      let dateInit = this.dateInit.getUTCFullYear() + '-' +
-                          ('00' + (this.dateInit.getUTCMonth() + 1)).slice(-2) + '-' +
-                          ('00' + this.dateInit.getUTCDate()).slice(-2);
-                      let dateEnd = this.dateEnd.getUTCFullYear() + '-' +
-                          ('00' + (this.dateEnd.getUTCMonth() + 1)).slice(-2) + '-' +
-                          ('00' + this.dateEnd.getUTCDate()).slice(-2);
-                      values = [ dateInit, dateEnd ];
-                      this.type = 'DATE';
-                    }
-                } else {
-                    if (this.valueInit === null || this.valueEnd === null
-                      || this.valueInit === '' || this.valueEnd === ''){
-                        return;
-                    } else {
-                        values =  [ this.valueInit, this.valueEnd ];
-
-                        if(this.valueInit !== this.valueEnd && (this.valueInit % 1 !== 0 && this.valueEnd % 1 == 0)) {
-                            this.type = 'DECIMAL';
-                        } else if(this.valueInit !== this.valueEnd &&
-                            this.valueInit % 1 !== 0 &&
-                            this.valueEnd % 1 !== 0) {
-
-                            this.type = '';
-                        } else if(this.valueInit !== this.valueEnd &&
-                            !(this.valueInit % 1 == 0 && this.valueEnd % 1 !== 0)){
-                            this.type = 'DECIMAL';
-                        } else {
-                            this.type = '';
-                        }
-                    }
-                }
-
-                this.$emit('input', {
-                    filter: 'range',
-                    type: this.type,
-                    compare: 'BETWEEN',
-                    metadatum_id: this.metadatumId,
-                    collection_id: this.collectionId,
-                    value: values
-                });
-
-                if (values[0] != undefined && values[1] != undefined)
-                    this.$emit( 'sendValuesToTags', { 
-                        label: (this.metadatumType === 'Tainacan\\Metadata_Types\\Numeric' ? (values[0] + ' - ' + values[1]) : this.parseDateToNavigatorLanguage(values[0]) + ' - ' + this.parseDateToNavigatorLanguage(values[1])),
-                        value: [ values[0], values[1] ]
-                    });
-            }
-        }
-    }
-</script>
-
-<style scoped>
-    .field {
-        margin-bottom: 0.125rem !important;
-    }
-    p.is-size-7 {
-        margin-bottom: 0.125rem !important;
-    }
-</style>
diff --git a/src/classes/filter-types/custom-interval/class-tainacan-custom-interval.php b/src/classes/filter-types/custom-interval/class-tainacan-custom-interval.php
deleted file mode 100644
index 94e79a4d0..000000000
--- a/src/classes/filter-types/custom-interval/class-tainacan-custom-interval.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-namespace Tainacan\Filter_Types;
-
-defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
-
-/**
- * Class TainacanMetadatumType
- */
-class Custom_Interval extends Filter_Type {
-
-    function __construct(){
-        $this->set_name( __('Custom Interval', 'tainacan'));
-        $this->set_supported_types(['float','date']);
-        $this->set_component('tainacan-filter-custom-interval');
-        $this->set_use_max_options(false);
-        $this->set_preview_template('
-            <div>
-                <div class="b-numberinput field is-grouped">
-                    <p class="control">
-                        <button type="button" class="button is-primary is-small">
-                            <span class="icon is-small">
-                                <i class="mdi mdi-minus"></i>
-                            </span>
-                        </button>
-                    </p>
-                    <div class="control is-small is-clearfix">
-                        <input type="number" step="0.01" class="input is-small" value="6">
-                    </div>
-                    <p class="control">
-                        <button type="button" class="button is-primary is-small">
-                            <span class="icon is-small">
-                                <i class="mdi mdi-plus"></i>
-                            </span>
-                        </button>
-                    </p>
-                </div>
-                <p class="is-size-7 has-text-centered is-marginless">until</p> 
-                <div class="b-numberinput field is-grouped">
-                    <p class="control">
-                        <button type="button" class="button is-primary is-small">
-                            <span class="icon is-small">
-                                <i class="mdi mdi-minus"></i>
-                            </span>
-                        </button>
-                    </p>
-                    <div class="control is-small is-clearfix">
-                        <input type="number" step="0.01" class="input is-small" value="10">
-                    </div>
-                    <p class="control">
-                        <button type="button" class="button is-primary is-small">
-                            <span class="icon is-small">
-                                <i class="mdi mdi-plus"></i>
-                            </span>
-                        </button>
-                    </p>
-                </div>
-            </div>
-        ');
-    }
-
-    /**
-     * @param $filter
-     * @return string
-     * @internal param $metadatum
-     */
-    public function render( $filter ){
-         $type = ( $filter->get_metadatum()->get_metadata_type() === 'Tainacan\Metadata_Types\Date' ) ? 'date' : 'numeric';
-         return '<tainacan-filter-custom-interval 
-                                        name="'.$filter->get_name().'"
-                                        collection_id="'.$filter->get_collection_id().'"
-                                        metadatum_id="'.$filter->get_metadatum()->get_id().'"></tainacan-filter-custom-interval>';
-    }
-}
\ No newline at end of file
diff --git a/src/classes/filter-types/date-interval/DateInterval.vue b/src/classes/filter-types/date-interval/DateInterval.vue
index d21393746..d6fa88c37 100644
--- a/src/classes/filter-types/date-interval/DateInterval.vue
+++ b/src/classes/filter-types/date-interval/DateInterval.vue
@@ -11,6 +11,7 @@
                 :date-formatter="(date) => dateFormatter(date)"
                 :date-parser="(date) => dateParser(date)"
                 icon="calendar-today"
+                :years-range="[-200, 100]"
                 :day-names="[
                     $i18n.get('datepicker_short_sunday'),
                     $i18n.get('datepicker_short_monday'),
@@ -32,6 +33,7 @@
                 :date-formatter="(date) => dateFormatter(date)"
                 :date-parser="(date) => dateParser(date)"
                 icon="calendar-today"
+                :years-range="[-200, 50]"
                 :day-names="[
                     $i18n.get('datepicker_short_sunday'),
                     $i18n.get('datepicker_short_monday'),
diff --git a/src/classes/filter-types/date/Date.vue b/src/classes/filter-types/date/Date.vue
index 5f0ad7c86..464c08029 100644
--- a/src/classes/filter-types/date/Date.vue
+++ b/src/classes/filter-types/date/Date.vue
@@ -78,6 +78,7 @@
                 :date-parser="(date) => dateParser(date)"
                 size="is-small"
                 icon="calendar-today"
+                :years-range="[-200, 50]"
                 :day-names="[
                     $i18n.get('datepicker_short_sunday'),
                     $i18n.get('datepicker_short_monday'),
diff --git a/src/classes/filter-types/filter-types-mixin.js b/src/classes/filter-types/filter-types-mixin.js
index a452caf21..d3adc7190 100644
--- a/src/classes/filter-types/filter-types-mixin.js
+++ b/src/classes/filter-types/filter-types-mixin.js
@@ -276,13 +276,14 @@ export const dynamicFilterTypeMixin = {
                             sResults.push({
                                 label: item.label,
                                 value: item.value,
+                                img: item.thumbnail && item.thumbnail['tainacan-small'] && item.thumbnail['tainacan-small'][0] ? item.thumbnail['tainacan-small'][0] : (item.img ? item.img : ''),
                                 total_items: item.total_items
                             });
                         } else if (indexToIgnore < 0) {
                             opts.push({
                                 label: item.label,
                                 value: item.value,
-                                img: (item.img ? item.img : this.thumbPlaceholderPath),
+                                img: item.thumbnail && item.thumbnail['tainacan-small'] && item.thumbnail['tainacan-small'][0] ? item.thumbnail['tainacan-small'][0] : (item.img ? item.img : ''),
                                 total_items: item.total_items
                             });
                         }
@@ -291,14 +292,14 @@ export const dynamicFilterTypeMixin = {
                             sResults.push({
                                 label: item.label,
                                 value: item.value,
-                                img: (item.img ? item.img : this.thumbPlaceholderPath),
+                                img: item.thumbnail && item.thumbnail['tainacan-small'] && item.thumbnail['tainacan-small'][0] ? item.thumbnail['tainacan-small'][0] : (item.img ? item.img : ''),
                                 total_items: item.total_items
                             });
                         } else {
                             opts.push({
                                 label: item.label,
                                 value: item.value,
-                                img: (item.img ? item.img : this.thumbPlaceholderPath),
+                                img: item.thumbnail && item.thumbnail['tainacan-small'] && item.thumbnail['tainacan-small'][0] ? item.thumbnail['tainacan-small'][0] : (item.img ? item.img : ''),
                                 total_items: item.total_items
                             });
                         }
diff --git a/src/classes/filter-types/numeric-list-interval/FormNumericListInterval.vue b/src/classes/filter-types/numeric-list-interval/FormNumericListInterval.vue
index f447f521a..6b4fee98e 100644
--- a/src/classes/filter-types/numeric-list-interval/FormNumericListInterval.vue
+++ b/src/classes/filter-types/numeric-list-interval/FormNumericListInterval.vue
@@ -31,19 +31,21 @@
                         :key="index">
                     <b-field>
                         <b-input
-                                expanded="true"
+                                expanded
                                 :placeholder="$i18n.get('label')"
                                 @input="onUpdate(interval)"
                                 v-model="interval.label" />
                     </b-field>
                     <b-field>
                         <b-input
+                                expanded
                                 type="number"
                                 step="0.01"
                                 :placeholder="$i18n.get('info_initial_value')"
                                 @input="onUpdate(interval, true)"
                                 v-model="interval.from" />
                         <b-input
+                                expanded
                                 type="number"
                                 step="0.01"
                                 :placeholder="$i18n.get('info_final_value')"
@@ -54,7 +56,7 @@
                         <a
                                 role="button"
                                 @click="addInterval(index)"
-                                class="is-inline add-link"
+                                class="add-link"
                                 :title="$i18n.get('add_value')">
                             <span class="icon is-small">
                                 <i class="tainacan-icon has-text-secondary tainacan-icon-add"/>
@@ -68,7 +70,7 @@
                         <a
                                 role="button"
                                 @click="removeInterval(index)"
-                                class="is-inline add-link"
+                                class="add-link"
                                 :title="$i18n.get('remove_value')">
                             <span class="icon is-small">
                                 <i class="tainacan-icon has-text-secondary tainacan-icon-repprovedcircle"/>
@@ -105,10 +107,10 @@
                      interval.to == "" || interval.from == "" ||
                      Number(interval.to) < Number(interval.from))
                 ) {
-                    if (this.isValid) {
-                        this.isValid = false;
+                    this.isValid = false;
+                    
+                    if (interval.to != '' && interval.from != '' && interval.to != null && interval.from != null)
                         this.showErrorMessage()
-                    }
                 } else {
                     this.isValid = true;
                     this.$emit('input', {
@@ -181,6 +183,12 @@
         }
         .field.has-addons {
             margin-bottom: 0.125rem;
+            width: 100%;
+            display: flex;
+            flex-wrap: wrap;
+            &>.control {
+                flex-basis: 50%;
+            }
         }
     }
 
diff --git a/src/classes/filter-types/numeric/FormNumeric.vue b/src/classes/filter-types/numeric/FormNumeric.vue
index 06e4f84c6..1a3b7c28a 100644
--- a/src/classes/filter-types/numeric/FormNumeric.vue
+++ b/src/classes/filter-types/numeric/FormNumeric.vue
@@ -74,9 +74,7 @@
 
     export default {
         props: {
-            filter: Object,
-            value: [String, Number, Array],
-            disabled: false,
+            value: [String, Number, Array]
         },
         data() {
             return {
diff --git a/src/classes/filter-types/selectbox/Selectbox.vue b/src/classes/filter-types/selectbox/Selectbox.vue
index 682cbd2a2..8e265d1dc 100644
--- a/src/classes/filter-types/selectbox/Selectbox.vue
+++ b/src/classes/filter-types/selectbox/Selectbox.vue
@@ -32,7 +32,8 @@
         mixins: [filterTypeMixin, dynamicFilterTypeMixin],
         data(){
             return {
-                options: []
+                options: [],
+                selected: ''
             }
         },
         watch: {
@@ -71,11 +72,10 @@
                 if ( this.query && this.query.metaquery && Array.isArray( this.query.metaquery ) ) {
 
                     let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key == this.metadatumId );
-                    if ( index >= 0){
+                    if ( index >= 0) {
                         let metadata = this.query.metaquery[ index ];
                         if (this.selected != metadata.value) {
                             this.selected = metadata.value;
-                            this.$emit('sendValuesToTags', { label: metadata.value, value: metadata.value })
                         }
                     } else {
                         this.selected = '';
@@ -83,6 +83,8 @@
                 } else {
                     this.selected = '';
                 }
+
+                this.$emit('sendValuesToTags', { label: this.selected, value: this.selected })
             },
             onSelect(value) {
                 this.$emit('input', {
@@ -91,7 +93,6 @@
                     collection_id: this.collectionId,
                     value: value
                 });
-                this.$emit('sendValuesToTags', { label: value, value: value })
 
                 this.updateSelectedValues();
             }
diff --git a/src/classes/filter-types/tainacan-filter-item.vue b/src/classes/filter-types/tainacan-filter-item.vue
index e688d0c36..edaae5fb3 100644
--- a/src/classes/filter-types/tainacan-filter-item.vue
+++ b/src/classes/filter-types/tainacan-filter-item.vue
@@ -203,7 +203,7 @@
         }
 
         .datepicker {
-            @media screen and (min-width: 1024px) {
+            @media screen and (min-width: 768px) {
 
                 .datepicker-header {
 
@@ -211,20 +211,19 @@
                         max-width: 165px !important;
                     }
                     .pagination .pagination-list .control {
-                        width: 74px !important;
+                        width: 77px !important; 
 
                         .select {
-                            min-width: 100% !important;     
+                            min-width: 100% !important;    
 
                             select {
                                 padding-left: 1px !important;
                                 font-size: 0.75rem !important;
                                 height: 24px !important;
                                 min-width: 100% !important;
-
-                                &:not(.is-loading)::after {
-                                    margin-top: -13px !important;
-                                }
+                            }
+                            &:not(.is-loading)::after {
+                                margin-top: -13px !important;
                             }
                         }
                     }
diff --git a/src/classes/filter-types/taxonomy/Taginput.vue b/src/classes/filter-types/taxonomy/Taginput.vue
index 7ef230929..24946f87b 100644
--- a/src/classes/filter-types/taxonomy/Taginput.vue
+++ b/src/classes/filter-types/taxonomy/Taginput.vue
@@ -38,7 +38,7 @@
 
 <script>
     import qs from 'qs';
-    import { tainacan as axios, all } from '../../../js/axios/axios';
+    import { tainacan as axios } from '../../../js/axios/axios';
     import { filterTypeMixin, dynamicFilterTypeMixin } from '../filter-types-mixin';
     
     export default {
@@ -58,6 +58,9 @@
                 this.updateSelectedValues();
             }
         },
+        mounted() {
+            this.updateSelectedValues();
+        },
         data(){
             return {
                 results:'',
@@ -122,7 +125,7 @@
 
                 let index = this.query.taxquery.findIndex(newMetadatum => newMetadatum.taxonomy == this.taxonomy);
 
-                if ( index >= 0){
+                if (index >= 0) {
                     let metadata = this.query.taxquery[ index ];
                     this.selected = [];
 
@@ -151,20 +154,20 @@
                 });
             },
             getTerms(metadata) {
-                let promises = [];
-                for (let id of metadata.terms) {
-                    //getting a specific value from api, does not need be in facets api
-                    promises.push(
-                        axios.get('/taxonomy/' + this.taxonomyId + '/terms/' + id + '?order=asc' )
-                            .then( res => {
-                                this.selected.push({ label: res.data.name, value: res.data.id });
-                            })
-                            .catch(error => {
-                                this.$console.log(error);
-                            })
-                    );
-                }
-                return all(promises);
+
+                let params = { 
+                    'include': metadata.terms, 
+                    'order': 'asc',
+                    'fetchonly': 0
+                };
+
+                return axios.get('/taxonomy/' + this.taxonomyId + '/terms/?' + qs.stringify(params) )
+                    .then( res => {
+                        this.selected = res.data.map(term => { return { label: term.name, value: term.id } });
+                    })
+                    .catch(error => {
+                        this.$console.log(error);
+                    })
             }
         }
     }
diff --git a/src/classes/metadata-types/core-title/class-tainacan-core-title.php b/src/classes/metadata-types/core-title/class-tainacan-core-title.php
index e28e72edd..e0c2ba997 100644
--- a/src/classes/metadata-types/core-title/class-tainacan-core-title.php
+++ b/src/classes/metadata-types/core-title/class-tainacan-core-title.php
@@ -19,7 +19,7 @@ class Core_Title extends Metadata_Type {
         $this->set_core(true);
         $this->set_related_mapped_prop('title');
         $this->set_component('tainacan-text');
-        $this->set_name( __('Core Description', 'tainacan') );
+        $this->set_name( __('Core Title', 'tainacan') );
         $this->set_description( __('The "Core Title" is a compulsory metadata automatically created for all collections by default. It is the main metadatum of the item and where the basic research tools will do their searches.', 'tainacan') );
     }
 
diff --git a/src/classes/metadata-types/date/Date.vue b/src/classes/metadata-types/date/Date.vue
index 36e24646c..0629f349d 100644
--- a/src/classes/metadata-types/date/Date.vue
+++ b/src/classes/metadata-types/date/Date.vue
@@ -1,41 +1,34 @@
 <template>
     <div>
-        <div
-                :class="{'has-content': dateValue !== undefined && dateValue !== ''}"
-                class="control is-inline">
-            <input
-                    :disabled="disabled"
-                    class="input"
-                    :class="{'is-danger': isInvalidDate && dateValue}"
-                    type="text"
-                    v-mask="dateMask"
-                    v-model="dateValue"
-                    @blur="onBlur"
-                    @input="onInput"
-                    :placeholder="dateFormat.toLowerCase()">
-            <p
-                    v-if="isInvalidDate && dateValue"
-                    class="has-text-danger is-italic is-size-7">{{ $i18n.get('info_error_invalid_date') }}</p>
-            <!--<b-collapse-->
-                    <!--position="is-bottom-right">-->
-                <!--<span class="icon"-->
-                        <!--icon="calendar-today"-->
-                        <!--size="is-small"-->
-                        <!--slot="trigger" />-->
+        <b-input
+                :id="metadatum.metadatum.metadata_type_object.component + '-' + metadatum.metadatum.slug"
+                :disabled="disabled"
+                class="input"
+                :class="{'is-danger': isInvalidDate && dateValue}"
+                type="text"
+                v-mask="dateMask"
+                v-model="dateValue"
+                @input.native="onInput"
+                :placeholder="dateFormat.toLowerCase()" />
+        <p
+                v-if="isInvalidDate && dateValue"
+                class="has-text-danger is-italic is-size-7">{{ $i18n.get('info_error_invalid_date') }}</p>
+        <!--<b-collapse-->
+                <!--position="is-bottom-right">-->
+            <!--<span class="icon"-->
+                    <!--icon="calendar-today"-->
+                    <!--size="is-small"-->
+                    <!--slot="trigger" />-->
 
-                <!--<div class="field">-->
-                    <!--<b-datepicker-->
-                            <!--:class="{'has-content': dateValue !== undefined && dateValue !== ''}"-->
-                            <!--:id="id"-->
-                            <!--v-model="dateValue"-->
-                            <!--@blur="onBlur"-->
-                            <!--:readonly="false"-->
-                            <!--inline-->
-                            <!--@input="onInput($event)"-->
-                            <!--:placeholder="datePlaceHolder"/>-->
-                <!--</div>-->
-            <!--</b-collapse>-->
-        </div>
+            <!--<div class="field">-->
+                <!--<b-datepicker-->
+                        <!--v-model="dateValue"-->
+                        <!--:readonly="false"-->
+                        <!--inline-->
+                        <!--@input="onInput($event)"-->
+                        <!--:placeholder="datePlaceHolder"/>-->
+            <!--</div>-->
+        <!--</b-collapse>-->
     </div>
 </template>
 
@@ -56,17 +49,11 @@
             }
         },
         props: {
-            id: '',
-            metadatum: {
-                type: Object
-            },
+            metadatum: Object,
             value: [String, Number, Array],
             disabled: false,
         },
         methods: {
-            onBlur() {
-                this.$emit('blur');
-            },
             onInput: _.debounce(function ($event) {
                 // Emty dates don't need to be validated, they remove the metadata
                 if ($event.target.value != '') {
@@ -89,8 +76,14 @@
                 } else  {
                    this.$emit('input', [null]); 
                 }
-                this.$emit('blur');
             }, 300)
         }
     }
 </script>
+
+<style scoped lang="scss">
+.control {
+    padding-left: 0 !important;
+    padding-right: 0 !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/classes/metadata-types/numeric/FormNumeric.vue b/src/classes/metadata-types/numeric/FormNumeric.vue
new file mode 100644
index 000000000..bbfa35061
--- /dev/null
+++ b/src/classes/metadata-types/numeric/FormNumeric.vue
@@ -0,0 +1,99 @@
+<template>
+    <section>
+        <b-field :addons="false">
+            <label class="label is-inline">
+                {{ $i18n.getHelperTitle('tainacan-numeric', 'step') }}<span>&nbsp;*&nbsp;</span>
+                <help-button
+                        :title="$i18n.getHelperTitle('tainacan-numeric', 'step')"
+                        :message="$i18n.getHelperMessage('tainacan-numeric', 'step')"/>
+            </label>
+            <div
+                    v-if="!showEditStepOptions"
+                    class="is-flex">
+                <b-select
+                        name="step_options"
+                        v-model="step"
+                        @input="onUpdateStep">
+                    <option value="0.001">0.001</option>
+                    <option value="0.01">0.01</option>
+                    <option value="0.1">0.1</option>
+                    <option value="1">1</option>
+                    <option value="2">2</option>
+                    <option value="5">5</option>
+                    <option value="10">10</option>
+                    <option value="100">100</option>
+                    <option value="1000">1000</option>
+                    <option
+                            v-if="step && ![0.001,0.01,0.1,1,2,5,10,100,1000].find( (element) => element == step )"
+                            :value="step">
+                        {{ step }}</option>
+                </b-select>
+                <button
+                        class="button is-white is-pulled-right"
+                        :aria-label="$i18n.get('edit')"
+                        @click.prevent="showEditStepOptions = true">
+                    <span 
+                            v-tooltip="{
+                                content: $i18n.get('edit'),
+                                autoHide: true,
+                                placement: 'bottom'
+                            }"
+                            class="icon">
+                        <i class="tainacan-icon tainacan-icon-18px tainacan-icon-edit has-text-secondary"/>
+                    </span>
+                </button>
+            </div>
+            <div
+                    v-if="showEditStepOptions"
+                    class="is-flex">
+                <b-input
+                        name="max_options"
+                        v-model="step"
+                        @input="onUpdateStep"
+                        type="number"
+                        step="1" />
+                <button
+                        @click.prevent="showEditStepOptions = false"
+                        class="button is-white is-pulled-right">
+                    <span 
+                            v-tooltip="{
+                                content: $i18n.get('close'),
+                                autoHide: true,
+                                placement: 'bottom'
+                            }"
+                            class="icon">
+                        <i class="tainacan-icon tainacan-icon-18px tainacan-icon-close has-text-secondary"/>
+                    </span>
+                </button>
+            </div>
+        </b-field>
+    </section>
+</template>
+
+<script>
+    export default {
+        props: {
+            value: [ String, Object, Array ]
+        },
+        data() {
+            return {
+                step: [Number, String],
+                showEditStepOptions: false
+            }
+        },
+        methods: {
+            onUpdateStep(value) {
+                this.$emit('input', { step: value });
+            }
+        },
+        created() {
+            this.step = this.value && this.value.step ? this.value.step : 0.01;
+        }
+    }
+</script>
+
+<style scoped>
+    section{
+        margin-bottom: 10px;
+    }
+</style>
\ No newline at end of file
diff --git a/src/classes/metadata-types/numeric/Numeric.vue b/src/classes/metadata-types/numeric/Numeric.vue
index 4c0377e60..d08e3529a 100644
--- a/src/classes/metadata-types/numeric/Numeric.vue
+++ b/src/classes/metadata-types/numeric/Numeric.vue
@@ -1,44 +1,32 @@
 <template>
     <b-input
             :disabled="disabled"
-            :class="{'has-content': inputValue !== undefined && inputValue !== ''}"
-            :id="id"
-            lang="en"
+            :id="metadatum.metadatum.metadata_type_object.component + '-' + metadatum.metadatum.slug"
+            :value="value"
+            @input="onInput($event)"
             type="number"
-            :value="inputValue"
-            step="0.01"
-            @blur="onBlur"
-            @change="onBlur"
-            @input="onInput($event)"/>
+            lang="en"
+            :step="getStep"/>
 </template>
 
 <script>
     export default {
-        created(){
-            if( this.value ){
-                this.inputValue = this.value
-            }
-        },
-        data() {
-            return {
-                inputValue: ''
-            }
-        },
         props: {
-            id: '',
-            metadatum: {
-                type: Object
-            },
+            metadatum: Object,
             value: [String, Number, Array],
             disabled: false,
         },
+        computed: {
+            getStep() {
+                if (this.metadatum && this.metadatum.metadatum.metadata_type_options && this.metadatum.metadatum.metadata_type_options.step)
+                    return this.metadatum.metadatum.metadata_type_options.step;
+                else
+                    return 0.01;
+            }
+        },
         methods: {
-            onBlur() {
-                this.$emit('blur');
-            },
-            onInput($event) {
-                this.inputValue = $event;
-                this.$emit('input', this.inputValue);
+            onInput(value) {
+                this.$emit('input', value);
             }
         }
     }
diff --git a/src/classes/metadata-types/numeric/class-tainacan-numeric.php b/src/classes/metadata-types/numeric/class-tainacan-numeric.php
index f8ea3d3e1..2112aa130 100644
--- a/src/classes/metadata-types/numeric/class-tainacan-numeric.php
+++ b/src/classes/metadata-types/numeric/class-tainacan-numeric.php
@@ -12,9 +12,10 @@ class Numeric extends Metadata_Type {
     function __construct(){
         // call metadatum type constructor
         parent::__construct();
+        $this->set_name( __('Numeric', 'tainacan') );
         $this->set_primitive_type('float');
         $this->set_component('tainacan-numeric');
-        $this->set_name( __('Numeric', 'tainacan') );
+        $this->set_form_component('tainacan-form-numeric');
         $this->set_description( __('A numeric value, integer or float', 'tainacan') );
         $this->set_preview_template('
             <div>
@@ -25,6 +26,18 @@ class Numeric extends Metadata_Type {
         ');
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function get_form_labels(){
+        return [
+            'step' => [
+                'title' => __( 'Step', 'tainacan' ),
+                'description' => __( 'The amount to be increased or decreased when clicking on filter control buttons.', 'tainacan' ),
+            ]
+        ];
+    }
+
     /**
      * @param $itemMetadata \Tainacan\Entities\Item_Metadata_Entity The instace of the entity itemMetadata
      * @return string
diff --git a/src/classes/metadata-types/relationship/Relationship.vue b/src/classes/metadata-types/relationship/Relationship.vue
index b36e5262d..5520ffad6 100644
--- a/src/classes/metadata-types/relationship/Relationship.vue
+++ b/src/classes/metadata-types/relationship/Relationship.vue
@@ -3,17 +3,41 @@
         <b-taginput
                 expanded
                 :disabled="disabled"
-                :id="id"
-                v-model="selected"
+                :id="metadatum.metadatum.metadata_type_object.component + '-' + metadatum.metadatum.slug"
+                :value="selected"
+                size="is-small"
+                icon="magnify"
+                @input="onInput"
                 :data="options"
                 :maxtags="maxtags != undefined ? maxtags : (metadatum.metadatum.multiple == 'yes' || allowNew === true ? 100 : 1)"
                 autocomplete
                 attached
-                :loading="loading"
+                :placeholder="$i18n.get('instruction_type_existing_term')"
+                :loading="isLoading"
                 :aria-close-label="$i18n.get('remove_value')"
                 :class="{'has-selected': selected != undefined && selected != []}"
                 field="label"
-                @typing="search"/>
+                @typing="(query) => { options = []; search(query); }">
+            <template slot-scope="props">
+                <div class="media">
+                    <div 
+                            v-if="props.option.img"
+                            class="media-left">
+                        <img 
+                                width="28"
+                                :src="props.option.img">
+                    </div>
+                    <div class="media-content">
+                        {{ props.option.label }}
+                    </div>
+                </div>
+            </template>
+            <template 
+                    v-if="!isLoading"
+                    slot="empty">
+                {{ $i18n.get('info_no_item_found') }}
+            </template>
+        </b-taginput>
     </div>
 </template>
 
@@ -22,17 +46,20 @@
     import qs from 'qs';
 
     export default {
-        created(){
-            let collectionId = ( this.metadatum && this.metadatum.metadatum.metadata_type_options.collection_id ) ? this.metadatum.metadatum.metadata_type_options.collection_id : this.collection_id;
-            if ( this.metadatum.value && (Array.isArray( this.metadatum.value ) ? this.metadatum.value.length > 0 : true )){
+        created() {
+            this.collectionId = ( this.metadatum && this.metadatum.metadatum.metadata_type_options && this.metadatum.metadatum.metadata_type_options.collection_id ) ? this.metadatum.metadatum.metadata_type_options.collection_id : '';
+            if (this.metadatum.value && (Array.isArray( this.metadatum.value ) ? this.metadatum.value.length > 0 : true )) {
                 let query = qs.stringify({ postin: ( Array.isArray( this.metadatum.value ) ) ? this.metadatum.value : [ this.metadatum.value ]  });
                 query += this.metadatum.metadatum.metadata_type_options.search ? '&fetch_only_meta=' + this.metadatum.metadatum.metadata_type_options.search : '';
-                axios.get('/collection/'+collectionId+'/items?' + query + '&nopaging=1&fetch_only=title,thumbnail')
+                axios.get('/collection/' + this.collectionId + '/items?' + query + '&nopaging=1&fetch_only=title,thumbnail')
                     .then( res => {
                         if (res.data.items) {
-                            for (let item of res.data.items) {
-                                this.selected.push({ label: this.getItemLabel(item), value: item.id, img: item.thumbnail && item.thumbnail['tainacan-small'] && item.thumbnail['tainacan-small'][0] ? item.thumbnail['tainacan-small'][0] : '' });
-                            }
+                            for (let item of res.data.items)
+                                this.selected.push({
+                                    label: this.getItemLabel(item),
+                                    value: item.id,
+                                    img: item.thumbnail && item.thumbnail['tainacan-small'] && item.thumbnail['tainacan-small'][0] ? item.thumbnail['tainacan-small'][0] : ''
+                                });
                         }
                     })
                     .catch(error => {
@@ -40,100 +67,78 @@
                     });
             }
         },
-        data(){
+        data() {
             return {
                 results:'',
                 selected:[],
                 options: [],
-                loading: false,
-                collectionId: 0,
+                isLoading: false,
+                collectionId: '',
                 inputValue: null,
                 queryObject: {},
                 itemsFound: []
             }
         },
         props: {
-            metadatum: {
-                type: Object
-            },
-            collection_id: {
-                type: Number
-            },
-            id: '',
+            metadatum: Object,
             maxtags: undefined,
             disabled: false,
             allowNew: true,
         },
-        watch: {
-            selected( value ){
-                this.selected = value;
-                let values = [];
-                if( this.selected.length > 0 ){
-                    for(let val of this.selected){
-                        values.push( val.value );
-                    }
-                }
-                this.onInput( values );
-            }
-        },
         methods: {
             setResults(option){
                 if(!option)
                     return;
                 this.results = option.value;
             },
-            onInput( $event ) {
-                this.$emit('input', $event);
-                this.$emit('blur');
+            onInput(newSelected) {
+                this.selected = newSelected;
+                this.$emit('input', newSelected.map((item) => item.value));
             },
             search: _.debounce(function(query) {
                 if ( this.selected.length > 0  && this.metadatum.metadatum.multiple === 'no')
                     return '';
 
                 if (query !== '') {
-                    this.loading = true;
-                    this.options = [];
-                    
-                    let metaquery = this.mountQuery( query );
-                    let collectionId = ( this.metadatum && this.metadatum.metadatum.metadata_type_options.collection_id ) ? this.metadatum.metadatum.metadata_type_options.collection_id : this.collection_id;
-                    
-                    axios.get('/collection/'+collectionId+'/items?' + qs.stringify( metaquery ))
-                        .then( res => {
-                            this.loading = false;
-                            this.options = [];
-                            let result = res.data;
+                    this.isLoading = true;
 
-                            if (result.items) {
-                                for (let item of result.items) {
-                                    this.options.push({ label: this.getItemLabel(item), value: item.id })
-                                }
+                    axios.get('/collection/' + this.collectionId + '/items?' + this.getQueryString(query))
+                        .then( res => {
+                            this.isLoading = false;
+                            this.options = [];
+
+                            if (res.data.items) {
+                                for (let item of res.data.items)
+                                    this.options.push({
+                                        label: this.getItemLabel(item),
+                                        value: item.id,
+                                        img: item.thumbnail && item.thumbnail['tainacan-small'] && item.thumbnail['tainacan-small'][0] ? item.thumbnail['tainacan-small'][0] : ''
+                                    })
                             }
                         })
                         .catch(error => {
                             this.$console.log(error);
                         });
-                } else {
-                    this.options = [];
                 }
+
             }, 500),
             getItemLabel(item) {
                 let label = '';
                 for (let m in item.metadata) {
-                    if (item.metadata[m].id == this.metadatum.metadatum.metadata_type_options.search) {
+                    if (item.metadata[m].id == this.metadatum.metadatum.metadata_type_options.search)
                         label = item.metadata[m].value_as_string;
-                    }
                 }
-                if (label != '' && label != item.title && item.title != '') {
+                if (label != '' && label != item.title && item.title != '')
                     label += ' (' + item.title + ')';
-                } else if (label == '') {
+                else if (label == '')
                     label = item.title;
-                }
+                
                 return label;
             },
-            mountQuery( search ) {
+            getQueryString( search ) {
                 let query = [];
 
-                if ( this.metadatum.metadatum.metadata_type_options &&
+                if (this.metadatum.metadatum.metadata_type_options &&
                     this.metadatum.metadatum.metadata_type_options.search)
                 {
                     query['metaquery'] = [];
@@ -150,7 +155,7 @@
                 query['fetch_only'] = 'title,thumbnail';
                 query['fetch_only_meta'] = this.metadatum.metadatum.metadata_type_options.search;
 
-                return query;
+                return qs.stringify(query);
             }
         }
     }
diff --git a/src/classes/metadata-types/relationship/class-tainacan-relationship.php b/src/classes/metadata-types/relationship/class-tainacan-relationship.php
index 83b87b1b9..698d5d88a 100644
--- a/src/classes/metadata-types/relationship/class-tainacan-relationship.php
+++ b/src/classes/metadata-types/relationship/class-tainacan-relationship.php
@@ -148,8 +148,8 @@ class Relationship extends Metadata_Type {
 					}
 					
 					
-				} catch (Exception $e) {
-					// item not found 
+				} catch (\Exception $e) {
+					// item not found
 				}
 				
 			}
@@ -164,7 +164,7 @@ class Relationship extends Metadata_Type {
 					$return .= $this->get_item_html($item);
 				}
 				
-			} catch (Exception $e) {
+			} catch (\Exception $e) {
 				// item not found 
 			}
 			
diff --git a/src/classes/metadata-types/selectbox/Selectbox.vue b/src/classes/metadata-types/selectbox/Selectbox.vue
index 532a63b64..538c39724 100644
--- a/src/classes/metadata-types/selectbox/Selectbox.vue
+++ b/src/classes/metadata-types/selectbox/Selectbox.vue
@@ -1,44 +1,33 @@
 <template>
-    <div>
-        <b-select
-                expanded
-                :disabled="disabled"
-                :id = "id"
-                :placeholder="$i18n.get('label_selectbox_init')"
-                :value="value"
-                :class="{'is-empty': value == undefined || value == ''}"
-                @blur="$emit('blur')"
-                @input="onChecked($event)">
-            <option
-                    v-for="(option, index) in getOptions"
-                    :key="index"
-                    :label="option"
-                    :value="option"
-                    border>{{ option }}</option>
-        </b-select>
-    </div>
+    <b-select
+            expanded
+            :disabled="disabled"
+            :id="metadatum.metadatum.metadata_type_object.component + '-' + metadatum.metadatum.slug"
+            :placeholder="$i18n.get('label_selectbox_init')"
+            :value="value"
+            @input="onSelected($event)">
+        <option value="">{{ $i18n.get('label_selectbox_init') }}...</option>
+        <option
+                v-for="(option, index) in getOptions"
+                :key="index"
+                :label="option"
+                :value="option">
+            {{ option }}
+        </option>
+    </b-select>
 </template>
 
 <script>
 
     export default {
         props: {
-            metadatum: {
-                type: Object
-            },
-            options: {
-                type: String
-            },
+            metadatum: Object,
             value: [String, Number, Array],
-            id: '',
             disabled: false,
         },
         computed: {
             getOptions(){
-                if ( this.options && this.options !== '' ){
-                    return this.options.split("\n");
-                }
-                else if ( this.metadatum && this.metadatum.metadatum.metadata_type_options.options ) {
+                if (this.metadatum && this.metadatum.metadatum.metadata_type_options && this.metadatum.metadatum.metadata_type_options.options ) {
                     const metadata = this.metadatum.metadatum.metadata_type_options.options;
                     return ( metadata ) ? metadata.split("\n") : [];
                 }
@@ -46,7 +35,7 @@
             }
         },
         methods: {
-            onChecked(value) {
+            onSelected(value) {
                 this.$emit('input', value);
             },
         }
diff --git a/src/classes/metadata-types/tainacan-form-item.vue b/src/classes/metadata-types/tainacan-form-item.vue
index d39c4937f..08f0bd7b6 100644
--- a/src/classes/metadata-types/tainacan-form-item.vue
+++ b/src/classes/metadata-types/tainacan-form-item.vue
@@ -27,8 +27,12 @@
             <span
                     v-if="metadatum.metadatum.required == 'yes'"
                     class="required-metadatum-asterisk"
-                    :class="metadatumTypeMessage">*</span>
-            <span class="metadata-type">({{ $i18n.get(metadatum.metadatum.metadata_type_object.component) }})</span>
+                    :class="metadatumTypeMessage">
+                *
+            </span>
+            <span class="metadata-type">
+                ({{ metadatum.metadatum.metadata_type_object.name }})
+            </span>
             <help-button 
                     :title="metadatum.metadatum.name"
                     :message="metadatum.metadatum.description"/>
@@ -38,43 +42,46 @@
                     v-show="isCollapsed || metadatumTypeMessage == 'is-danger'"
                     v-if="isTextInputComponent( metadatum.metadatum.metadata_type_object.component )">
                 <component 
-                        :id="metadatum.metadatum.metadata_type_object.component + '-' + metadatum.metadatum.slug"
                         :is="metadatum.metadatum.metadata_type_object.component"
                         v-model="inputs[0]" 
                         :metadatum="metadatum"
-                        @input="emitIsChangingValue()"/>
-                <div v-if="metadatum.metadatum.multiple == 'yes'">
-                    <div 
-                            v-if="index > 0" 
-                            v-for="(input, index) in inputsList " 
-                            :key="index" 
+                        @input="changeValue()"/>
+                <template v-if="metadatum.metadatum.multiple == 'yes' && inputs.length > 1">
+                    <transition-group
+                            name="filter-item"
                             class="multiple-inputs">
-                        <component 
-                                :id="metadatum.metadatum.metadata_type_object.component + '-' + metadatum.metadatum.slug"
-                                :is="metadatum.metadatum.metadata_type_object.component"
-                                v-model="inputs[index]" 
-                                :metadatum="metadatum"
-                                @input="emitIsChangingValue()"/>
+                        <template v-for="(input, index) of inputs">
+                            <component 
+                                    v-if="index > 0"
+                                    :key="index"
+                                    :is="metadatum.metadatum.metadata_type_object.component"
+                                    v-model="inputs[index]" 
+                                    :metadatum="metadatum"
+                                    @input="changeValue()"/>
                             <a 
                                     v-if="index > 0" 
                                     @click="removeInput(index)"
-                                    class="is-inline add-link">
+                                    class="add-link"
+                                    :key="index">
                                 <b-icon
                                         icon="minus-circle"
                                         size="is-small"
                                         type="is-secondary"/>
-                                &nbsp;{{ $i18n.get('label_remove_value') }}</a>
-                    </div>
-
+                                &nbsp;{{ $i18n.get('label_remove_value') }}
+                            </a>
+                        </template>
+                    </transition-group>
+                </template>
+                <template v-if="metadatum.metadatum.multiple == 'yes'">
                     <a 
                             @click="addInput"
-                            class="is-inline add-link">
+                            class="is-block add-link">
                         <span class="icon is-small">
                             <i class="tainacan-icon has-text-secondary tainacan-icon-add"/>
                         </span>
                         &nbsp;{{ $i18n.get('label_add_value') }}
                     </a>
-                </div>
+                </template>
             </div>
         </transition>
         <transition name="filter-item">
@@ -82,11 +89,10 @@
                     v-show="isCollapsed"
                     v-if="!isTextInputComponent( metadatum.metadatum.metadata_type_object.component )">
                 <component
-                        :id="metadatum.metadatum.metadata_type_object.component + '-' + metadatum.metadatum.slug"
                         :is="metadatum.metadatum.metadata_type_object.component"
                         v-model="inputs"
                         :metadatum="metadatum"
-                        @input="emitIsChangingValue()"/>
+                        @input="changeValue()"/>
             </div>
         </transition>
     </b-field>
@@ -98,112 +104,85 @@
     export default {
         name: 'TainacanFormItem',
         props: {
-            metadatum: {
-                type: Object
-            },
-            isCollapsed: true // Metadatum Collapses
+            metadatum: Object,
+            isCollapsed: true
         },
         data(){
             return {
-                inputs: [],
-                metadatumTypeMessage:''
+                inputs: []
             }
         },
         computed: {
-            inputsList() {
-                return this.inputs;
-            },
             getErrorMessage() {
-                
-                let msg = '';
+                let errorMessage = '';
                 let errors = eventBus.getErrors(this.metadatum.metadatum.id);
 
-                if ( errors) {
-                    this.setMetadatumTypeMessage('is-danger');
+                if (errors) {
                     for (let error of errors) { 
-                        for (let index of Object.keys(error)) {
-                            // this.$console.log(index);
-                            msg += error[index] + '\n';
-                        }
+                        for (let index of Object.keys(error))
+                            errorMessage += error[index] + '\n';
                     }
-                } else {
-                    this.setMetadatumTypeMessage('');
                 }
 
-                return msg;
+                return errorMessage;
+            },
+            metadatumTypeMessage() {
+                return this.getErrorMessage ? 'is-danger' : ''
             }
         },
-        created(){
-            this.getValue();
+        created() {
+            this.createInputs();
         },
         methods: {
-            emitIsChangingValue() {
-                this.changeValue();
-            },
             changeValue: _.debounce(function() {
-                
-                if(this.metadatum.value != this.inputs){
 
-                    if(this.inputs.length > 0 && this.inputs[0].value){
-                        let terms = [];
-
-                        for(let term of this.inputs){
-                            terms.push(term.value);
-                        }
-
-                        if(this.metadatum.value instanceof Array){
-                            let eq = [];
-
-                            for(let meta of terms){
-                                let found = this.metadatum.value.find((element) => {
-                                    return meta == element.id;
-                                });
-
-                                if(found){
-                                    eq.push(found);
-                                }
-                            }
-
-                            if(eq.length == terms.length && this.metadatum.value.length <= eq.length){
-                                return;
-                            }
-                        }
-                    } else if(this.metadatum.value.constructor.name == 'Object'){
-
-                        if(this.metadatum.value.id == this.inputs){
-                            return;
-                        }
-                    } else if(this.metadatum.value instanceof Array){                        
-                        let eq = [];
-
-                        for(let meta of this.inputs){
-                            let found = this.metadatum.value.find((element) => {
-                                return meta == element.id;
-                            });
-
-                            if(found){
-                                eq.push(found);
-                            }
-                        }
-
-                        if(eq.length == this.inputs.length && this.metadatum.value.length <= eq.length){
-                            return;
-                        }
-                    } 
-
-                    eventBus.$emit('input', { item_id: this.metadatum.item.id, metadatum_id: this.metadatum.metadatum.id, values: this.inputs } );
-                }
-            }, 1000),
-            getValue(){ 
-                if (this.metadatum.value instanceof Array) {
-                    this.inputs = this.metadatum.value.slice(0);
+                if (this.inputs && this.inputs.length > 0 && this.inputs[0] && this.inputs[0].value) {
+                    let terms = this.inputs.map(term => term.value)
                     
-                    if (this.inputs.length === 0){
-                        this.inputs.push('');
+                    if (this.metadatum.value instanceof Array){
+                        let equal = [];
+
+                        for (let meta of terms) {
+                            let foundIndex = this.metadatum.value.findIndex(element => meta == element.id);
+                            if (foundIndex >= 0)
+                                equal.push(this.metadatum.value[foundIndex]);
+                        }
+
+                        if (equal.length == terms.length && this.metadatum.value.length <= equal.length)
+                            return;
+
                     }
-                } else {
-                    this.metadatum.value == null || this.metadatum.value == undefined ? this.inputs.push('') : this.inputs.push(this.metadatum.value);
+                } else if (this.metadatum.value.constructor.name == 'Object') {
+
+                    if (this.metadatum.value.id == this.inputs)
+                        return;
+
+                } else if (this.metadatum.value instanceof Array) {  
+
+                    let equal = [];
+
+                    for (let meta of this.inputs) {
+                        let foundIndex = this.metadatum.value.findIndex(element => meta == element.id);
+
+                        if (foundIndex >= 0)
+                            equal.push(this.metadatum.value[foundIndex]);
+                    }
+
+                    if (equal.length == this.inputs.length && this.metadatum.value.length <= equal.length)
+                        return;
                 }
+                eventBus.$emit('input', {
+                    itemId: this.metadatum.item.id,
+                    metadatumId: this.metadatum.metadatum.id,
+                    values: this.inputs ? this.inputs : ''
+                });
+            
+            }, 900),
+            createInputs() {
+                if (this.metadatum.value instanceof Array)
+                    this.inputs = this.metadatum.value.slice(0);
+                else
+                    this.metadatum.value == null || this.metadatum.value == undefined ? this.inputs = [] : this.inputs.push(this.metadatum.value);
             },
             addInput(){
                 this.inputs.push('');
@@ -213,12 +192,9 @@
                 this.inputs.splice(index, 1);
                 this.changeValue();
             },
-            isTextInputComponent( component ){
-                let array = ['tainacan-relationship','tainacan-taxonomy'];
-                return !( array.indexOf( component ) >= 0 );
-            },
-            setMetadatumTypeMessage( message ){
-                this.metadatumTypeMessage = message;
+            isTextInputComponent(component) {
+                const array = ['tainacan-relationship','tainacan-taxonomy'];
+                return !(array.indexOf(component) >= 0 );
             }
         }
     }
diff --git a/src/classes/metadata-types/taxonomy/AddNewTerm.vue b/src/classes/metadata-types/taxonomy/AddNewTerm.vue
index d15c6f633..18a292e91 100644
--- a/src/classes/metadata-types/taxonomy/AddNewTerm.vue
+++ b/src/classes/metadata-types/taxonomy/AddNewTerm.vue
@@ -1,19 +1,19 @@
 <template>
-    <div>
+    <div class="add-new-term">
         <span v-if="!showForm">
             <a
                     @click="toggleForm()"
-                    class="is-inline add-link">
+                    class="add-link">
                 <span class="icon is-small">
                     <i class="tainacan-icon has-text-secondary tainacan-icon-add"/>
                 </span>
                 &nbsp;{{ $i18n.get('label_new_term') }}
             </a>
         </span>
-        <transition name="appear">
+        <transition name="filter-item">
             <section
                     v-if="showForm"
-                    style="padding-left: 0px; margin-top: 12px; margin-bottom: -12px;">
+                    class="add-new-term-form">
                 <b-field 
                         :addons="false"
                         :type="((formErrors.name !== '' || formErrors.repeated !== '') && (formErrors.name !== undefined || formErrors.repeated !== undefined )) ? 'is-danger' : ''"
@@ -25,26 +25,12 @@
                                 :title="$i18n.get('label_name')"
                                 :message="$i18n.get('info_help_term_name')"/>
                     </label>
-                    <b-input
-                            :class="{'has-content': name != undefined && name != ''}" 
+                    <b-input 
+                            :placeholder="$i18n.get('label_term_without_name')"
                             v-model="name"
                             @focus="clearErrors({ name: 'name', repeated: 'repeated' })"/>
                 </b-field>
 
-                <!-- <b-field :label="$i18n.get('label_parent_term')">
-                    <b-select
-                            v-model="parent">
-                        <option 
-                                :value="0" 
-                                selected> ---{{ $i18n.get('label_parent_term') }}--- </option>
-                        <option
-                                v-for="(option,index) in options"
-                                :key="index"
-                                :value="option.id"
-                                v-html="setSpaces( option.level ) + option.name"/>
-                    </b-select>
-                </b-field> -->
-                
                 <!-- Parent -------------- -->
                 <b-field
                         :addons="false"
@@ -62,7 +48,7 @@
                                 :message="$i18n.get('info_help_parent_term')"/>
                     </label>
                     <b-autocomplete
-                            id="tainacan-text-cover-page"
+                            id="tainacan-add-parent-field"
                             :placeholder="$i18n.get('instruction_parent_term')"
                             :data="parentTerms"
                             field="name"
@@ -85,22 +71,22 @@
                         </p>
                     </transition>
                 </b-field>
-
-                <button
-                        :class="{ 'is-loading': isAddingNewTerm }"
-                        class="button is-outlined"
-                        @click="toggleForm()"
-                        type="button">
-                    {{ $i18n.get('cancel') }}
-                </button>
-
-                <button
-                        :class="{ 'is-loading': isAddingNewTerm }"
-                        class="button is-secondary"
-                        @click="save"
-                        type="button">
-                    {{ $i18n.get('save') }}
-                </button>
+                <div class="field is-grouped form-submit">
+                    <button
+                            :class="{ 'is-loading': isAddingNewTerm }"
+                            class="button is-outlined"
+                            @click="toggleForm()"
+                            type="button">
+                        {{ $i18n.get('cancel') }}
+                    </button>
+                    <button
+                            :class="{ 'is-loading': isAddingNewTerm }"
+                            class="button is-secondary"
+                            @click="save"
+                            type="button">
+                        {{ $i18n.get('label_create_and_select') }}
+                    </button>
+                </div>
             </section>
 
         </transition>
@@ -122,19 +108,15 @@
                 parentTermName: '',
                 isAddingNewTerm: false,
                 isFetchingParentTerms: false,
-                metadatum_id: this.metadatum.metadatum.id,
+                metadatumId: this.metadatum.metadatum.id,
+                itemId: this.metadatum.item.id,
                 formErrors: {}
             }
         },
         props: {
-            id: String,
-            item_id: [Number,String],
             metadatum: [Number,String],
-            taxonomy_id: [Number,String],
-            value:[ Array, Boolean, Number ],
-            options: {
-                type: Array
-            },
+            taxonomyId: [Number,String],
+            value: [ Array, Boolean, Number ],
             componentType: ''
         },
         methods: {
@@ -153,20 +135,11 @@
                 this.formErrors = {};
                 this.showForm = !this.showForm;
             },
-            setSpaces( level ){
-                let result = '';
-                let space =  '&nbsp;&nbsp;'
-
-                for(let i = 0;i < level; i++)
-                    result += space;
-
-                return result;
-            },
             fecthParentTerms(search) {
                 this.isFetchingParentTerms = true;
                 
                 this.fetchPossibleParentTerms({
-                        taxonomyId: this.taxonomy_id, 
+                        taxonomyId: this.taxonomyId, 
                         termId: 'new', 
                         search: search })
                     .then((parentTerms) => {
@@ -182,21 +155,21 @@
                 this.clearErrors('parent');
             },
             onSelectParentTerm(selectedParentTerm) {
-                this.parent = selectedParentTerm.id;
-                this.selectedParentTerm = selectedParentTerm;
-                this.parentTermName = selectedParentTerm.name;
+                if (selectedParentTerm) {
+                    this.parent = selectedParentTerm.id;
+                    this.parentTermName = selectedParentTerm.name;
+                }
             },
             clearErrors(attributes) {
-                if(attributes instanceof Object){
-                    for(let attribute in attributes){
+                if (attributes instanceof Object) {
+                    for(let attribute in attributes)
                         this.formErrors[attribute] = undefined;
-                    }
                 } else {
                     this.formErrors[attributes] = undefined;
                 }
             },
-            save(){
-                if( this.name.trim() === ''){
+            save() {
+                if (this.name.trim() === '') {
                     this.$buefy.toast.open({
                         duration: 2000,
                         message: this.$i18n.get('info_name_is_required'),
@@ -206,32 +179,32 @@
                 } else {
                     this.isAddingNewTerm = true;
 
-                    axios.post(`/taxonomy/${this.taxonomy_id}/terms?hideempty=0&order=asc`, {
+                    axios.post(`/taxonomy/${this.taxonomyId}/terms?hideempty=0&order=asc`, {
                         name: this.name,
                         parent: this.parent
                     })
-                    .then( res => {
+                    .then(res => {
 
-                        this.isAddingNewTerm = false;
-
-                        if( res.data && res.data.id || res.id ){
-                            let id = ( res.id ) ? res.id : res.data.id;
+                        if (res.data && res.data.id || res.id) {
+                            let id = res.id ? res.id : res.data.id;
                             let val = this.value;
 
-                            if( !Array.isArray( val ) && this.metadatum.metadatum.multiple === 'no' ){
-                                axios.patch(`/item/${this.item_id}/metadata/${this.metadatum_id}`, {
+                            if (!Array.isArray(val) && this.metadatum.metadatum.multiple === 'no') {
+                                axios.patch(`/item/${this.itemId}/metadata/${this.metadatumId}`, {
                                     values: id,
                                 }).then(() => {
-                                    this.$emit('newTerm', { values: id, taxonomyId: this.taxonomy_id, metadatumId: this.metadatum_id });
+                                    this.isAddingNewTerm = false;
+                                    this.$emit('newTerm', { values: id, taxonomyId: this.taxonomyId, metadatumId: this.metadatumId });
                                     this.toggleForm();
                                 })
                             } else {
-                                val = ( val ) ? val : [];
+                                val = val ? val : [];
                                 val.push( this.componentType == ('tainacan-taxonomy-checkbox' || 'tainacan-taxonomy-radio') ? id : {'label': this.name, 'value': id} );
-                                axios.patch(`/item/${this.item_id}/metadata/${this.metadatum_id}`, {
+                                axios.patch(`/item/${this.itemId}/metadata/${this.metadatumId}`, {
                                     values: val,
                                 }).then(() => {
-                                    this.$emit('newTerm', { values: val, taxonomyId: this.taxonomy_id, metadatumId: this.metadatum_id });
+                                    this.isAddingNewTerm = false;
+                                    this.$emit('newTerm', { values: val, taxonomyId: this.taxonomyId, metadatumId: this.metadatumId });
                                     this.toggleForm();
                                 })
                             }
@@ -256,5 +229,17 @@
         }
     }
 </script>
+
 <style scoped>
+    .add-new-term {
+        margin-top: 15px;
+        margin-bottom: 25px;
+        font-size: 0.75rem;
+    }
+    .add-new-term-form {
+        padding: 14px 24px 12px 24px;
+        margin-top: 12px; 
+        margin-bottom: -12px;
+        border: 1px solid #cbcbcb;
+    }
 </style>
\ No newline at end of file
diff --git a/src/classes/metadata-types/taxonomy/Taxonomy.vue b/src/classes/metadata-types/taxonomy/Taxonomy.vue
index 11317cbee..0fbc9e661 100644
--- a/src/classes/metadata-types/taxonomy/Taxonomy.vue
+++ b/src/classes/metadata-types/taxonomy/Taxonomy.vue
@@ -7,54 +7,32 @@
                 v-model="valueComponent"
                 :allow-select-to-create="allowSelectToCreate"
                 :allow-new="allowNew"
-                :terms="terms"
-                :taxonomy-id="taxonomy_id"
-                :options="getOptions(0)"/>
-        <a
-                class="add-new-term"
-                v-if="(this.getComponent == 'tainacan-taxonomy-checkbox' || this.getComponent == 'tainacan-taxonomy-radio') &&
-                 terms.length < totalTerms"
-                @click="openCheckboxModal()">
-            {{ $i18n.get('label_view_all') }}
-        </a>
+                :taxonomy-id="taxonomyId"
+                :metadatum="metadatum.metadatum"/>
         <add-new-term
-                class="add-new-term"
                 v-if="allowNew"
                 :component-type="getComponent"
-                :taxonomy_id="taxonomy_id"
+                :taxonomy-id="taxonomyId"
                 :metadatum="metadatum"
-                :item_id="metadatum.item.id"
                 :value="valueComponent"
-                :options="getOptions(0)"
                 @newTerm="reload"/>
     </div>
 </template>
 <script>
-    import { tainacan as axios } from '../../../js/axios/axios'
     import TainacanTaxonomyRadio from './TaxonomyRadio.vue'
     import TainacanTaxonomyCheckbox from './TaxonomyCheckbox.vue'
     import TainacanTaxonomyTagInput from './TaxonomyTaginput.vue'
     import AddNewTerm from  './AddNewTerm.vue'
-    import CheckboxRadioModal from '../../../admin/components/other/checkbox-radio-modal.vue'
 
     export default {
         created(){
-            let metadata_type_options = this.metadatum.metadatum.metadata_type_options;
-            this.component = ( metadata_type_options && metadata_type_options.input_type )
-                ? this.metadatum.metadatum.metadata_type_options.input_type : this.componentAttribute;
+            const metadata_type_options = this.metadatum.metadatum.metadata_type_options;
 
-            this.collectionId = this.metadatum.metadatum.collection_id;
-            this.taxonomy_id = metadata_type_options.taxonomy_id;
+            this.taxonomyId = metadata_type_options.taxonomy_id;
             this.taxonomy = metadata_type_options.taxonomy;
 
-            if( metadata_type_options && metadata_type_options.allow_new_terms && this.metadatum.item ){
+            if (metadata_type_options && metadata_type_options.allow_new_terms && this.metadatum.item) 
                 this.allowNew = metadata_type_options.allow_new_terms == 'yes';
-            }
-
-            // This condition is temporary
-            if(this.component != 'tainacan-taxonomy-tag-input' || this.forcedComponentType != 'tainacan-taxonomy-tag-input'){
-                this.getTermsFromTaxonomy();
-            }
 
             this.getTermsId();
         },
@@ -67,33 +45,20 @@
         data(){
             return {
                 valueComponent: null,
-                component: '',
-                collectionId: '',
-                taxonomy_id: '',
+                taxonomyId: '',
                 taxonomy: '',
-                terms:[], // object with names
-                totalTerms: 0,
-                allowNew: false,
-                offset: 0,
-                termsNumber: 12
+                terms:[],
+                allowNew: false
             }
         },
         watch: {
             valueComponent( val ){
-                this.valueComponent = val;
                 this.$emit('input', val);
-                this.$emit('blur');
             }
         },
         props: {
-            metadatum: {
-                type: Object
-            },
-            componentAttribute: {
-                type: String
-            },
+            metadatum: Object,
             value: [ Number, String, Array, Object ],
-            id: '',
             disabled: false,
             forcedComponentType: '',
             maxtags: '',
@@ -101,123 +66,36 @@
         },
         computed: {
             getComponent() {
-                if (this.forcedComponentType){
+                if (this.forcedComponentType)
                    return this.forcedComponentType;
-                } else if( this.metadatum.metadatum
-                    && this.metadatum.metadatum.metadata_type_options && this.metadatum.metadatum.metadata_type_options.input_type ){
+                else if(this.metadatum.metadatum &&
+                        this.metadatum.metadatum.metadata_type_options &&
+                        this.metadatum.metadatum.metadata_type_options.input_type
+                        )
                     return this.metadatum.metadatum.metadata_type_options.input_type;
-                    
-                }
             }
         },
         methods: {
-            openCheckboxModal(){
-                this.$buefy.modal.open({
-                    parent: this,
-                    component: CheckboxRadioModal,
-                    props: {
-                        isFilter: false,
-                        parent: 0,
-                        taxonomy_id: this.taxonomy_id,
-                        selected: !this.valueComponent ? [] : this.valueComponent,
-                        metadatumId: this.metadatum.metadatum.id,
-                        taxonomy: this.taxonomy,
-                        collectionId: this.collectionId,
-                        isTaxonomy: true,
-                        query: '',
-                        metadatum: this.metadatum.metadatum,
-                        isCheckbox: this.getComponent == 'tainacan-taxonomy-checkbox'
-                    },
-                    events: {
-                        input: (selected) => {
-                            this.valueComponent = selected;
-                        }
-                    },
-                    width: 'calc(100% - 8.333333333%)',
-                    trapFocus: true
-                });
-            },
-            getTermsFromTaxonomy(){
-                let endpoint = '/taxonomy/' + this.taxonomy_id + '/terms?hideempty=0&order=asc';
-
-                if (this.getComponent == 'tainacan-taxonomy-checkbox' || this.getComponent == 'tainacan-taxonomy-radio')
-                    endpoint = endpoint + '&number=' + this.termsNumber + '&offset=' + this.offset; 
-
-                axios.get(endpoint)
-                .then( res => {
-                    if (this.getComponent == 'tainacan-taxonomy-checkbox' || this.getComponent == 'tainacan-taxonomy-radio') {
-                        this.totalTerms = Number(res.headers['x-wp-total']);
-                        this.offset += this.termsNumber;
-                    }
-                    for (let item of res.data) {
-                        this.terms.push( item );
-                    }
-                })
-                .catch(error => {
-                    this.$console.log(error);
-                });
-            },
-            getOptions( parent, level = 0 ){ // retrieve only ids
-                let result = [];
-                if ( this.terms ){
-                    for( let term of this.terms ){
-                        if( term.parent == parent ){
-                            term['level'] = level;
-                            result.push( term );
-                            const levelTerm =  level + 1;
-                            const children =  this.getOptions( term.id, levelTerm);
-                            result = result.concat( children );
-                        }
-                    }
-                }
-                return result;
-            },
-            getTermsId(){
-              let values = [];
-
-              if( this.value && this.value.length > 0){
-                  for( let term of this.value ){
-                      if( term && term.id)
-                        values.push(term.id);
-                  }
-              }
-
-              if( values.length > 0 && this.metadatum.metadatum && this.component != 'tainacan-taxonomy-tag-input'){
-                  this.valueComponent = (  this.metadatum.metadatum && this.metadatum.metadatum.multiple === 'no' ) ? values[0] : values;
-              } else if(values.length > 0 && this.metadatum.metadatum && this.component == 'tainacan-taxonomy-tag-input') {
-                    let values = [];
-                        
-                    for(let term of this.value){
-                        values.push({label: term.name, value: term.id});
-                    }
-
+            getTermsId() {
+                let values = [];
+                if (this.value && this.metadatum.metadatum && this.getComponent != 'tainacan-taxonomy-tag-input') {
+                    values = this.value.map(term => term.id) 
+                    this.valueComponent = (values.length >= 0 && this.metadatum.metadatum && this.metadatum.metadatum.multiple === 'no') ? values[0] : values;
+                } else if (this.value && this.metadatum.metadatum && this.getComponent == 'tainacan-taxonomy-tag-input') {
+                    values = this.value.map((term) => { return { label: term.name, value: term.id } });
                     this.valueComponent = values;
-              }
-
+                }
             },
             onInput($event) {
-                this.inputValue = $event;
                 this.valueComponent = $event;
-                this.$emit('input', this.inputValue);
-                this.$emit('blur');
+                this.$emit('input', this.valueComponent);
             },
-            reload( $event ) {
-                if ($event.taxonomyId == this.taxonomy_id && $event.metadatumId == this.metadatum.metadatum.id) {
+            reload($event) {
+                if ($event.taxonomyId == this.taxonomyId && $event.metadatumId == this.metadatum.metadatum.id) {
                     this.valueComponent = $event.values;
-                    this.terms = [];
-                    this.offset = 0;
-                    this.getTermsFromTaxonomy();
-                    this.getTermsId();
+                    this.$emit('update-taxonomy-inputs', $event)
                 }
             }
         }
     }
 </script>
-
-<style scoped>
-    .add-new-term{
-        margin-top: 15px;
-        margin-bottom: 30px;
-        font-size: 0.75rem;
-    }
-</style>
\ No newline at end of file
diff --git a/src/classes/metadata-types/taxonomy/TaxonomyCheckbox.vue b/src/classes/metadata-types/taxonomy/TaxonomyCheckbox.vue
index 2f709bce8..ffb53a8f8 100644
--- a/src/classes/metadata-types/taxonomy/TaxonomyCheckbox.vue
+++ b/src/classes/metadata-types/taxonomy/TaxonomyCheckbox.vue
@@ -3,7 +3,7 @@
         <p 
                 v-if="value instanceof Array ? value.length > 0 : (value != undefined && value != '')"
                 class="has-text-gray">
-            {{ $i18n.get('label_selected_terms') + ' :' }}
+            {{ $i18n.get('label_selected_terms') + ':' }}
         </p>
         <b-field
                 v-if="value instanceof Array ? value.length > 0 : (value != undefined && value != '')"
@@ -24,97 +24,187 @@
                     v-if="isSelectedTermsLoading" 
                     class="control has-icons-right is-loading is-clearfix" />
         </b-field>
-       
-        <div   
-                v-for="(option, index) in options"
-                :key="index">
-            <b-checkbox
-                    :disabled="disabled"
-                    :id="id"
-                    :style="{ paddingLeft: (option.level * 30) + 'px' }"
-                    :key="index"
-                    v-model="checked"
-                    @input="onChecked(option)"
-                    :native-value="option.id"
-                    border>
-                {{ option.name }}
-            </b-checkbox>
-            <br>
+        <p 
+                style="margin-top: 10px;"
+                class="has-text-gray">
+            {{ (isShowingAllTerms ? $i18n.get('label_available_terms') : $i18n.get('label_some_available_terms')) + ':' }}
+        </p>
+        <div 
+                class="metadata-taxonomy-list"
+                :id="metadatum.metadata_type_object.component + '-' + metadatum.slug">
+            <template v-for="(option, index) in options">
+                <b-checkbox
+                        :key="index"
+                        :disabled="disabled"
+                        :style="{ paddingLeft: (option.level * 30) + 'px' }"
+                        v-model="checked"
+                        @input="onChecked(option)"
+                        :native-value="option.id"
+                        border>
+                    {{ option.name }}
+                </b-checkbox>
+                <br :key="index">
+            </template>
+        </div>
+        <div 
+                v-if="!isShowingAllTerms"
+                class="view-all">
+            <span>
+                {{
+                    $i18n.get('info_showing_terms') + 1 +
+                    $i18n.get('info_to') + options.length +
+                    $i18n.get('info_of') + totalTerms + '. '
+                }}
+            </span>
+            <a @click="openCheckboxModal()">
+                {{ $i18n.get('label_view_all') + ' ' + totalTerms + '.' }}
+            </a>
         </div>
     </div>
 </template>
 
 <script>
     import { tainacan as axios } from '../../../js/axios/axios';
+    import qs from 'qs';
+    import CheckboxRadioModal from '../../../admin/components/other/checkbox-radio-modal.vue'
 
     export default {
-        created(){
-            if( this.value && this.value.length > 0)
+        created() {
+            if (this.value && this.value.length > 0)
                 this.checked = this.value;
+
+            this.getTermsFromTaxonomy();
+            this.$parent.$on('update-taxonomy-inputs', ($event) => {
+                if ($event.taxonomyId == this.taxonomyId && $event.metadatumId == this.metadatum.id) {
+                    this.offset = 0;
+                    this.getTermsFromTaxonomy();
+                }
+            });
         },
-        data(){
+        data() {
             return {
                 checked: [],
                 selectedTagsName: {},
                 isSelectedTermsLoading: false,
+                options: [],
+                terms: [],
+                termsNumber: 12,
+                offset: 0,
+                totalTerms: 0
             }
         },
         watch: {
-            value( val ){
+            value(val){
                 this.checked = val;
                 this.fetchSelectedLabels();
             }
         },
+        computed: {
+            isShowingAllTerms() {
+                return this.terms.length >= this.totalTerms;
+            }
+        },
         props: {
-            options: {
-                type: Array
-            },
             value: [ Number, String, Array ],
             disabled: false,
-            taxonomyId: Number
+            taxonomyId: Number,
+            metadatum: Object
         },
         methods: {
             onChecked() {
-                this.$emit('blur');
                 this.onInput(this.checked);
             },
             onInput($event) {
-                this.inputValue = $event;
-                this.$emit('input', this.inputValue);
+                this.value = $event;
+                this.$emit('input', this.value);
             },
             fetchSelectedLabels() {
 
                 if (this.value != null && this.value != undefined) {
 
-                    this.isSelectedTermsLoading = true;
-                    let selected = this.value instanceof Array ? this.value : [this.value];
+                    const selected = this.value instanceof Array ? this.value : [this.value];
 
-                    if (this.taxonomyId && selected.length > 0) {
-                        for (const term of selected) {
+                    if (this.taxonomyId) {
+                        this.isSelectedTermsLoading = true;
 
-                            if(!this.isSelectedTermsLoading){
-                                this.isSelectedTermsLoading = true;
-                            }
+                        axios.get(`/taxonomy/${this.taxonomyId}/terms/?${qs.stringify({ hideempty: 0, include: selected })}`)
+                            .then((res) => {
+                                let terms = res.data;
 
-                            axios.get(`/taxonomy/${this.taxonomyId}/terms/${term}`)
-                                .then((res) => {
-                                    this.saveSelectedTagName(res.data.id, res.data.name);
-                                    this.isSelectedTermsLoading = false;
-                                })
-                                .catch((error) => {
-                                    this.$console.log(error);
-                                    this.isSelectedTermsLoading = false;
-                                });
-                        }
-                    } else {
-                        this.isSelectedTermsLoading = false;
+                                for (let term of terms) {
+                                    if (!this.selectedTagsName[term.id])
+                                        this.$set(this.selectedTagsName, term.id, term.name);
+                                }
+
+                                this.isSelectedTermsLoading = false;
+                            })
+                            .catch((error) => {
+                                this.$console.log(error);
+                                this.isSelectedTermsLoading = false;
+                            });
                     }
                 }
             },
-            saveSelectedTagName(value, label){
-                if(!this.selectedTagsName[value]) {
-                    this.$set(this.selectedTagsName, `${value}`, label);
+            getTermsFromTaxonomy() {
+                this.terms = [];
+
+                const endpoint = '/taxonomy/' + this.taxonomyId + '/terms?hideempty=0&order=asc&number=' + this.termsNumber + '&offset=' + this.offset; 
+
+                axios.get(endpoint)
+                    .then( res => {
+                        this.totalTerms = Number(res.headers['x-wp-total']);
+                        this.offset += this.termsNumber;
+                        
+                        for (let item of res.data)
+                            this.terms.push( item );
+
+                        this.options = this.getOptions(0);
+                    })
+                    .catch(error => {
+                        this.$console.log(error);
+                    });
+            },
+            getOptions(parent, level = 0) { // retrieve only ids
+                let result = [];
+                if (this.terms) {
+                    for (let term of this.terms){
+                        if (term.parent == parent){
+                            term['level'] = level;
+                            result.push(term);
+                            const levelTerm = level + 1;
+                            const children = this.getOptions( term.id, levelTerm);
+                            result = result.concat(children);
+                        }
+                    }
                 }
+                return result;
+            },
+            openCheckboxModal() {
+                this.$buefy.modal.open({
+                    parent: this,
+                    component: CheckboxRadioModal,
+                    props: {
+                        isFilter: false,
+                        parent: 0,
+                        taxonomy_id: this.taxonomyId,
+                        selected: !this.value ? [] : this.value,
+                        metadatumId: this.metadatum.id,
+                        taxonomy: this.taxonomy,
+                        collectionId: this.metadatum.collection_id,
+                        isTaxonomy: true,
+                        query: '',
+                        metadatum: this.metadatum,
+                        isCheckbox: true
+                    },
+                    events: {
+                        input: (selected) => {
+                            this.value = selected;
+                            this.$emit('input', this.value);
+                        }
+                    },
+                    width: 'calc(100% - 8.333333333%)',
+                    trapFocus: true
+                });
             }
         },
         mounted() {
@@ -123,7 +213,7 @@
     }
 </script>
 
-<style>
+<style scoped lang="scss">
     .selected-tags {
         margin-top: 0.75rem;
         font-size: 0.75rem;
@@ -138,4 +228,18 @@
         border-right-color: #dbdbdb !important;
         border-top-color: #dbdbdb !important;
     } 
+    .metadata-taxonomy-list {
+        column-count: 2;
+        margin: 10px;
+
+        label {
+            break-inside: avoid;
+            padding-right: 10px;
+        }
+    }
+    .view-all {
+        color: #898d8f;
+        margin-bottom: 20px;
+        font-size: 0.75rem;
+    }
 </style>
diff --git a/src/classes/metadata-types/taxonomy/TaxonomyRadio.vue b/src/classes/metadata-types/taxonomy/TaxonomyRadio.vue
index 79f5df3c6..23e57cce8 100644
--- a/src/classes/metadata-types/taxonomy/TaxonomyRadio.vue
+++ b/src/classes/metadata-types/taxonomy/TaxonomyRadio.vue
@@ -3,7 +3,7 @@
         <p 
                 v-if="value instanceof Array ? value.length > 0 : (value != undefined && value != '')"
                 class="has-text-gray">
-            {{ $i18n.get('label_selected_terms') + ' :' }}
+            {{ $i18n.get('label_selected_term') + ':' }}
         </p>
         <b-field
                 v-if="value instanceof Array ? value.length > 0 : (value != undefined && value != '')"
@@ -16,7 +16,7 @@
                 <b-tag
                         attached
                         closable
-                        @close="value = ''">
+                        @close="clearInput()">
                     {{ selectedTagsName[value] }}
                 </b-tag>
             </div>
@@ -24,43 +24,79 @@
                     v-if="isSelectedTermsLoading" 
                     class="control has-icons-right is-loading is-clearfix" />
         </b-field>
-        <b-radio
-                :disabled="disabled"
-                :id="id"
-                v-model="checked"
-                @input="onChecked()"
-                :native-value="''"
-                border>
-            {{ $i18n.get('clear_radio') }}
-        </b-radio>
-        <div
-                v-for="(option, index) in options"
-                :key="index">
+        <p 
+                style="margin-top: 10px;"
+                class="has-text-gray">
+            {{ (isShowingAllTerms ? $i18n.get('label_available_terms') : $i18n.get('label_some_available_terms')) + ':' }}
+        </p>
+        <div class="metadata-taxonomy-list">
             <b-radio
                     :disabled="disabled"
-                    :id="id"
-                    :style="{ paddingLeft: (option.level * 30) + 'px' }"
-                    :key="index"
+                    :id="metadatum.metadata_type_object.component + '-' + metadatum.slug"
                     v-model="checked"
-                    @input="onChecked(option)"
-                    :native-value="option.id"
+                    @input="onChecked('')"
+                    :native-value="''"
                     border>
-                {{ option.name }}
+                {{ $i18n.get('clear_radio') }}
             </b-radio>
-            <br>
+            <template
+                    :id="metadatum.metadata_type_object.component + '-' + metadatum.slug"
+                    v-for="(option, index) in options">
+                <b-radio
+                        :disabled="disabled"
+                        :style="{ marginLeft: 0, paddingLeft: (option.level * 30) + 'px' }"
+                        :key="index"
+                        v-model="checked"
+                        @input="onChecked(option)"
+                        :native-value="option.id"
+                        border>
+                    {{ option.name }}
+                </b-radio>
+                <br :key="index">
+            </template>
+        </div>
+        <div 
+                v-if="!isShowingAllTerms"
+                class="view-all">
+            <span>
+                {{
+                    $i18n.get('info_showing_terms') + 1 +
+                    $i18n.get('info_to') + options.length +
+                    $i18n.get('info_of') + totalTerms + '. '
+                }}
+            </span>
+            <a @click="openCheckboxModal()">
+                {{ $i18n.get('label_view_all') + ' ' + totalTerms + '.' }}
+            </a>
         </div>
     </div>
 </template>
 
 <script>
     import { tainacan as axios } from '../../../js/axios/axios';
+    import qs from 'qs';
+    import CheckboxRadioModal from '../../../admin/components/other/checkbox-radio-modal.vue'
 
     export default {
-        data(){
+        created() {
+            this.getTermsFromTaxonomy();
+            this.$parent.$on('update-taxonomy-inputs', ($event) => {
+                if ($event.taxonomyId == this.taxonomyId && $event.metadatumId == this.metadatum.id) {
+                    this.offset = 0;
+                    this.getTermsFromTaxonomy();
+                }
+            });
+        },
+        data() {
             return {
-                checked: ( this.value ) ? this.value : '',
+                checked: this.value ? this.value : '',
                 selectedTagsName: {},
                 isSelectedTermsLoading: false,
+                options: [],
+                terms: [],
+                termsNumber: 12,
+                offset: 0,
+                totalTerms: 0
             }
         },
         watch: {
@@ -69,60 +105,151 @@
                 this.fetchSelectedLabels();
             }
         },
+        computed: {
+            isShowingAllTerms() {
+                return this.terms.length >= this.totalTerms;
+            }
+        },
         props: {
-            options: {
-                type: Array
-            },
             value: [ Number, String, Array ],
             disabled: false,
-            taxonomyId: Number
+            taxonomyId: Number,
+            metadatum: Object
         },
         methods: {
+            clearInput() {
+                this.value = '';
+                this.onInput('');
+            },
             onChecked() {
-                this.$emit('blur');
                 this.onInput(this.checked)
             },
             onInput($event) {
-                this.inputValue = $event;
-                this.$emit('input', this.inputValue);
+                this.value = $event;
+                this.$emit('input', this.value);
             },
             fetchSelectedLabels() {
 
                 if (this.value != null && this.value != undefined) {
-
-                    this.isSelectedTermsLoading = true;
-                    let selected = this.value instanceof Array ? this.value : [this.value];
+ 
+                    const selected = this.value instanceof Array ? this.value : [this.value];
 
                     if (this.taxonomyId && selected.length > 0) {
-                        for (const term of selected) {
+                        this.isSelectedTermsLoading = true;
 
-                            if(!this.isSelectedTermsLoading){
-                                this.isSelectedTermsLoading = true;
-                            }
+                        axios.get(`/taxonomy/${this.taxonomyId}/terms/?${qs.stringify({ hideempty: 0, include: selected })}`)
+                            .then((res) => {
+                                let terms = res.data;
 
-                            axios.get(`/taxonomy/${this.taxonomyId}/terms/${term}`)
-                                .then((res) => {
-                                    this.saveSelectedTagName(res.data.id, res.data.name);
-                                    this.isSelectedTermsLoading = false;
-                                })
-                                .catch((error) => {
-                                    this.$console.log(error);
-                                    this.isSelectedTermsLoading = false;
-                                });
-                        }
-                    } else {
-                        this.isSelectedTermsLoading = false;
+                                for (let term of terms) {
+                                    if (!this.selectedTagsName[term.id])
+                                        this.$set(this.selectedTagsName, term.id, term.name);
+                                }
+                                
+                                this.isSelectedTermsLoading = false;
+                            })
+                            .catch((error) => {
+                                this.$console.log(error);
+                                this.isSelectedTermsLoading = false;
+                            });
                     }
                 }
             },
-            saveSelectedTagName(value, label){
-                if(!this.selectedTagsName[value]) {
-                    this.$set(this.selectedTagsName, `${value}`, label);
+            getTermsFromTaxonomy() {
+                this.terms = [];
+                
+                const endpoint = '/taxonomy/' + this.taxonomyId + '/terms?hideempty=0&order=asc&number=' + this.termsNumber + '&offset=' + this.offset; 
+
+                axios.get(endpoint)
+                    .then( res => {
+                        this.totalTerms = Number(res.headers['x-wp-total']);
+                        this.offset += this.termsNumber;
+                        
+                        for (let item of res.data)
+                            this.terms.push( item );
+
+                        this.options = this.getOptions(0);
+                    })
+                    .catch(error => {
+                        this.$console.log(error);
+                    });
+            },
+            getOptions(parent, level = 0) { // retrieve only ids
+                let result = [];
+                if (this.terms) {
+                    for (let term of this.terms){
+                        if (term.parent == parent){
+                            term['level'] = level;
+                            result.push(term);
+                            const levelTerm = level + 1;
+                            const children = this.getOptions( term.id, levelTerm);
+                            result = result.concat(children);
+                        }
+                    }
                 }
+                return result;
+            },
+            openCheckboxModal() {
+                this.$buefy.modal.open({
+                    parent: this,
+                    component: CheckboxRadioModal,
+                    props: {
+                        isFilter: false,
+                        parent: 0,
+                        taxonomy_id: this.taxonomyId,
+                        selected: !this.value ? [] : this.value,
+                        metadatumId: this.metadatum.id,
+                        taxonomy: this.taxonomy,
+                        collectionId: this.metadatum.collection_id,
+                        isTaxonomy: true,
+                        query: '',
+                        metadatum: this.metadatum,
+                        isCheckbox: false
+                    },
+                    events: {
+                        input: (selected) => {
+                            this.value = selected;
+                            this.$emit('input', this.value);
+                        }
+                    },
+                    width: 'calc(100% - 8.333333333%)',
+                    trapFocus: true
+                });
             }
         },
         mounted() {
             this.fetchSelectedLabels();
         }
     }
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+    .selected-tags {
+        margin-top: 0.75rem;
+        font-size: 0.75rem;
+        position: relative;
+    }
+    .selected-tags .is-loading {
+        margin-left: 2rem;
+        margin-top: -0.4rem;
+    }
+    .selected-tags .is-loading::after {
+        border: 2px solid #555758 !important;
+        border-right-color: #dbdbdb !important;
+        border-top-color: #dbdbdb !important;
+    } 
+    .metadata-taxonomy-list {
+        column-count: 2;
+        margin: 10px;
+
+        label {
+            break-inside: avoid;
+            padding-right: 10px;
+        }
+    }
+    .view-all {
+        color: #898d8f;
+        margin-bottom: 20px;
+        font-size: 0.75rem;
+    }
+</style>
\ No newline at end of file
diff --git a/src/classes/metadata-types/taxonomy/TaxonomyTaginput.vue b/src/classes/metadata-types/taxonomy/TaxonomyTaginput.vue
index 05a654d77..b3cc69d70 100644
--- a/src/classes/metadata-types/taxonomy/TaxonomyTaginput.vue
+++ b/src/classes/metadata-types/taxonomy/TaxonomyTaginput.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="block">
         <b-taginput
+                :id="metadatumComponentId"
                 :disabled="disabled"
                 size="is-small"
                 icon="magnify"
@@ -36,16 +37,14 @@
         },
         watch: {
           selected(){
-              if(this.allowSelectToCreate && this.selected[0]){
+              if (this.allowSelectToCreate && this.selected[0]) {
                   this.selected[0].label.includes(`(${this.$i18n.get('select_to_create')})`);
                   this.selected[0].label = this.selected[0].label.split('(')[0];
               }
           }
         },
         props: {
-            options: {
-                type: Array
-            },
+            metadatumComponentId: '',
             value: [ Number, String, Array ],
             allowNew: true,
             taxonomyId: Number,
@@ -54,7 +53,7 @@
             maxtags: '',
         },
         created(){
-            if(this.value && this.value.length > 0){
+            if (this.value && this.value.length > 0){
                 this.selected = this.value;
             }
         },
@@ -85,13 +84,11 @@
                 }).then((res) => {
                     this.termList = res.terms;
                     
-                    for(let term of this.termList){
+                    for (let term of this.termList)
                         this.labels.push({label: term.name, value: term.id});
-                    }
 
-                    if(this.termList.length <= 0 && this.allowSelectToCreate){
+                    if (this.termList.length <= 0 && this.allowSelectToCreate)
                         this.labels.push({label: `${value} (${this.$i18n.get('select_to_create')})`, value: value})
-                    }
 
                     this.isFetching = false;
                 }).catch((error) => {
@@ -102,9 +99,8 @@
             updateSelectedValues(){
                 let selected = [];
 
-                for( let term of this.value){
+                for( let term of this.value)
                     selected.push({label: term.label, value: term.value})
-                }
 
                 this.selected = selected;
             },
@@ -112,25 +108,21 @@
                 let val = this.selected;
                 let results = [];
 
-                if (val.length > 0){
-                    for( let term of val ){
+                if (val.length > 0) {
+                    for (let term of val)
                         results.push( term.value );
-                    }
-
+                
                     this.$emit('input', results);
-                    this.$emit('blur');
                 }
             },
             emitRemove(){
                 let val = this.selected;
                 let results = [];
 
-                for( let term of val ){
-                    results.push( term.value );
-                }
+                for (let term of val)
+                    results.push(term.value);
 
                 this.$emit('input', results);
-                this.$emit('blur');
             }
         }
     }
diff --git a/src/classes/metadata-types/taxonomy/class-tainacan-taxonomy.php b/src/classes/metadata-types/taxonomy/class-tainacan-taxonomy.php
index d7785de94..7468506cd 100644
--- a/src/classes/metadata-types/taxonomy/class-tainacan-taxonomy.php
+++ b/src/classes/metadata-types/taxonomy/class-tainacan-taxonomy.php
@@ -184,6 +184,7 @@ class Taxonomy extends Metadata_Type {
 				// TODO term_exists is not fully reliable. Use $terms_repository->term_exists. see issue #159
 				if (!term_exists($term)) {
 					$valid = false;
+					$this->add_error(__('term not found.', 'tainacan'));
 					break;
 				}
 			}
diff --git a/src/classes/metadata-types/text/Text.vue b/src/classes/metadata-types/text/Text.vue
index f03aad54b..57a5e9ecf 100644
--- a/src/classes/metadata-types/text/Text.vue
+++ b/src/classes/metadata-types/text/Text.vue
@@ -1,21 +1,16 @@
 <template>
     <b-input
             :disabled="disabled"
-            :class="{'has-content': value !== undefined && value !== ''}"
-            :id="id"
+            :id="metadatum.metadatum.metadata_type_object.component + '-' + metadatum.metadatum.slug"
             :value="value"
-            @blur="$emit('blur')"
             @input="onInput($event)"/>
 </template>
 
 <script>
     export default {
         props: {
-            metadatum: {
-                type: Object
-            },
+            metadatum: Object,
             value: [String, Number, Array],
-            id: '',
             disabled: false
         },
         methods: {
diff --git a/src/classes/metadata-types/textarea/Textarea.vue b/src/classes/metadata-types/textarea/Textarea.vue
index c18bb5533..f36fd2ed1 100644
--- a/src/classes/metadata-types/textarea/Textarea.vue
+++ b/src/classes/metadata-types/textarea/Textarea.vue
@@ -1,42 +1,22 @@
 <template>
     <b-input
             :disabled="disabled"
-            :class="{'has-content': inputValue !== undefined && inputValue !== ''}"
-            :id="id"
-            size="is-small"
-            type="textarea"
-            :value="inputValue"
-            @blur="onBlur"
-            @input="onInput($event)"/>
+            :id="metadatum.metadatum.metadata_type_object.component + '-' + metadatum.metadatum.slug"
+            :value="value"
+            @input="onInput($event)"
+            type="textarea" />
 </template>
 
 <script>
     export default {
-        created(){
-            if( this.value ){
-                this.inputValue = this.value
-            }
-        },
-        data() {
-            return {
-                inputValue: ''
-            }
-        },
         props: {
-            id: '',
-            metadatum: {
-                type: Object
-            },
+            metadatum: Object,
             value: [String, Number, Array],
             disabled: false
         },
         methods: {
-            onBlur() {
-                this.$emit('blur');
-            },
-            onInput($event) {
-                this.inputValue = $event;
-                this.$emit('input', this.inputValue);
+            onInput(value) {
+                this.$emit('input', value);
             }
         }
     }
diff --git a/src/classes/repositories/class-tainacan-terms.php b/src/classes/repositories/class-tainacan-terms.php
index 18888140b..565ba68c4 100644
--- a/src/classes/repositories/class-tainacan-terms.php
+++ b/src/classes/repositories/class-tainacan-terms.php
@@ -283,6 +283,9 @@ class Terms extends Repository {
 	* @return bool|WP_Term return boolean indicating if term exists. If $return_term is true and term exists, return WP_Term object 
 	*/
 	public function term_exists($searched_term, $taxonomy, $parent = null, $return_term = false) {
+		if ($searched_term == "") {
+			return false;
+		}
 		
 		$Tainacan_Taxonomies = \Tainacan\Repositories\Taxonomies::get_instance();
 
diff --git a/src/classes/tainacan-creator.php b/src/classes/tainacan-creator.php
index 9fa6eba39..3a759b2ff 100644
--- a/src/classes/tainacan-creator.php
+++ b/src/classes/tainacan-creator.php
@@ -106,7 +106,7 @@ function tainacan_autoload($class_name){
 		}
 
 		$file = $dir . 'class-tainacan-'. strtolower(str_replace('_', '-' , $class_name)) . '.php';
-			
+
 		if(file_exists($file)) {
 			require_once($file);
 		}
@@ -132,7 +132,6 @@ $Tainacan_Metadata->register_metadata_type('Tainacan\Metadata_Types\Taxonomy');
 $Tainacan_Filters = \Tainacan\Repositories\Filters::get_instance();
 
 //register filter type
-$Tainacan_Filters->register_filter_type('Tainacan\Filter_Types\Custom_Interval');
 $Tainacan_Filters->register_filter_type('Tainacan\Filter_Types\Numeric');
 $Tainacan_Filters->register_filter_type('Tainacan\Filter_Types\Date');
 $Tainacan_Filters->register_filter_type('Tainacan\Filter_Types\Selectbox');
@@ -182,6 +181,9 @@ $Tainacan_Capabilities = \Tainacan\Capabilities::get_instance();
 
 $TainacanPrivateFiles = \Tainacan\Private_Files::get_instance();
 
+$TainacanMedia = \Tainacan\Media::get_instance();
+
+
 if (class_exists('WP_CLI')) {
 	$Tainacan_Cli = \Tainacan\Cli::get_instance();
 }
diff --git a/src/exporter/class-tainacan-csv.php b/src/exporter/class-tainacan-csv.php
index ea1b82ee9..16b9d6148 100644
--- a/src/exporter/class-tainacan-csv.php
+++ b/src/exporter/class-tainacan-csv.php
@@ -44,9 +44,13 @@ class CSV extends Exporter {
 				continue;
 			}
 
-			if ($meta->get_metadatum()->get_metadata_type() == 'Tainacan\Metadata_Types\Relationship')
-				$line[] = $meta->get_value();
-			else
+			if ($meta->get_metadatum()->get_metadata_type() == 'Tainacan\Metadata_Types\Relationship') {
+				$rel = $meta->get_value();
+				if (is_array($rel))
+					$line[]	= implode( $this->get_option('multivalued_delimiter'), $rel );
+				else 
+					$line[] = $rel;
+			} else
 				$line[] = $meta->get_value_as_string();
 			
 		}
diff --git a/src/gutenberg-blocks/gutenberg-blocks-style.scss b/src/gutenberg-blocks/gutenberg-blocks-style.scss
index 88eb324ff..2d497a995 100644
--- a/src/gutenberg-blocks/gutenberg-blocks-style.scss
+++ b/src/gutenberg-blocks/gutenberg-blocks-style.scss
@@ -41,6 +41,22 @@
     }
 }
 
+// Grid mixin for display: grid compatibility
+@mixin display-grid {
+    flex-wrap: wrap;
+    display: flex;
+    display: -ms-grid;
+    display: grid;
+}
+@mixin grid-child ($col-start, $col-end, $row-start, $row-end) {
+    -ms-grid-column: $col-start;
+    -ms-grid-column-span: $col-end - $col-start;
+    -ms-grid-row: $row-start;
+    -ms-grid-row-span: $row-end - $row-start;
+    grid-column: #{$col-start}/#{$col-end};
+    grid-row: #{$row-start}/#{$row-end};
+}
+  
 // Generic style for selection modals ---------------------------
 .wp-block-tainacan-modal {
     width: 50%;
@@ -125,8 +141,8 @@
     .modal-checkbox-list,
     .modal-radio-list .components-base-control__field {
         padding: 0;
-        display: -ms-grid;
-        display: grid;
+        @include display-grid;
+        -ms-grid-columns: 250px 250px;
         grid-template-columns: repeat(auto-fill, 250px);
         grid-gap: 0px;
         justify-content: space-evenly;
diff --git a/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list-theme.vue b/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list-theme.vue
index 76db868a3..6a4531f40 100644
--- a/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list-theme.vue
+++ b/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list-theme.vue
@@ -121,7 +121,7 @@
             </div>
             <!-- Swiper buttons are hidden as they actually swipe from slide to slide -->
         </div>
-        <div v-else-if="isLoading && !autoPlay">
+        <div v-else-if="isLoading && !autoPlay && !loopSlides">
             <div :class="'tainacan-carousel has-arrows-' + arrowsPosition">
                 <swiper 
                         role="list"
@@ -250,7 +250,7 @@ export default {
 
             this.collectionsRequestSource = axios.CancelToken.source();
 
-            let endpoint = '/collections?'+ qs.stringify({ postin: this.selectedCollections }) + '&fetch_only=name,url,thumbnail';
+            let endpoint = '/collections?'+ qs.stringify({ postin: this.selectedCollections, perpage: this.selectedCollections.length }) + '&fetch_only=name,url,thumbnail';
 
             this.tainacanAxios.get(endpoint, { cancelToken: this.collectionsRequestSource.token })
                 .then(response => {
diff --git a/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list.scss b/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list.scss
index b46f3fc0d..28c003877 100644
--- a/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list.scss
+++ b/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list.scss
@@ -18,8 +18,10 @@
         &.collection-carousel-view-mode-grid {
             margin-right: 6px;
             div {
-                display: grid;
+                @include display-grid;
+                -ms-grid-columns: 33% 33% 33%;
                 grid-template-columns: 33% 33% 33%;
+                -ms-grid-rows: 50% 50%;
                 grid-template-rows: 50% 50%;
                 grid-column-gap: 2px;
                 grid-row-gap: 2px;
@@ -28,15 +30,14 @@
                 margin: 4px auto 8px auto;
 
                 &>div:first-of-type {
-                    grid-column-start: 1;
-                    grid-column-end: span 2;
-                    grid-row-start: 1;
-                    grid-row-end: span 2;
+                    flex-basis: 100%;
+                    @include grid-child(1, 3, 1, 3);
                     width: 41px;
                     height: 42px;
                 }
 
-                &>div { 
+                &>div {
+                    flex-basis: 50%; 
                     width: 20px;
                     height: 20px;
                     background: #555758;
@@ -82,7 +83,7 @@
 }
 
 .wp-block-tainacan-carousel-collections-list {
-    margin: 2rem 0px;
+    margin: 2rem auto;
 
     // Spinner
     .spinner-container {
@@ -141,7 +142,7 @@
                 text-decoration: none;
                 padding: 8px 16px;
                 display: block;
-                line-height: 1.2rem;
+                line-height: 1.2em;
             }
             a>img {
                 width: 100%;
@@ -158,19 +159,18 @@
                     display: block;
                 }
                 .collection-items-grid {
-                    display: grid;
+                    @include display-grid;
                     grid-template-columns: 33% 33% 33%;
                     grid-template-rows: 50% 50%;
                     width: 100%;
     
                     img:first-of-type {
-                        grid-column-start: 1;
-                        grid-column-end: span 2;
-                        grid-row-start: 1;
-                        grid-row-end: span 2;
+                        flex-basis: 100%;
+                        @include grid-child(1, 3, 1, 3);
                     }
     
-                    img { 
+                    img {
+                        flex-basis: 50%; 
                         width: 100%;
                         height: auto;
                         padding: 2px;
@@ -303,18 +303,17 @@
 
 
             .collection-items-grid {
-                display: grid;
+                @include display-grid;
                 grid-template-columns: 33% 33% 33%;
                 grid-template-rows: 50% 50%;
 
                 img:first-of-type {
-                    grid-column-start: 1;
-                    grid-column-end: span 2;
-                    grid-row-start: 1;
-                    grid-row-end: span 2;
+                    flex-basis: 100%;
+                    @include grid-child(1, 3, 1, 3);
                 }
 
-                img { 
+                img {
+                    flex-basis: 50%; 
                     padding: 2px;
                     margin-bottom: 0px; 
                 }
diff --git a/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/index.js b/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/index.js
index 84efe953c..728107ac5 100644
--- a/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/index.js
+++ b/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/index.js
@@ -215,7 +215,7 @@ registerBlockType('tainacan/carousel-collections-list', {
 
             collections = [];
 
-            let endpoint = '/collections?'+ qs.stringify({ postin: selectedCollections }) + '&fetch_only=name,url,thumbnail';
+            let endpoint = '/collections?'+ qs.stringify({ postin: selectedCollections, perpage: selectedCollections.length }) + '&fetch_only=name,url,thumbnail';
             tainacan.get(endpoint, { cancelToken: itemsRequestSource.token })
                 .then(response => {
 
diff --git a/src/gutenberg-blocks/tainacan-collections/collections-list/collections-list.scss b/src/gutenberg-blocks/tainacan-collections/collections-list/collections-list.scss
index 1b7ecfaf8..a59fcad1a 100644
--- a/src/gutenberg-blocks/tainacan-collections/collections-list/collections-list.scss
+++ b/src/gutenberg-blocks/tainacan-collections/collections-list/collections-list.scss
@@ -1,7 +1,7 @@
 @import '../../gutenberg-blocks-style.scss';
 
 .wp-block-tainacan-collections-list {
-    margin: 2rem 0px;
+    margin: 2rem auto;
 
     // Spinner
     .components-spinner {
@@ -31,8 +31,8 @@
     ul.collections-list.collections-layout-grid,
     ul.collections-list-edit.collections-layout-grid {
         padding: 0;
-        display: -ms-grid;
-        display: grid;
+        @include display-grid;
+        -ms-grid-columns: 220px 220px 220px 220px 220px;
         grid-template-columns: repeat(auto-fill, 220px);
         grid-gap: 0px;
         justify-content: space-evenly;
diff --git a/src/gutenberg-blocks/tainacan-facets/facets-list/facets-list-theme.js b/src/gutenberg-blocks/tainacan-facets/facets-list/facets-list-theme.js
index 5e71d0071..ea0c8d83c 100644
--- a/src/gutenberg-blocks/tainacan-facets/facets-list/facets-list-theme.js
+++ b/src/gutenberg-blocks/tainacan-facets/facets-list/facets-list-theme.js
@@ -78,7 +78,7 @@ document.addEventListener("DOMContentLoaded", () => {
 
         // Creates a new Vue Instance to manage each block isolatelly
         for (let blockId of blockIds) {
-            new Vue( Object.assign({ el: '#' + blockId }, jQuery.extend(true, {}, vueOptions)) );
+            new Vue( Object.assign({ el: '#' + blockId }, vueOptions) );
         }
     }
 });
\ No newline at end of file
diff --git a/src/gutenberg-blocks/tainacan-facets/facets-list/facets-list.scss b/src/gutenberg-blocks/tainacan-facets/facets-list/facets-list.scss
index 4c527b9aa..6c277e05b 100644
--- a/src/gutenberg-blocks/tainacan-facets/facets-list/facets-list.scss
+++ b/src/gutenberg-blocks/tainacan-facets/facets-list/facets-list.scss
@@ -1,7 +1,7 @@
 @import '../../gutenberg-blocks-style.scss';
 
 .wp-block-tainacan-facets-list {
-    margin: 2rem 0px;
+    margin: 2rem auto;
 
     // Spinner
     .spinner-container {
@@ -70,14 +70,15 @@
             h3 { 
                 color: white; 
                 text-decoration: none;
-                font-size: 1.3rem;
+                font-size: 1.3em;
+                margin: 0;
                 &:hover {
                     text-decoration: none;
                 }
             }
             span.label { 
                 font-weight: normal; 
-                font-size: 1rem;
+                font-size: 0.75em;
             }
 
             &.only-collection-name {
@@ -219,8 +220,8 @@
     ul.facets-list.facets-layout-grid,
     ul.facets-list-edit.facets-layout-grid {
         padding: 0;
-        display: -ms-grid;
-        display: grid;
+        @include display-grid;
+        -ms-grid-columns: 220px 220px 220px 220px 220px;
         grid-template-columns: repeat(auto-fill, 220px);
         grid-gap: 0px;
         justify-content: space-evenly;
@@ -404,9 +405,8 @@
                 // overflow: hidden;
                 // text-overflow: ellipsis;
                 // white-space: nowrap;
-                display: flex;
-                align-items: center;
-                height: 54px;
+                display: inline;
+                min-height: 54px;
             }
 
             img {
diff --git a/src/gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-list-theme.vue b/src/gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-list-theme.vue
index f73771b3e..02913f3a2 100644
--- a/src/gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-list-theme.vue
+++ b/src/gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-list-theme.vue
@@ -59,6 +59,7 @@
                         }">
                     <swiper-slide 
                             role="listitem"
+                            ref="myItemSwiperSlide"
                             :key="index"
                             v-for="(item, index) of items"
                             class="item-list-item">      
@@ -121,7 +122,7 @@
             </div>
             <!-- Swiper buttons are hidden as they actually swipe from slide to slide -->
         </div>
-        <div v-else-if="isLoading && !autoPlay">
+        <div v-else-if="isLoading && !autoPlay && !loopSlides">
             <div :class="'tainacan-carousel has-arrows-' + arrowsPosition">
                 <swiper 
                         role="list"
@@ -133,7 +134,7 @@
                     <swiper-slide 
                             role="listitem"
                             :key="index"
-                            ref="myItemSwiper"
+                            ref="myItemSwiperSlideSkeleton"
                             v-for="(item, index) of 18"
                             class="item-list-item skeleton">      
                         <a>
@@ -219,7 +220,7 @@ export default {
                     1600: { slidesPerView: 6 },
                 },
                 autoplay: this.autoPlay ? { delay: this.autoPlaySpeed*1000 } : false,
-                loop: this.loopSlides
+                loop: this.loopSlides ? this.loopSlides : false
             },
             errorMessage: 'No items found.'
         }
@@ -260,7 +261,7 @@ export default {
             this.itemsRequestSource = axios.CancelToken.source();
 
             if (this.loadStrategy == 'selection') {
-                let endpoint = '/collection/' + this.collectionId + '/items?' + qs.stringify({ postin: this.selectedItems }) + '&fetch_only=title,url,thumbnail';
+                let endpoint = '/collection/' + this.collectionId + '/items?' + qs.stringify({ postin: this.selectedItems, perpage: this.selectedItems.length }) + '&fetch_only=title,url,thumbnail';
                 
                 this.tainacanAxios.get(endpoint, { cancelToken: this.itemsRequestSource.token })
                     .then(response => {
diff --git a/src/gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-list.scss b/src/gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-list.scss
index c22f82938..762920ad3 100644
--- a/src/gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-list.scss
+++ b/src/gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-list.scss
@@ -1,7 +1,7 @@
 @import '../../gutenberg-blocks-style.scss';
 
 .wp-block-tainacan-carousel-items-list {
-    margin: 2rem 0px;
+    margin: 2rem auto;
 
     // Spinner
     .spinner-container {
@@ -72,14 +72,15 @@
             h3 { 
                 color: white; 
                 text-decoration: none;
-                font-size: 1.3rem;
+                font-size: 1.3em;
+                margin: 0;
                 &:hover {
                     text-decoration: none;
                 }
             }
             span.label { 
                 font-weight: normal; 
-                font-size: 1rem;
+                font-size: 0.75em;
             }
 
             &.only-collection-name {
@@ -152,7 +153,7 @@
                 text-decoration: none;
                 padding: 8px 16px;
                 display: block;
-                line-height: 1.2rem;
+                line-height: 1.2em;
             }
             a>img {
                 width: 100%;
diff --git a/src/gutenberg-blocks/tainacan-items/carousel-items-list/index.js b/src/gutenberg-blocks/tainacan-items/carousel-items-list/index.js
index 30ddffc7f..151a3f400 100644
--- a/src/gutenberg-blocks/tainacan-items/carousel-items-list/index.js
+++ b/src/gutenberg-blocks/tainacan-items/carousel-items-list/index.js
@@ -200,7 +200,7 @@ registerBlockType('tainacan/carousel-items-list', {
             items = [];
 
             if (loadStrategy == 'selection') {
-                let endpoint = '/collection/' + collectionId + '/items?'+ qs.stringify({ postin: selectedItems }) + '&fetch_only=title,url,thumbnail';
+                let endpoint = '/collection/' + collectionId + '/items?'+ qs.stringify({ postin: selectedItems, perpage: selectedItems.length }) + '&fetch_only=title,url,thumbnail';
 
                 tainacan.get(endpoint, { cancelToken: itemsRequestSource.token })
                     .then(response => {
diff --git a/src/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list-theme.js b/src/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list-theme.js
index b40a4ccdc..e664915ad 100644
--- a/src/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list-theme.js
+++ b/src/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list-theme.js
@@ -14,6 +14,12 @@ document.addEventListener("DOMContentLoaded", () => {
             gridMargin: 0,
             searchURL: '',
             maxItemsNumber: 12,
+            mosaicHeight: 40,
+            mosaicDensity: 5,
+            mosaicGridRows: 3,
+            mosaicGridColumns: 3,
+            mosaicItemFocalPointX : 0.5,
+            mosaicItemFocalPointY : 0.5,
             order: 'asc',
             showSearchBar: false,
             showCollectionHeader: false,
@@ -32,6 +38,12 @@ document.addEventListener("DOMContentLoaded", () => {
                     showName: this.showName,
                     layout: this.layout,
                     gridMargin: this.gridMargin,
+                    mosaicDensity: this.mosaicDensity,
+                    mosaicHeight: this.mosaicHeight,
+                    mosaicGridRows: this.mosaicGridRows,
+                    mosaicGridColumns: this.mosaicGridColumns,
+                    mosaicItemFocalPointX: this.mosaicItemFocalPointX,
+                    mosaicItemFocalPointY: this.mosaicItemFocalPointY,
                     searchURL: this.searchURL,
                     maxItemsNumber: this.maxItemsNumber,
                     order: this.order,
@@ -54,6 +66,12 @@ document.addEventListener("DOMContentLoaded", () => {
             this.showName = this.$el.attributes['show-name'] != undefined ? this.$el.attributes['show-name'].value == 'true' : true;
             this.layout = this.$el.attributes['layout'] != undefined ? this.$el.attributes['layout'].value : undefined;
             this.gridMargin = this.$el.attributes['grid-margin'] != undefined ? Number(this.$el.attributes['grid-margin'].value) : undefined;
+            this.mosaicDensity = this.$el.attributes['mosaic-density'] != undefined ? Number(this.$el.attributes['mosaic-density'].value) : undefined;
+            this.mosaicHeight = this.$el.attributes['mosaic-height'] != undefined ? Number(this.$el.attributes['mosaic-height'].value) : undefined;
+            this.mosaicGridRows = this.$el.attributes['mosaic-grid-rows'] != undefined ? Number(this.$el.attributes['mosaic-grid-rows'].value) : undefined;
+            this.mosaicGridColumns = this.$el.attributes['mosaic-grid-columns'] != undefined ? Number(this.$el.attributes['mosaic-grid-columns'].value) : undefined;
+            this.mosaicItemFocalPointX = this.$el.attributes['mosaic-item-focal-point-x'] != undefined ? Number(this.$el.attributes['mosaic-item-focal-point-x'].value) : undefined;
+            this.mosaicItemFocalPointY = this.$el.attributes['mosaic-item-focal-point-y'] != undefined ? Number(this.$el.attributes['mosaic-item-focal-point-y'].value) : undefined;
             this.maxItemsNumber = this.$el.attributes['max-items-number'] != undefined ? this.$el.attributes['max-items-number'].value : undefined;
             this.order = this.$el.attributes['order'] != undefined ? this.$el.attributes['order'].value : undefined;
             this.showSearchBar = this.$el.attributes['show-search-bar'] != undefined ? this.$el.attributes['show-search-bar'].value == 'true' : false;
@@ -79,7 +97,7 @@ document.addEventListener("DOMContentLoaded", () => {
 
         // Creates a new Vue Instance to manage each block isolatelly
         for (let blockId of blockIds) {
-            new Vue( Object.assign({ el: '#' + blockId }, jQuery.extend(true, {}, vueOptions)) );
+            new Vue( Object.assign({ el: '#' + blockId }, vueOptions) );
         }
     }
 });
\ No newline at end of file
diff --git a/src/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list-theme.vue b/src/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list-theme.vue
index 272599a95..d6bd60bd8 100644
--- a/src/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list-theme.vue
+++ b/src/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list-theme.vue
@@ -147,26 +147,47 @@
                 </span>
             </button> 
         </div>
-        <ul
-                v-if="isLoading"
-                :style="{
-                    gridTemplateColumns: layout == 'grid' ? 'repeat(auto-fill, ' + (gridMargin + (showName ? 220 : 185)) + 'px)' : 'inherit', 
-                    marginTop: showSearchBar || showCollectionHeader ? '1.34rem' : '0px'
-                }"
-                class="items-list"
-                :class="'items-layout-' + layout + (!showName ? ' items-list-without-margin' : '')">
-                <li
-                        :key="item"
-                        v-for="item in Number(maxItemsNumber)"
-                        class="item-list-item skeleton"
+        <template v-if="isLoading">
+            <ul
+                    v-if="layout !== 'mosaic'"
+                    :style="{
+                        gridTemplateColumns: layout == 'grid' ? 'repeat(auto-fill, ' + (gridMargin + (showName ? 220 : 185)) + 'px)' : 'inherit', 
+                        marginTop: showSearchBar || showCollectionHeader ? '1.34rem' : '0px'
+                    }"
+                    class="items-list"
+                    :class="'items-layout-' + layout + (!showName ? ' items-list-without-margin' : '')">
+                    <li
+                            :key="item"
+                            v-for="item in Number(maxItemsNumber)"
+                            class="item-list-item skeleton"
+                            :style="{ 
+                                marginBottom: layout == 'grid' ? (showName ? gridMargin + 12 : gridMargin) + 'px' : '',
+                                height: layout == 'grid' ? '230px' : '54px'
+                            }" />      
+            </ul>
+            <ul
+                    v-if="layout === 'mosaic'"
+                    :style="{
+                        marginTop: showSearchBar || showCollectionHeader ? '-' + (Number(gridMargin)/2) : '0px',    
+                        padding: '0 ' + (Number(gridMargin)/4) + 'px',
+                        minHeight: layout === 'mosaic' ? mosaicHeight + 'px' : ''
+                    }"
+                    class="items-list"
+                    :class="'items-layout-' + layout + (!showName ? ' items-list-without-margin' : '')">
+                <div 
                         :style="{ 
-                            marginBottom: layout == 'grid' ? (showName ? gridMargin + 12 : gridMargin) + 'px' : '',
-                            height: layout == 'grid' ? '230px' : '54px'
-                        }" />      
-        </ul>
+                            width: 'calc((100% / ' + mosaicPartition(items).length + ') - ' + gridMargin + 'px)',
+                            height: 'calc(((' + (mosaicGridRows - 1) + ' * ' + gridMargin + 'px) + ' + mosaicHeight + 'px))',
+                            margin: gridMargin + 'px'
+                        }"
+                        class="mosaic-container skeleton"
+                        :key="mosaicIndex"
+                        v-for="(mosaicGroup, mosaicIndex) of mosaicPartition(items)" /> 
+            </ul>
+        </template>
         <div v-else>
             <ul 
-                    v-if="items.length > 0"
+                    v-if="items.length > 0 && layout !== 'mosaic'"
                     :style="{
                         gridTemplateColumns: layout == 'grid' ? 'repeat(auto-fill, ' + (gridMargin + (showName ? 220 : 185)) + 'px)' : 'inherit', 
                         marginTop: showSearchBar || showCollectionHeader ? '1.35rem' : '0px'
@@ -177,31 +198,64 @@
                         :key="index"
                         v-for="(item, index) of items"
                         class="item-list-item"
-                        :style="{ marginBottom: layout == 'grid' ? (showName ? gridMargin + 12 : gridMargin) + 'px' : ''}">      
+                        :style="{ marginBottom: layout == 'grid' ? (showName ? gridMargin + 12 : gridMargin) + 'px' : '' }">    
                     <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' : '')">
                         <img
-                            :src=" 
-                                item.thumbnail && item.thumbnail['tainacan-medium'][0] && item.thumbnail['tainacan-medium'][0] 
-                                    ?
-                                item.thumbnail['tainacan-medium'][0] 
-                                    :
-                                (item.thumbnail && item.thumbnail['thumbnail'][0] && item.thumbnail['thumbnail'][0]
-                                    ?    
-                                item.thumbnail['thumbnail'][0] 
-                                    : 
-                                `${tainacanBaseUrl}/admin/images/placeholder_square.png`)
-                            "
+                            :src="getItemThumbnail(item, 'tainacan-medium')"
                             :alt="item.title ? item.title : $root.__('Thumbnail', 'tainacan')">
                         <span>{{ item.title ? item.title : '' }}</span>
                     </a>
                 </li>
             </ul>
+            <ul 
+                    v-if="items.length > 0 && layout === 'mosaic'"
+                    :style="{
+                        marginTop: showSearchBar || showCollectionHeader ? '-' + (Number(gridMargin)/2) : '0px',    
+                        padding: '0 ' + (Number(gridMargin)/4) + 'px',
+                        minHeight: layout === 'mosaic' ? mosaicHeight + 'px' : ''
+                    }"
+                    class="items-list"
+                    :class="'items-layout-' + layout + (!showName ? ' items-list-without-margin' : '')">
+                <div 
+                        :style="{ 
+                            width: 'calc((100% / ' + mosaicPartition(items).length + ') - ' + gridMargin + 'px)',
+                            height: 'calc(((' + (mosaicGridRows - 1) + ' * ' + gridMargin + 'px) + ' + mosaicHeight + 'px))',
+                            gridTemplateColumns: 'repeat(' + mosaicGridColumns + ', calc((100% / ' + mosaicGridColumns + ') - (' + ((mosaicGridColumns - 1)*Number(gridMargin)) + 'px/' + mosaicGridColumns + ')))',
+                            margin: gridMargin + 'px',
+                            gridGap: gridMargin + 'px',
+                        }"
+                        class="mosaic-container"
+                        :class="'mosaic-container--' + mosaicGroup.length + '-' + mosaicGridRows + 'x' + mosaicGridColumns"
+                        :key="mosaicIndex"
+                        v-for="(mosaicGroup, mosaicIndex) of mosaicPartition(items)">
+                    <li
+                            
+                            :key="index"
+                            v-for="(item, index) of mosaicGroup"
+                            class="item-list-item"
+                            :style="{
+                                backgroundImage: layout == 'mosaic' ? `url(${getItemThumbnail(item, 'medium_large')})` : 'none',
+                                backgroundPosition: layout == 'mosaic' ? `${ mosaicItemFocalPointX * 100 }% ${ mosaicItemFocalPointY * 100 }%` : 'none'
+                            }">          
+                        <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' : '')">
+                            <img
+                                :src="getItemThumbnail(item, 'tainacan-medium')"
+                                :alt="item.title ? item.title : $root.__('Thumbnail', 'tainacan')">
+                            <span>{{ item.title ? item.title : '' }}</span>
+                        </a>
+                    </li>
+                </div>
+            </ul>
             <div
-                    v-else
+                    v-else-if="!isLoading && items.length <= 0"
                     class="spinner-container">
                 {{ $root.__(errorMessage, 'tainacan') }}
             </div>
@@ -240,6 +294,12 @@ export default {
         gridMargin: Number,
         searchURL: String,
         maxItemsNumber: Number,
+        mosaicDensity: Number,
+        mosaicHeight: Number,
+        mosaicGridRows: Number,
+        mosaicGridColumns: Number,
+        mosaicItemFocalPointX: Number,
+        mosaicItemFocalPointY: Number,
         order: String,
         showSearchBar: Boolean,
         showCollectionHeader: Boolean,
@@ -348,6 +408,28 @@ export default {
                         this.isLoadingCollection = false;      
                     });
             }
+        },
+        getItemThumbnail(item, size) {
+            return ( 
+                item.thumbnail && item.thumbnail[size][0] && item.thumbnail[size][0] 
+                    ?
+                item.thumbnail[size][0] 
+                    :
+                (item.thumbnail && item.thumbnail['large'][0] && item.thumbnail['large'][0]
+                    ?    
+                item.thumbnail['large'][0] 
+                    : 
+                `${this.tainacanBaseUrl}/admin/images/placeholder_square.png`)
+            )
+        },
+        mosaicPartition(items) {
+            const partition = _.groupBy(items, (item, i) => {
+                if (i % 2 == 0)
+                    return Math.floor(i/this.mosaicDensity)
+                else
+                    return Math.floor(i/(this.mosaicDensity + 1))
+            });
+            return _.values(partition);
         }
     },
     created() {
@@ -356,7 +438,7 @@ export default {
   
         if (this.showCollectionHeader)
             this.fetchCollectionForHeader();
-
+       
         this.fetchItems();
     },
 }
diff --git a/src/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list.scss b/src/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list.scss
index fc2992daa..e1417d0c5 100644
--- a/src/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list.scss
+++ b/src/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list.scss
@@ -1,7 +1,7 @@
 @import '../../gutenberg-blocks-style.scss';
 
 .wp-block-tainacan-dynamic-items-list {
-    margin: 2rem 0px;
+    margin: 2rem auto;
 
     // Spinner
     .spinner-container {
@@ -13,6 +13,11 @@
         color: #555758;
     }
 
+    // Resizer
+    &:hover .components-resizable-box__handle {
+        display: block;
+    }
+
     // Skeleton loading
     @-webkit-keyframes skeleton-animation {
         0%{opacity: 1.0}
@@ -70,14 +75,15 @@
             h3 { 
                 color: white; 
                 text-decoration: none;
-                font-size: 1.3rem;
+                font-size: 1.3em;
+                margin: 0;
                 &:hover {
                     text-decoration: none;
                 }
             }
             span.label { 
                 font-weight: normal; 
-                font-size: 1rem;
+                font-size: 0.75em;
             }
 
             &.only-collection-name {
@@ -215,9 +221,11 @@
         }
     }
 
-    // Grid View Mode ----------------------------------------------------
-    ul.items-list.items-list-without-margin,
-    ul.items-list-edit.items-list-without-margin {
+    // Style for both grid and list View Modes ----------------------------------------------------
+    ul.items-list.items-layout-list.items-list-without-margin,
+    ul.items-list-edit.items-layout-list.items-list-without-margin,
+    ul.items-list.items-layout-grid.items-list-without-margin,
+    ul.items-list-edit.items-layout-grid.items-list-without-margin {
         grid-template-columns: repeat(auto-fill, 185px);
         justify-content: center !important;
         grid-template-rows: auto !important;
@@ -235,47 +243,6 @@
             }
         }
     }
-    ul.items-list.items-layout-grid,
-    ul.items-list-edit.items-layout-grid {
-        padding: 0;
-        display: -ms-grid;
-        display: grid;
-        grid-template-columns: repeat(auto-fill, 220px);
-        grid-gap: 0px;
-        justify-content: space-evenly;
-        list-style-type: none;
-
-        li.item-list-item {
-            position: relative;
-            display: block;
-            margin: 12px 12px 24px 12px;
-            margin-bottom: 12px;
-            width: 185px;
-
-            a { 
-                color: #454647; 
-                font-weight: bold;
-                line-height: normal;
-            }
-
-            img {
-                height: auto;
-                width: 185px;
-                min-width: 185px;
-                padding: 0px;
-                margin-bottom: 0.5rem;
-            }
-
-            a.item-without-title span {
-                display: none;
-            }
-
-            &:hover a { 
-                color: #454647; 
-                text-decoration: none;
-            }
-        }
-    }
     ul.items-list-edit li.item-list-item {
         display: flex;
         align-items: flex-start;
@@ -311,6 +278,50 @@
             border: 1px solid #cbcbcb !important;
         }
     }
+
+    // Grid View Mode ----------------------------------------------------
+    ul.items-list.items-layout-grid,
+    ul.items-list-edit.items-layout-grid {
+        padding: 0;
+        @include display-grid;
+        -ms-grid-columns: 220px 220px 220px 220px 220px;
+        grid-template-columns: repeat(auto-fill, 220px);
+        grid-gap: 0px;
+        justify-content: space-evenly;
+        list-style-type: none;
+        margin: 0;
+
+        li.item-list-item {
+            position: relative;
+            display: block;
+            margin: 12px 12px 24px 12px;
+            margin-bottom: 12px;
+            width: 185px;
+
+            a { 
+                color: #454647; 
+                font-weight: bold;
+                line-height: normal;
+            }
+
+            img {
+                height: auto;
+                width: 185px;
+                min-width: 185px;
+                padding: 0px;
+                margin-bottom: 0.5rem;
+            }
+
+            a.item-without-title span {
+                display: none;
+            }
+
+            &:hover a { 
+                color: #454647; 
+                text-decoration: none;
+            }
+        }
+    }
     @media only screen and (max-width: 498px) { 
         
         ul.items-list.items-layout-grid,
@@ -332,6 +343,7 @@
         flex-wrap: wrap;
         align-items: center;
         list-style-type: none;
+        margin: 0;
 
         li.item-list-item {
             position: relative;
@@ -386,6 +398,516 @@
                 min-width: calc(100% - 24px);
                 width: calc(100% - 24px);
             }
-        }        
+        }   
+           
+    }
+
+    // Mosaic View Mode ----------------------------------------------------
+    ul.items-list.items-layout-mosaic,
+    ul.items-list-edit.items-layout-mosaic {
+        width: auto;
+        display: flex;
+        list-style: none;
+        min-height: 280px;
+        margin: 0;
+
+        .mosaic-container {
+            padding: 0;
+            justify-content: stretch; // For flex fallback compatibility
+            @include display-grid;
+            -ms-grid-columns: 150px 150px 150px;
+            grid-template-columns: repeat(3, 150px);
+            grid-auto-flow: dense;
+            width: 100%;
+            list-style-type: none;
+
+            &:not(:first-of-type) {
+                margin-left: 0 !important;
+            }
+
+            li.item-list-item {
+                flex-grow: 1; // For flex fallback compatibility
+                justify-self: stretch;
+                position: relative;
+                min-width: 100%;
+                background-size: cover;
+                background-position: center;
+                margin: 0;
+
+                a { 
+                    width: 100%;
+                    height: 100%;
+                    display: block;
+                    color: #454647; 
+                    font-weight: bold;
+                    line-height: normal;
+                }
+
+                img {
+                    display: none;
+                }
+                
+                a span {
+                    display: block;
+                    position: absolute;
+                    background: rgba(255, 255, 255, 0.75);
+                    bottom: 0;
+                    opacity: 0;
+                    padding: 8px 12px;
+                    word-break: break-word;
+                    transition: opacity 0.5s ease;
+                }
+                &:hover a span { opacity: 1 };
+
+                a.item-without-title span {
+                    display: none;
+                }
+
+                &:hover a { 
+                    color: #454647; 
+                    text-decoration: none;
+                }                
+            }
+            // 3 x 2 MOSAIC GRID ------------------------
+            &.mosaic-container--1-2x3 {
+                li.item-list-item {
+                    grid-row: span 2;
+                    grid-column: span 3;
+                }
+            }
+            &.mosaic-container--2-2x3 {
+                li.item-list-item {
+                    grid-row: span 1;
+                    grid-column: span 3;
+                }
+            }
+            &.mosaic-container--3-2x3 li.item-list-item {
+
+                &:nth-of-type(1) {
+                    grid-row: span 1;
+                    grid-column: span 2;
+                }
+            }
+            &.mosaic-container--4-2x3 li.item-list-item {
+
+                &:nth-of-type(1),
+                &:nth-of-type(3) {
+                    grid-row: span 1;
+                    grid-column: span 2;
+                }
+            }
+            &.mosaic-container--5-2x3 li.item-list-item {
+
+                &:nth-of-type(2) {
+                    grid-row: span 2;
+                    grid-column: span 1;
+                }
+            }
+            // 3 x 2 MOSAIC GRID ------------------------
+            &.mosaic-container--1-3x2 {
+                li.item-list-item {
+                    grid-row: span 3;
+                    grid-column: span 2;
+                }
+            }
+            &.mosaic-container--2-3x2 {
+                li.item-list-item {
+                    grid-row: span 3;
+                    grid-column: span 1;
+                }
+            }
+            &.mosaic-container--3-3x2 li.item-list-item {
+
+                &:nth-of-type(1) {
+                    grid-row: span 2;
+                    grid-column: span 2;
+                }
+            }
+            &.mosaic-container--4-3x2 li.item-list-item {
+
+                &:nth-of-type(1),
+                &:nth-of-type(3) {
+                    grid-row: span 2;
+                    grid-column: span 1;
+                }
+            }
+            &.mosaic-container--5-3x2 li.item-list-item {
+
+                &:nth-of-type(3) {
+                    grid-row: span 1;
+                    grid-column: span 2;
+                }
+            }
+            // 3 x 3 MOSAIC GRID ------------------------
+            &.mosaic-container--1-3x3 {
+                li.item-list-item {
+                    grid-row: span 3;
+                    grid-column: span 3;
+                }
+            }
+            &.mosaic-container--2-3x3 {
+                li.item-list-item:first-of-type {
+                    grid-row: span 1;
+                    grid-column: span 3;
+                }
+                li.item-list-item:last-of-type {
+                    grid-row: span 2;
+                    grid-column: span 3;
+                }
+            }
+            &.mosaic-container--3-3x3 li.item-list-item {
+
+                &:nth-of-type(1) {
+                    grid-row: span 2;
+                    grid-column: span 3;
+                }
+                &:nth-of-type(3) {
+                    grid-row: span 1;
+                    grid-column: span 2;
+                }
+            }
+            &.mosaic-container--4-3x3 li.item-list-item {
+
+                &:nth-of-type(1) {
+                    grid-row: span 2;
+                    grid-column: span 1;
+                }
+                &:nth-of-type(2) {
+                    grid-row: span 2;
+                    grid-column: span 2;
+                }
+                &:nth-of-type(3) {
+                    grid-row: span 1;
+                    grid-column: span 2;
+                }
+            }
+            &.mosaic-container--5-3x3 li.item-list-item {
+
+                &:nth-of-type(1) {
+                    grid-row: span 1;
+                    grid-column: span 2;
+                }
+                &:nth-of-type(4) {
+                    grid-row: span 2;
+                    grid-column: span 2;
+                }
+            }
+            &.mosaic-container--6-3x3 li.item-list-item {
+
+                &:nth-of-type(3) {
+                    grid-row: span 2;
+                    grid-column: span 1;
+                }
+                &:nth-of-type(4),
+                &:nth-of-type(6) {
+                    grid-row: span 1;
+                    grid-column: span 2;
+                }
+            }
+            // 3 x 4 MOSAIC GRID ------------------------
+            &.mosaic-container--1-3x4 {
+                li.item-list-item {
+                    grid-row: span 3;
+                    grid-column: span 4;
+                }
+            }
+            &.mosaic-container--2-3x4 {
+                li.item-list-item {
+                    grid-row: span 3;
+                    grid-column: span 2;
+                }
+            }
+            &.mosaic-container--3-3x4 li.item-list-item {
+
+                &:nth-of-type(1) {
+                    grid-row: span 3;
+                    grid-column: span 2;
+                }
+                &:nth-of-type(2) {
+                    grid-row: span 2;
+                    grid-column: span 2;
+                }
+                &:nth-of-type(3) {
+                    grid-row: span 1;
+                    grid-column: span 2;
+                }
+            }
+            &.mosaic-container--4-3x4 li.item-list-item {
+
+                &:nth-of-type(1),
+                &:nth-of-type(4) {
+                    grid-row: span 2;
+                    grid-column: span 2;
+                }
+                &:nth-of-type(2),
+                &:nth-of-type(3) {
+                    grid-row: span 1;
+                    grid-column: span 2;
+                }
+            }
+            &.mosaic-container--5-3x4 li.item-list-item {
+
+                &:nth-of-type(1),
+                &:nth-of-type(3) {
+                    grid-row: span 2;
+                    grid-column: span 2;
+                }
+                &:nth-of-type(2) {
+                    grid-row: span 1;
+                    grid-column: span 2;
+                }
+            }
+            &.mosaic-container--6-3x4 li.item-list-item {
+                
+                &:nth-of-type(2), 
+                &:nth-of-type(6) {
+                    grid-row: span 1;
+                    grid-column: span 2;
+                }
+                &:nth-of-type(3) {
+                    grid-row: span 2;
+                    grid-column: span 1;
+                }
+                &:nth-of-type(4) {
+                    grid-row: span 2;
+                    grid-column: span 2;
+                }
+            }
+            // 4 x 3 MOSAIC GRID ------------------------ 
+            &.mosaic-container--1-4x3 {
+                li.item-list-item {
+                    grid-row: span 4;
+                    grid-column: span 3;
+                }
+            }
+            &.mosaic-container--2-4x3 {
+                li.item-list-item {
+                    grid-row: span 2;
+                    grid-column: span 3;
+                }
+            }
+            &.mosaic-container--3-4x3 li.item-list-item {
+
+                &:nth-of-type(1) {
+                    grid-row: span 2;
+                    grid-column: span 3;
+                }
+                &:nth-of-type(2) {
+                    grid-row: span 2;
+                    grid-column: span 1;
+                }
+                &:nth-of-type(3) {
+                    grid-row: span 2;
+                    grid-column: span 2;
+                }
+            }
+            &.mosaic-container--4-4x3 li.item-list-item {
+
+                &:nth-of-type(1) {
+                    grid-row: span 2;
+                    grid-column: span 1;
+                }
+                &:nth-of-type(2) {
+                    grid-row: span 1;
+                    grid-column: span 2;
+                }
+                &:nth-of-type(4) {
+                    grid-row: span 2;
+                    grid-column: span 2;
+                }
+            }
+            &.mosaic-container--5-4x3 li.item-list-item {
+
+                &:nth-of-type(2),
+                &:nth-of-type(4) {
+                    grid-row: span 2;
+                    grid-column: span 2;
+                }
+                &:nth-of-type(5) {
+                    grid-row: span 2;
+                    grid-column: span 1;
+                }
+            }
+            &.mosaic-container--6-4x3 li.item-list-item {
+                
+                &:nth-of-type(2) {
+                    grid-row: span 2;
+                    grid-column: span 2;
+                }
+                &:nth-of-type(3),
+                &:nth-of-type(6) {
+                    grid-row: span 2;
+                    grid-column: span 1;
+                }
+                &:nth-of-type(5) {
+                    grid-row: span 1;
+                    grid-column: span 2;
+                }
+            }
+            // 4 x 5 MOSAIC GRID ------------------------ 
+            &.mosaic-container--1-4x5 {
+                li.item-list-item {
+                    grid-row: span 4;
+                    grid-column: span 5;
+                }
+            }
+            &.mosaic-container--2-4x5 {
+                li.item-list-item {
+                    grid-row: span 2;
+                    grid-column: span 5;
+                }
+            }
+            &.mosaic-container--3-4x5 li.item-list-item {
+
+                &:nth-of-type(1) {
+                    grid-row: span 2;
+                    grid-column: span 5;
+                }
+                &:nth-of-type(2) {
+                    grid-row: span 2;
+                    grid-column: span 3;
+                }
+                &:nth-of-type(3) {
+                    grid-row: span 2;
+                    grid-column: span 2;
+                }
+            }
+            &.mosaic-container--4-4x5 li.item-list-item {
+
+                &:nth-of-type(1),
+                &:nth-of-type(4) {
+                    grid-row: span 2;
+                    grid-column: span 3;
+                }
+                &:nth-of-type(2),
+                &:nth-of-type(3) {
+                    grid-row: span 2;
+                    grid-column: span 2;
+                }
+            }
+            &.mosaic-container--5-4x5 li.item-list-item {
+
+                &:nth-of-type(3),
+                &:nth-of-type(5) {
+                    grid-row: span 2;
+                    grid-column: span 3;
+                }
+                &:nth-of-type(4) {
+                    grid-row: span 3;
+                    grid-column: span 2;
+                }
+            }
+            &.mosaic-container--6-4x5 li.item-list-item {
+                
+                &:nth-of-type(1) {
+                    grid-row: span 2;
+                    grid-column: span 2;
+                }
+                &:nth-of-type(3) {
+                    grid-row: span 3;
+                    grid-column: span 2;
+                }
+                &:nth-of-type(5) {
+                    grid-row: span 2;
+                    grid-column: span 3;
+                }
+                &:nth-of-type(6) {
+                    grid-row: span 1;
+                    grid-column: span 2;
+                }
+            }
+            // 5 x 4 MOSAIC GRID ------------------------ 
+            &.mosaic-container--1-5x4 {
+                li.item-list-item {
+                    grid-row: span 5;
+                    grid-column: span 4;
+                }
+            }
+            &.mosaic-container--2-5x4 {
+                li.item-list-item {
+                    grid-row: span 5;
+                    grid-column: span 2;
+                }
+            }
+            &.mosaic-container--3-5x4 li.item-list-item {
+
+                &:nth-of-type(1) {
+                    grid-row: span 3;
+                    grid-column: span 2;
+                }
+                &:nth-of-type(2) {
+                    grid-row: span 5;
+                    grid-column: span 2;
+                }
+                &:nth-of-type(3) {
+                    grid-row: span 2;
+                    grid-column: span 2;
+                }
+            }
+            &.mosaic-container--4-5x4 li.item-list-item {
+
+                &:nth-of-type(1),
+                &:nth-of-type(3) {
+                    grid-row: span 3;
+                    grid-column: span 2;
+                }
+                &:nth-of-type(2),
+                &:nth-of-type(4) {
+                    grid-row: span 2;
+                    grid-column: span 2;
+                }
+            }
+            &.mosaic-container--5-5x4 li.item-list-item {
+
+                &:nth-of-type(1),
+                &:nth-of-type(3),
+                &:nth-of-type(5) {
+                    grid-row: span 2;
+                    grid-column: span 2;
+                }
+                &:nth-of-type(2) {
+                    grid-row: span 1;
+                    grid-column: span 2;
+                }
+                &:nth-of-type(4) {
+                    grid-row: span 3;
+                    grid-column: span 2;
+                }
+            }
+            &.mosaic-container--6-5x4 li.item-list-item {
+            
+                &:nth-of-type(1),
+                &:nth-of-type(5) {
+                    grid-row: span 2;
+                    grid-column: span 2;
+                }
+                &:nth-of-type(2) {
+                    grid-row: span 3;
+                    grid-column: span 2;
+                }
+                &:nth-of-type(3) {
+                    grid-row: span 1;
+                    grid-column: span 2;
+                }
+                &:nth-of-type(4),
+                &:nth-of-type(6) {
+                    grid-row: span 2;
+                    grid-column: span 1;
+                }
+            }
+        }
+    }
+    @media only screen and (max-width: 1024px) { 
+        
+        ul.items-list.items-layout-mosaic,
+        ul.items-list-edit.items-layout-mosaic {
+            overflow-x: auto;
+
+            .mosaic-container { 
+                min-width: 240px;
+            }
+        }
     }
 }
+
+
diff --git a/src/gutenberg-blocks/tainacan-items/dynamic-items-list/index.js b/src/gutenberg-blocks/tainacan-items/dynamic-items-list/index.js
index 2f54761cf..98983f4be 100644
--- a/src/gutenberg-blocks/tainacan-items/dynamic-items-list/index.js
+++ b/src/gutenberg-blocks/tainacan-items/dynamic-items-list/index.js
@@ -2,7 +2,7 @@ const { registerBlockType } = wp.blocks;
 
 const { __ } = wp.i18n;
 
-const { RangeControl, Spinner, Button, ToggleControl, Tooltip, Placeholder, Toolbar, ColorPicker, ColorPalette, BaseControl, PanelBody } = wp.components;
+const { ResizableBox, FocalPointPicker, SelectControl, RangeControl, Spinner, Button, ToggleControl, Tooltip, Placeholder, Toolbar, ColorPicker, ColorPalette, BaseControl, PanelBody } = wp.components;
 
 const { InspectorControls, BlockControls } = wp.editor;
 
@@ -115,6 +115,33 @@ registerBlockType('tainacan/dynamic-items-list', {
         collectionTextColor: {
             type: String,
             default: "#ffffff"
+        },
+        mosaicHeight: {
+            type: Number,
+            value: 280
+        },
+        mosaicGridColumns: {
+            type: Number,
+            value: 3
+        },
+        mosaicGridRows: {
+            type: Number,
+            value: 3
+        },
+        sampleBackgroundImage: {
+            type: String,
+            default: ''
+        },
+        mosaicItemFocalPoint: {
+            type: Object,
+            default: {
+                x: 0.5,
+                y: 0.5
+            }
+        },
+        mosaicDensity: {
+            type: Number,
+            default: 5
         }
     },
     supports: {
@@ -125,6 +152,7 @@ registerBlockType('tainacan/dynamic-items-list', {
         let {
             items, 
             content, 
+            collection,
             collectionId,  
             showImage,
             showName,
@@ -142,7 +170,13 @@ registerBlockType('tainacan/dynamic-items-list', {
             showCollectionLabel,
             isLoadingCollection,
             collectionBackgroundColor,
-            collectionTextColor
+            collectionTextColor,
+            mosaicHeight,
+            mosaicGridColumns,
+            mosaicGridRows,
+            mosaicItemFocalPoint,
+            sampleBackgroundImage,
+            mosaicDensity
         } = attributes;
 
         // Obtains block's client id to render it on save function
@@ -153,24 +187,22 @@ registerBlockType('tainacan/dynamic-items-list', {
                 <li 
                     key={ item.id }
                     className="item-list-item"
-                    style={{ marginBottom: layout == 'grid' ? (showName ? gridMargin + 12 : gridMargin) + 'px' : ''}}>      
+                    style={ {
+                        marginBottom: layout == 'grid' ? (showName ? gridMargin + 12 : gridMargin) + 'px' : '', 
+                        backgroundImage: layout == 'mosaic' ? `url(${getItemThumbnail(item, 'medium_large')})` : 'none',
+                        backgroundPosition: layout == 'mosaic' ? `${ mosaicItemFocalPoint.x * 100 }% ${ mosaicItemFocalPoint.y * 100 }%` : 'none'
+                    }}
+                >      
                     <a 
                         id={ isNaN(item.id) ? item.id : 'item-id-' + item.id }
                         href={ item.url } 
                         target="_blank"
+                        style={ {
+                            
+                        } }
                         className={ (!showName ? 'item-without-title' : '') + ' ' + (!showImage ? 'item-without-image' : '') }>
                         <img
-                            src={ 
-                                item.thumbnail && item.thumbnail['tainacan-medium'][0] && item.thumbnail['tainacan-medium'][0] 
-                                    ?
-                                item.thumbnail['tainacan-medium'][0] 
-                                    :
-                                (item.thumbnail && item.thumbnail['thumbnail'][0] && item.thumbnail['thumbnail'][0]
-                                    ?    
-                                item.thumbnail['thumbnail'][0] 
-                                    : 
-                                `${tainacan_plugin.base_url}/admin/images/placeholder_square.png`)
-                            }
+                            src={ getItemThumbnail(item, 'tainacan-medium') }
                             alt={ item.title ? item.title : __( 'Thumbnail', 'tainacan' ) }/>
                         <span>{ item.title ? item.title : '' }</span>
                     </a>
@@ -178,75 +210,126 @@ registerBlockType('tainacan/dynamic-items-list', {
             );
         }
 
+        function prepareMosaicItem(mosaicGroup, mosaicGroupsLength) {
+            
+            return (
+                <div 
+                    style={
+                        { 
+                            width: 'calc((100% / ' + mosaicGroupsLength + ') - ' + gridMargin + 'px)',
+                            height: 'calc(((' + (mosaicGridRows - 1) + ' * ' + gridMargin + 'px) + ' + mosaicHeight + 'px))',
+                            gridTemplateColumns: 'repeat(' + mosaicGridColumns + ', calc((100% / ' + mosaicGridColumns + ') - (' + ((mosaicGridColumns - 1)*Number(gridMargin)) + 'px/' + mosaicGridColumns + ')))',
+                            margin: gridMargin + 'px',
+                            gridGap: gridMargin + 'px',
+                        }
+                    }
+                    className={ 'mosaic-container mosaic-container--' + mosaicGroup.length + '-' + mosaicGridRows + 'x' + mosaicGridColumns }>
+                        { buildMosaic(mosaicGroup) }
+                    </div>
+            )
+        }
+
         function setContent(){
 
-            items = [];
-            isLoading = true;
-            
-            if (itemsRequestSource != undefined && typeof itemsRequestSource == 'function')
-                itemsRequestSource.cancel('Previous items search canceled.');
+            if (searchURL) {
 
-            itemsRequestSource = axios.CancelToken.source();
-            
-            setAttributes({
-                isLoading: isLoading
-            });
+                items = [];
+                isLoading = true;
+                
+                if (itemsRequestSource != undefined && typeof itemsRequestSource == 'function')
+                    itemsRequestSource.cancel('Previous items search canceled.');
 
-            let endpoint = '/collection' + searchURL.split('#')[1].split('/collections')[1];
-            let query = endpoint.split('?')[1];
-            let queryObject = qs.parse(query);
-
-            // Set up max items to be shown
-            if (maxItemsNumber != undefined && maxItemsNumber > 0)
-                queryObject.perpage = maxItemsNumber;
-            else if (queryObject.perpage != undefined && queryObject.perpage > 0)
-                setAttributes({ maxItemsNumber: queryObject.perpage });
-            else {
-                queryObject.perpage = 12;
-                setAttributes({ maxItemsNumber: 12 });
-            }
-
-            // Set up sorting order
-            if (order != undefined)
-                queryObject.order = order;
-            else if (queryObject.order != undefined)
-                setAttributes({ order: queryObject.order });
-            else {
-                queryObject.order = 'asc';
-                setAttributes({ order: 'asc' });
-            }
-
-            // Set up sorting order
-            if (searchString != undefined)
-                queryObject.search = searchString;
-            else if (queryObject.search != undefined)
-                setAttributes({ searchString: queryObject.search });
-            else {
-                delete queryObject.search;
-                setAttributes({ searchString: undefined });
-            }
-
-            // Remove unecessary queries
-            delete queryObject.readmode;
-            delete queryObject.iframemode;
-            delete queryObject.admin_view_mode;
-            delete queryObject.fetch_only_meta;
-            
-            endpoint = endpoint.split('?')[0] + '?' + qs.stringify(queryObject) + '&fetch_only=title,url,thumbnail';
-            
-            tainacan.get(endpoint, { cancelToken: itemsRequestSource.token })
-                .then(response => {
-
-                    for (let item of response.data.items)
-                        items.push(prepareItem(item));
-
-                    setAttributes({
-                        content: <div></div>,
-                        items: items,
-                        isLoading: false,
-                        itemsRequestSource: itemsRequestSource
-                    });
+                itemsRequestSource = axios.CancelToken.source();
+                
+                setAttributes({
+                    isLoading: isLoading
                 });
+
+                let endpoint = '/collection' + searchURL.split('#')[1].split('/collections')[1];
+                let query = endpoint.split('?')[1];
+                let queryObject = qs.parse(query);
+
+                // Set up max items to be shown
+                if (maxItemsNumber != undefined && maxItemsNumber > 0)
+                    queryObject.perpage = maxItemsNumber;
+                else if (queryObject.perpage != undefined && queryObject.perpage > 0)
+                    setAttributes({ maxItemsNumber: queryObject.perpage });
+                else {
+                    queryObject.perpage = 12;
+                    setAttributes({ maxItemsNumber: 12 });
+                }
+
+                // Set up sorting order
+                if (order != undefined)
+                    queryObject.order = order;
+                else if (queryObject.order != undefined)
+                    setAttributes({ order: queryObject.order });
+                else {
+                    queryObject.order = 'asc';
+                    setAttributes({ order: 'asc' });
+                }
+
+                // Set up sorting order
+                if (searchString != undefined)
+                    queryObject.search = searchString;
+                else if (queryObject.search != undefined)
+                    setAttributes({ searchString: queryObject.search });
+                else {
+                    delete queryObject.search;
+                    setAttributes({ searchString: undefined });
+                }
+
+                // Remove unecessary queries
+                delete queryObject.readmode;
+                delete queryObject.iframemode;
+                delete queryObject.admin_view_mode;
+                delete queryObject.fetch_only_meta;
+                
+                endpoint = endpoint.split('?')[0] + '?' + qs.stringify(queryObject) + '&fetch_only=title,url,thumbnail';
+                
+                tainacan.get(endpoint, { cancelToken: itemsRequestSource.token })
+                    .then(response => {
+                        
+                        if (layout !== 'mosaic') {
+                           
+                            for (let item of response.data.items)
+                                items.push(prepareItem(item));
+
+                            setAttributes({
+                                content: <div></div>,
+                                items: items,
+                                isLoading: false,
+                                itemsRequestSource: itemsRequestSource
+                            });
+
+                        } else {
+                            // Initializes some variables
+                            mosaicDensity = mosaicDensity ? mosaicDensity : 5;
+                            mosaicGridRows = mosaicGridRows ? mosaicGridRows : 3;
+                            mosaicGridColumns = mosaicGridColumns ? mosaicGridColumns : 3;
+                            mosaicHeight = mosaicHeight ? mosaicHeight : 280;
+                            mosaicItemFocalPoint = mosaicItemFocalPoint ? mosaicItemFocalPoint : { x: 0.5, y: 0.5 };
+                            sampleBackgroundImage = response.data.items && response.data.items[0] && response.data.items[0] ? getItemThumbnail(response.data.items[0], 'tainacan-medium') : ''; 
+ 
+                            const mosaicGroups = mosaicPartition(response.data.items);
+                            for (let mosaicGroup of mosaicGroups)
+                                items.push(prepareMosaicItem(mosaicGroup, mosaicGroups.length));
+
+                            setAttributes({
+                                content: <div></div>,
+                                items: items,
+                                isLoading: false,
+                                itemsRequestSource: itemsRequestSource,
+                                mosaicDensity: mosaicDensity,
+                                mosaicHeight: mosaicHeight,
+                                mosaicGridRows: mosaicGridRows,
+                                mosaicGridColumns: mosaicGridColumns,
+                                mosaicItemFocalPoint: mosaicItemFocalPoint,
+                                sampleBackgroundImage: sampleBackgroundImage
+                            });
+                        }
+                    });
+            }
         }
 
         function fetchCollectionForHeader() {
@@ -283,6 +366,20 @@ registerBlockType('tainacan/dynamic-items-list', {
             }
         }
 
+        function getItemThumbnail(item, size) {
+            return (
+                item.thumbnail && item.thumbnail[size][0] && item.thumbnail[size][0] 
+                ?
+                item.thumbnail[size][0] 
+                    :
+                (item.thumbnail && item.thumbnail['thumbnail'][0] && item.thumbnail['thumbnail'][0]
+                    ?    
+                item.thumbnail['thumbnail'][0] 
+                    : 
+                `${tainacan_plugin.base_url}/admin/images/placeholder_square.png`)
+            )
+        }
+
         function openDynamicItemsModal() {
             isModalOpen = true;
             setAttributes( { 
@@ -293,7 +390,7 @@ registerBlockType('tainacan/dynamic-items-list', {
         function updateLayout(newLayout) {
             layout = newLayout;
 
-            if (layout == 'grid' && showImage == false)
+            if ((layout == 'grid' || layout == 'mosaic') && showImage == false)
                 showImage = true;
 
             if (layout == 'list' && showName == false)
@@ -318,6 +415,31 @@ registerBlockType('tainacan/dynamic-items-list', {
             }
         }
 
+        function updateMosaicItemFocalPoint(focalPoint) {
+            if (Math.abs(focalPoint.x - mosaicItemFocalPoint.x) > 0.025 || Math.abs(focalPoint.y - mosaicItemFocalPoint.y) > 0.025) {
+                mosaicItemFocalPoint = focalPoint;
+                setAttributes({ mosaicItemFocalPoint: focalPoint });
+                setContent();
+            }
+        }
+
+        function mosaicPartition(items) {
+            const partition = _.groupBy(items, (item, i) => {
+                if (i % 2 == 0)
+                    return Math.floor(i/mosaicDensity)
+                else
+                    return Math.floor(i/(mosaicDensity + 1))
+            });
+            return _.values(partition);
+        }
+
+        function buildMosaic(mosaicGroup) {
+            let mosaic = []
+            for (let item of mosaicGroup) 
+                mosaic.push(prepareItem(item))
+            return mosaic;
+        }
+
         // Executed only on the first load of page
         if(content && content.length && content[0].type)
             setContent();
@@ -334,6 +456,12 @@ registerBlockType('tainacan/dynamic-items-list', {
                 title: __( 'List View' ),
                 onClick: () => updateLayout('list'),
                 isActive: layout === 'list',
+            },
+            {
+                icon: 'layout',
+                title: __( 'Mosaic View' ),
+                onClick: () => updateLayout('mosaic'),
+                isActive: layout === 'mosaic',
             }
         ];
 
@@ -454,7 +582,7 @@ registerBlockType('tainacan/dynamic-items-list', {
                                         }
                                     /> 
                                 : null }
-                                { layout == 'grid' ?
+                                { layout == 'grid' || layout == 'mosaic' ?
                                     <div>
                                         <ToggleControl
                                             label={__("Item's title", 'tainacan')}
@@ -470,10 +598,10 @@ registerBlockType('tainacan/dynamic-items-list', {
                                         <div style={{ marginTop: '16px'}}>
                                             <RangeControl
                                                 label={__('Margin between items in pixels', 'tainacan')}
-                                                value={ gridMargin }
+                                                value={ gridMargin ? gridMargin : 0 }
                                                 onChange={ ( margin ) => {
                                                     gridMargin = margin;
-                                                    setAttributes( { gridMargin: margin } ) 
+                                                    setAttributes( { gridMargin: margin } );
                                                     setContent();
                                                 }}
                                                 min={ 0 }
@@ -484,6 +612,75 @@ registerBlockType('tainacan/dynamic-items-list', {
                                 : null }
                             </div>
                         </PanelBody>
+                        { layout == 'mosaic' ?
+                        <PanelBody
+                            title={__('Mosaic', 'tainacan')}
+                            initialOpen={ true }
+                            >
+                            <div>
+                                <RangeControl
+                                    label={__('Container height (px)', 'tainacan')}
+                                    value={ mosaicHeight ? mosaicHeight : 280 }
+                                    onChange={ ( height ) => {
+                                        mosaicHeight = height;
+                                        setAttributes( { mosaicHeight: height } );
+                                        setContent();
+                                    }}
+                                    min={ 100 }
+                                    max={ 2000 }
+                                />
+                            </div>
+                            <div>
+                                <RangeControl
+                                    label={__('Group Grid Density', 'tainacan')}
+                                    value={ mosaicDensity ? mosaicDensity : 5 }
+                                    onChange={ ( value ) => {
+                                        mosaicDensity = value;
+                                        setAttributes( { mosaicDensity: mosaicDensity } );
+                                        setContent();
+                                    }}
+                                    min={ 1 }
+                                    max={ 5 }
+                                />
+                            </div>
+                            <div>
+                                <SelectControl
+                                    label={__('Group Grid Dimensions', 'tainacan')}
+                                    value={ mosaicGridRows + 'x' + mosaicGridColumns }
+                                    options={ [
+                                        { label: '2 x 3', value: '2x3' },
+                                        { label: '3 x 2', value: '3x2' },
+                                        { label: '3 x 3', value: '3x3' },
+                                        { label: '3 x 4', value: '3x4' },
+                                        { label: '4 x 3', value: '4x3' },
+                                        { label: '4 x 5', value: '4x5' },
+                                        { label: '5 x 4', value: '5x4' },
+                                    ] }
+                                    onChange={ ( aGrid ) => { 
+                                        mosaicGridRows = aGrid.split('x')[0];
+                                        mosaicGridColumns = aGrid.split('x')[1];
+                    
+                                        setAttributes({
+                                            mosaicGridRows: mosaicGridRows,
+                                            mosaicGridColumns: mosaicGridColumns
+                                        }); 
+                                        setContent();
+                                    }}/>
+                            </div>
+                            <div>
+                                <FocalPointPicker 
+                                    label={ __('Item focal point for background image', 'tainacan') }
+                                    url={ sampleBackgroundImage }
+                                    dimensions={ {
+                                        width: 400,
+                                        height: 400
+                                    } }
+                                    value={ mosaicItemFocalPoint }
+                                    onChange={ ( focalPoint ) =>_.debounce( updateMosaicItemFocalPoint(focalPoint), 700) } 
+                                />
+                            </div>
+                        </PanelBody>
+                        : null}
                     </InspectorControls>
                 </div>
 
@@ -701,7 +898,7 @@ registerBlockType('tainacan/dynamic-items-list', {
                             isPrimary
                             type="submit"
                             onClick={ () => openDynamicItemsModal() }>
-                            {__('Select items', 'tainacan')}
+                            {__('Configure search', 'tainacan')}
                         </Button>   
                     </Placeholder>
                     ) : null
@@ -712,14 +909,54 @@ registerBlockType('tainacan/dynamic-items-list', {
                         <Spinner />
                     </div> :
                     <div>
-                        <ul 
-                            style={{ 
-                                gridTemplateColumns: layout == 'grid' ? 'repeat(auto-fill, ' +  (gridMargin + (showName ? 220 : 185)) + 'px)' : 'inherit', 
-                                marginTop: showSearchBar || showCollectionHeader ? '1.5rem' : '0px'
-                            }}
-                            className={'items-list-edit items-layout-' + layout + (!showName ? ' items-list-without-margin' : '')}>
-                            { items }
-                        </ul>
+                        { layout !== 'mosaic' ? (
+                            <ul 
+                                style={{
+                                    gridTemplateColumns: layout == 'grid' ? 'repeat(auto-fill, ' + (gridMargin + (showName ? 220 : 185)) + 'px)' : 'inherit',
+                                    marginTop: showSearchBar || showCollectionHeader ? '-' + (Number(gridMargin)/2) : '0px',    
+                                    padding: (Number(gridMargin)/4) + 'px',
+                                }}
+                                className={'items-list-edit items-layout-' + layout + (!showName ? ' items-list-without-margin' : '')}>
+                                { items }
+                            </ul>
+                        ) : 
+                            <ResizableBox
+                                size={ {
+                                    height: mosaicHeight ? mosaicHeight + (3 * gridMargin) : 280 + (3 * gridMargin),
+                                    width: '100%'
+                                } }
+                                minHeight="80"
+                                maxHeight="2000"
+                                minWidth="100%"
+                                maxWidth="100%"
+                                showHandle={ true }
+                                enable={ {
+                                    top: false,
+                                    right: false,
+                                    bottom: true,
+                                    left: false,
+                                    topRight: false,
+                                    bottomRight: true,
+                                    bottomLeft: true,
+                                    topLeft: false,
+                                } }
+                                onResizeStop={ ( event, direction, elt, delta ) => {
+                                    mosaicHeight = delta.height ? parseInt(delta.height) + parseInt(mosaicHeight) : 280;
+                                    setAttributes({ mosaicHeight: parseInt(mosaicHeight) });
+                                    setContent();
+                                } }
+                            >
+                                <ul 
+                                    style={{
+                                        marginTop: showSearchBar || showCollectionHeader ? '-' + (Number(gridMargin)/2) : '0px',    
+                                        padding: (Number(gridMargin)/4) + 'px',
+                                        minHeight: mosaicHeight + 'px'
+                                    }}
+                                    className={'items-list-edit items-layout-' + layout + (!showName ? ' items-list-without-margin' : '')}>
+                                    { items }
+                                </ul>
+                            </ResizableBox>
+                        }
                     </div>
                 }
             </div>
@@ -741,9 +978,14 @@ registerBlockType('tainacan/dynamic-items-list', {
             showCollectionHeader,
             showCollectionLabel,
             collectionBackgroundColor,
-            collectionTextColor
+            collectionTextColor,
+            mosaicHeight,
+            mosaicGridRows,
+            mosaicGridColumns,
+            mosaicItemFocalPoint,
+            mosaicDensity
         } = attributes;
-        
+
         return <div 
                     search-url={ searchURL }
                     className={ className }
@@ -754,6 +996,12 @@ registerBlockType('tainacan/dynamic-items-list', {
                     show-collection-header={ '' + showCollectionHeader }
                     show-collection-label={ '' + showCollectionLabel }
                     layout={ layout }
+                    mosaic-height={ mosaicHeight }
+                    mosaic-density={ mosaicDensity }
+                    mosaic-grid-rows={ mosaicGridRows } 
+                    mosaic-grid-columns={ mosaicGridColumns }
+                    mosaic-item-focal-point-x={ mosaicItemFocalPoint.x } 
+                    mosaic-item-focal-point-y={ mosaicItemFocalPoint.y } 
                     collection-background-color={ collectionBackgroundColor }
                     collection-text-color={ collectionTextColor }
                     grid-margin={ gridMargin }
@@ -764,5 +1012,140 @@ registerBlockType('tainacan/dynamic-items-list', {
                     id={ 'wp-block-tainacan-dynamic-items-list_' + blockId }>
                         { content }
                 </div>
+    },
+    deprecated: [
+    {
+        attributes: {
+            content: {
+                type: 'array',
+                source: 'children',
+                selector: 'div'
+            },
+            collectionId: {
+                type: String,
+                default: undefined
+            },
+            items: {
+                type: Array,
+                default: []
+            },
+            showImage: {
+                type: Boolean,
+                default: true
+            },
+            showName: {
+                type: Boolean,
+                default: true
+            },
+            layout: {
+                type: String,
+                default: 'grid'
+            },
+            isModalOpen: {
+                type: Boolean,
+                default: false
+            },
+            gridMargin: {
+                type: Number,
+                default: 0
+            },
+            searchURL: {
+                type: String,
+                default: undefined
+            },
+            itemsRequestSource: {
+                type: String,
+                default: undefined
+            },
+            maxItemsNumber: {
+                type: Number,
+                value: undefined
+            },
+            isLoading: {
+                type: Boolean,
+                value: false
+            },
+            isLoadingCollection: {
+                type: Boolean,
+                value: false
+            },
+            showSearchBar: {
+                type: Boolean,
+                value: false
+            },
+            showCollectionHeader: {
+                type: Boolean,
+                value: false
+            },
+            showCollectionLabel: {
+                type: Boolean,
+                value: false
+            },
+            collection: {
+                type: Object,
+                value: undefined
+            },
+            searchString: {
+                type: String,
+                default: undefined
+            },
+            order: {
+                type: String,
+                default: undefined
+            },
+            blockId: {
+                type: String,
+                default: undefined
+            },
+            collectionBackgroundColor: {
+                type: String,
+                default: "#454647"
+            },
+            collectionTextColor: {
+                type: String,
+                default: "#ffffff"
+            }
+        },
+        save({ attributes, className }){
+            const {
+                content, 
+                blockId,
+                collectionId,  
+                showImage,
+                showName,
+                layout,
+                gridMargin,
+                searchURL,
+                maxItemsNumber,
+                order,
+                showSearchBar,
+                showCollectionHeader,
+                showCollectionLabel,
+                collectionBackgroundColor,
+                collectionTextColor
+            } = attributes;
+            
+            return <div 
+                        search-url={ searchURL }
+                        className={ className }
+                        collection-id={ collectionId }  
+                        show-image={ '' + showImage }
+                        show-name={ '' + showName }
+                        show-search-bar={ '' + showSearchBar }
+                        show-collection-header={ '' + showCollectionHeader }
+                        show-collection-label={ '' + showCollectionLabel }
+                        layout={ layout }
+                        collection-background-color={ collectionBackgroundColor }
+                        collection-text-color={ collectionTextColor }
+                        grid-margin={ gridMargin }
+                        max-items-number={ maxItemsNumber }
+                        order={ order }
+                        tainacan-api-root={ tainacan_plugin.root }
+                        tainacan-base-url={ tainacan_plugin.base_url }
+                        id={ 'wp-block-tainacan-dynamic-items-list_' + blockId }>
+                            { content }
+                    </div>
+        }
     }
+    ]
 });
\ No newline at end of file
diff --git a/src/gutenberg-blocks/tainacan-items/items-list/items-list.scss b/src/gutenberg-blocks/tainacan-items/items-list/items-list.scss
index 6fceef5eb..eeba06df1 100644
--- a/src/gutenberg-blocks/tainacan-items/items-list/items-list.scss
+++ b/src/gutenberg-blocks/tainacan-items/items-list/items-list.scss
@@ -1,7 +1,7 @@
 @import '../../gutenberg-blocks-style.scss';
 
 .wp-block-tainacan-items-list {
-    margin: 2rem 0px;
+    margin: 2rem auto;
 
     // Spinner
     .components-spinner {
@@ -31,8 +31,8 @@
     ul.items-list.items-layout-grid,
     ul.items-list-edit.items-layout-grid {
         padding: 0;
-        display: -ms-grid;
-        display: grid;
+        @include display-grid;
+        -ms-grid-columns: 220px 220px 220px 220px 220px;
         grid-template-columns: repeat(auto-fill, 220px);
         grid-gap: 0px;
         justify-content: space-evenly;
diff --git a/src/gutenberg-blocks/tainacan-items/items-list/items-modal.js b/src/gutenberg-blocks/tainacan-items/items-list/items-modal.js
index b36c050bb..38e7d71e7 100644
--- a/src/gutenberg-blocks/tainacan-items/items-list/items-modal.js
+++ b/src/gutenberg-blocks/tainacan-items/items-list/items-modal.js
@@ -85,7 +85,7 @@ export default class ItemsModal extends React.Component {
 
         let anItemsRequestSource = axios.CancelToken.source();
 
-        let endpoint = '/collection/' + this.state.collectionId + '/items?'+ qs.stringify({ postin: selectedItems }) + '&fetch_only=title,url,thumbnail';
+        let endpoint = '/collection/' + this.state.collectionId + '/items?'+ qs.stringify({ postin: selectedItems, perpage: selectedItems.length }) + '&fetch_only=title,url,thumbnail';
         
         tainacan.get(endpoint, { cancelToken: anItemsRequestSource.token })
             .then(response => {
diff --git a/src/gutenberg-blocks/tainacan-items/search-bar/search-bar.scss b/src/gutenberg-blocks/tainacan-items/search-bar/search-bar.scss
index f7a233515..53de6ef89 100644
--- a/src/gutenberg-blocks/tainacan-items/search-bar/search-bar.scss
+++ b/src/gutenberg-blocks/tainacan-items/search-bar/search-bar.scss
@@ -5,7 +5,7 @@
     justify-content: center;
 }
 .wp-block-tainacan-search-bar {
-    margin: 2rem 0px;
+    margin: 2rem auto;
 
     .tainacan-search-container {
         width: 100%;
diff --git a/src/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list-theme.vue b/src/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list-theme.vue
index ba7d957f5..eb000cbc3 100644
--- a/src/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list-theme.vue
+++ b/src/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list-theme.vue
@@ -111,7 +111,7 @@
             </div>
             <!-- Swiper buttons are hidden as they actually swipe from slide to slide -->
         </div>
-        <div v-else-if="isLoading && !autoPlay">
+        <div v-else-if="isLoading && !autoPlay && !loopSlides">
             <div :class="'tainacan-carousel has-arrows-' + arrowsPosition">
                 <swiper 
                         role="list"
@@ -240,7 +240,7 @@ export default {
 
             this.termsRequestSource = axios.CancelToken.source();
 
-            let endpoint = '/taxonomy/' + this.taxonomyId + '/terms/?'+ qs.stringify({ include: this.selectedTerms }) + '&fetch_only=id,name,url,header_image';
+            let endpoint = '/taxonomy/' + this.taxonomyId + '/terms/?'+ qs.stringify({ hideempty: 0, include: this.selectedTerms }) + '&fetch_only=id,name,url,header_image';
 
             this.tainacanAxios.get(endpoint, { cancelToken: this.termsRequestSource.token })
                 .then(response => {
diff --git a/src/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list.scss b/src/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list.scss
index 68dff7d07..df43e8b98 100644
--- a/src/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list.scss
+++ b/src/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list.scss
@@ -18,8 +18,10 @@
         &.term-carousel-view-mode-grid {
             margin-right: 6px;
             div {
-                display: grid;
+                @include display-grid;
+                -ms-grid-columns: 33% 33% 33%;
                 grid-template-columns: 33% 33% 33%;
+                -ms-grid-rows: 50% 50%;
                 grid-template-rows: 50% 50%;
                 grid-column-gap: 2px;
                 grid-row-gap: 2px;
@@ -28,15 +30,14 @@
                 margin: 4px auto 8px auto;
 
                 &>div:first-of-type {
-                    grid-column-start: 1;
-                    grid-column-end: span 2;
-                    grid-row-start: 1;
-                    grid-row-end: span 2;
+                    flex-basis: 100%;
+                    @include grid-child(1, 3, 1, 3);
                     width: 41px;
                     height: 42px;
                 }
 
-                &>div { 
+                &>div {
+                    flex-basis: 50%; 
                     width: 20px;
                     height: 20px;
                     background: #555758;
@@ -82,7 +83,7 @@
 }
 
 .wp-block-tainacan-carousel-terms-list {
-    margin: 2rem 0px;
+    margin: 2rem auto;
 
     // Spinner
     .spinner-container {
@@ -141,7 +142,7 @@
                 text-decoration: none;
                 padding: 8px 16px;
                 display: block;
-                line-height: 1.2rem;
+                line-height: 1.2em;
             }
             a>img {
                 width: 100%;
@@ -158,19 +159,18 @@
                     display: block;
                 }
                 .term-items-grid {
-                    display: grid;
+                    @include display-grid;
                     grid-template-columns: 33% 33% 33%;
                     grid-template-rows: 50% 50%;
                     width: 100%;
     
                     img:first-of-type {
-                        grid-column-start: 1;
-                        grid-column-end: span 2;
-                        grid-row-start: 1;
-                        grid-row-end: span 2;
+                        flex-basis: 100%;
+                        @include grid-child(1, 3, 1, 3);
                     }
     
                     img { 
+                        flex-basis: 50%;
                         width: 100%;
                         height: auto;
                         padding: 2px;
@@ -303,18 +303,17 @@
 
 
             .term-items-grid {
-                display: grid;
+                @include display-grid;
                 grid-template-columns: 33% 33% 33%;
                 grid-template-rows: 50% 50%;
 
                 img:first-of-type {
-                    grid-column-start: 1;
-                    grid-column-end: span 2;
-                    grid-row-start: 1;
-                    grid-row-end: span 2;
+                    flex-basis: 100%;
+                    @include grid-child(1, 3, 1, 3);
                 }
 
-                img { 
+                img {
+                    flex-basis: 50%; 
                     padding: 2px;
                     margin-bottom: 0px; 
                 }
diff --git a/src/gutenberg-blocks/tainacan-terms/carousel-terms-list/index.js b/src/gutenberg-blocks/tainacan-terms/carousel-terms-list/index.js
index 5652dcc43..501b518d8 100644
--- a/src/gutenberg-blocks/tainacan-terms/carousel-terms-list/index.js
+++ b/src/gutenberg-blocks/tainacan-terms/carousel-terms-list/index.js
@@ -210,7 +210,7 @@ registerBlockType('tainacan/carousel-terms-list', {
 
             terms = [];
 
-            let endpoint = '/taxonomy/' + taxonomyId + '/terms/?'+ qs.stringify({ include: selectedTerms }) + '&fetch_only=id,name,url,header_image';
+            let endpoint = '/taxonomy/' + taxonomyId + '/terms/?'+ qs.stringify({ hideempty: 0, include: selectedTerms }) + '&fetch_only=id,name,url,header_image';
             tainacan.get(endpoint, { cancelToken: itemsRequestSource.token })
                 .then(response => {
 
@@ -227,7 +227,6 @@ registerBlockType('tainacan/carousel-terms-list', {
                     } else {
                         let promises = [];
                         for (let term of response.data) {  
-                            console.log(term)
                             promises.push(
                                 tainacan.get('/items/?perpage=3&fetch_only=name,url,thumbnail&taxquery[0][taxonomy]=tnc_tax_' + taxonomyId + '&taxquery[0][terms][0]=' + term.id + '&taxquery[0][compare]=IN')
                                     .then(response => { return({ term: term, termItems: response.data.items }) })
diff --git a/src/gutenberg-blocks/tainacan-terms/terms-list/terms-list.scss b/src/gutenberg-blocks/tainacan-terms/terms-list/terms-list.scss
index 3bcce381c..bb430e860 100644
--- a/src/gutenberg-blocks/tainacan-terms/terms-list/terms-list.scss
+++ b/src/gutenberg-blocks/tainacan-terms/terms-list/terms-list.scss
@@ -1,7 +1,7 @@
 @import '../../gutenberg-blocks-style.scss';
 
 .wp-block-tainacan-terms-list {
-    margin: 2rem 0px;
+    margin: 2rem auto;
 
     // Spinner
     .components-spinner {
@@ -13,8 +13,8 @@
     ul.terms-list.terms-layout-grid,
     ul.terms-list-edit.terms-layout-grid {
         padding: 0;
-        display: -ms-grid;
-        display: grid;
+        @include display-grid;
+        -ms-grid-columns: 220px 220px 220px 220px 220px;
         grid-template-columns: repeat(auto-fill, 220px);
         grid-gap: 0px;
         justify-content: space-evenly;
diff --git a/src/importer/class-tainacan-csv.php b/src/importer/class-tainacan-csv.php
index 456831e66..507d0aaa9 100644
--- a/src/importer/class-tainacan-csv.php
+++ b/src/importer/class-tainacan-csv.php
@@ -84,7 +84,7 @@ class CSV extends Importer {
     }
 
     /**
-     * 
+     *
      * returns all header including special
      */
     public function raw_source_metadata() {
@@ -103,9 +103,12 @@ class CSV extends Importer {
      */
     public function process_item( $index, $collection_definition ) {
         $processedItem = [];
-        $headers = $this->raw_source_metadata();
+		$headers = $this->raw_source_metadata();
 
-        $this->add_log('Proccessing item index ' . $index . ' in collection ' . $collection_definition['id'] );
+		$item_line = (int) $index + 2;
+
+        $this->add_log( 'Processing item on line ' . $item_line );
+        $this->add_log( 'Target collection: ' . $collection_definition['id'] );
 
         if (($handle = fopen($this->tmp_file, "r")) !== false) {
             $file = $handle;
@@ -146,10 +149,8 @@ class CSV extends Importer {
             return false;
         }
 
-        $this->add_log('item index ' . $this->get_option('item_id_index')  );
         if( is_numeric($this->get_option('item_id_index')) ) {
             $this->handle_item_id( $values );
-            $this->add_log('Updating item' );
         }
         foreach ( $collection_definition['mapping'] as $metadatum_id => $header) {
             $column = null;
@@ -165,7 +166,7 @@ class CSV extends Importer {
             $valueToInsert = $this->handle_encoding( $values[ $column ] );
 
             $metadatum = new \Tainacan\Entities\Metadatum($metadatum_id);
-            $processedItem[ $header ] = ( $metadatum->is_multiple() ) ? 
+            $processedItem[ $header ] = ( $metadatum->is_multiple() ) ?
                 explode( $this->get_option('multivalued_delimiter'), $valueToInsert) : $valueToInsert;
         }
 
@@ -174,7 +175,7 @@ class CSV extends Importer {
         if( !empty( $this->get_option('item_status_index') ) ) $processedItem['special_item_status'] = '';
         if( !empty( $this->get_option('item_comment_status_index') ) ) $processedItem['special_comment_status'] = '';
 
-        $this->add_log('Success to proccess index: ' . $index  );
+        $this->add_log('Success processing index: ' . $index  );
         return $processedItem;
     }
 
@@ -188,7 +189,7 @@ class CSV extends Importer {
         $column_item_comment_status = $this->get_option('item_comment_status_index');
 
         if( !empty($column_document) || !empty( $column_attachment ) || !empty( $column_item_status ) ){
-            
+
             if (($handle = fopen($this->tmp_file, "r")) !== false) {
                 $file = $handle;
             } else {
@@ -238,7 +239,7 @@ class CSV extends Importer {
         return false;
     }
 
-    
+
     public function options_form() {
 		ob_start();
 	   ?>
@@ -257,13 +258,13 @@ class CSV extends Importer {
 						<div class="help-tooltip-body">
 							<p><?php _e('The character used to separate each column in your CSV (e.g. , or ;)', 'tainacan'); ?></p>
 						</div>
-					</div> 
+					</div>
 			</span>
 			<div class="control is-clearfix">
 				<input class="input" type="text" name="delimiter" value="<?php echo esc_attr($this->get_option('delimiter')); ?>">
 			</div>
 		</div>
-		
+
 		<div class="field">
 			<label class="label"><?php _e('Multivalued metadata delimiter', 'tainacan'); ?></label>
 			<span class="help-wrapper">
@@ -279,13 +280,13 @@ class CSV extends Importer {
 						<div class="help-tooltip-body">
 							<p><?php _e('The character used to separate each value inside a cell with multiple values (e.g. ||). Note that the target metadatum must accept multiple values.', 'tainacan'); ?></p>
 						</div>
-					</div> 
+					</div>
 			</span>
 			<div class="control is-clearfix">
 				<input class="input" type="text" name="multivalued_delimiter" value="<?php echo $this->get_option('multivalued_delimiter'); ?>">
 			</div>
 		</div>
-		
+
 		<div class="field">
 			<label class="label"><?php _e('Enclosure', 'tainacan'); ?></label>
 			<span class="help-wrapper">
@@ -301,13 +302,13 @@ class CSV extends Importer {
 						<div class="help-tooltip-body">
 							<p><?php _e('The character that wraps the content of each cell in your CSV. (e.g. ")', 'tainacan'); ?></p>
 						</div>
-					</div> 
+					</div>
 			</span>
 			<div class="control is-clearfix">
 				<input class="input" type="text" name="enclosure" value="<?php echo $this->get_option('enclosure'); ?>">
 			</div>
 		</div>
-		
+
 		<div class="field">
 			<label class="label"><?php _e('File Encoding', 'tainacan'); ?></label>
 			<span class="help-wrapper">
@@ -323,7 +324,7 @@ class CSV extends Importer {
 						<div class="help-tooltip-body">
 							<p><?php _e('The encoding of the CSV file.', 'tainacan'); ?></p>
 						</div>
-					</div> 
+					</div>
 			</span>
 			<div class="control is-clearfix">
 				<div class="select">
@@ -350,7 +351,7 @@ class CSV extends Importer {
 						<div class="help-tooltip-body">
 							<p><?php _e('Choose the action when a repeated item is found', 'tainacan'); ?></p>
 						</div>
-					</div> 
+					</div>
 			</span>
 			<div class="control is-clearfix">
 				<div class="select">
@@ -361,7 +362,7 @@ class CSV extends Importer {
 				</div>
 			</div>
 		</div>
-		
+
 		<div class="field">
 			<label class="label"><?php _e('Importing attachments', 'tainacan'); ?></label>
 			<p>
@@ -386,16 +387,16 @@ class CSV extends Importer {
 						<div class="help-tooltip-body">
 							<p><?php _e("When using CSV special field to add documents or attachments that you've uploaded to the server, inform the full path to the folder here (e.g. /home/user/files/)", 'tainacan'); ?></p>
 						</div>
-					</div> 
+					</div>
 			</span>
 			<div class="control is-clearfix">
 				<input class="input" type="text" name="server_path" value="<?php echo $this->get_option('server_path'); ?>">
 			</div>
 		</div>
-	   
-	   <?php 
-	   
-	   
+
+	   <?php
+
+
 	   return ob_get_clean();
 
     }
@@ -433,7 +434,7 @@ class CSV extends Importer {
             $correct_value = trim(substr($column_value, 5));
             $item_inserted->set_document( $correct_value );
             $item_inserted->set_document_type( 'text' );
-            
+
             if( $item_inserted->validate() ) {
                 $item_inserted = $this->items_repo->update($item_inserted);
             }
@@ -523,7 +524,7 @@ class CSV extends Importer {
     private function handle_enclosure( &$file ) {
 
         $line = trim(fgets($file));
-        $start = substr($line, 0, strlen($this->get_option('enclosure'))); 
+        $start = substr($line, 0, strlen($this->get_option('enclosure')));
 
         if( $this->get_option('enclosure') === $start ) {
             $cut_start = strlen($this->get_option('enclosure'));
@@ -586,7 +587,7 @@ class CSV extends Importer {
      * @param array $processed_item Associative array with metadatum source's as index with
      *                              its value or values
      * @param integet $collection_index The index in the $this->collections array of the collection the item is beeing inserted into
-     * 
+     *
      * @return Tainacan\Entities\Item Item inserted
      */
     public function insert( $processed_item, $collection_index ) {
@@ -607,31 +608,32 @@ class CSV extends Importer {
         // $Tainacan_Items->disable_logs();
         // $Tainacan_Metadata->disable_logs();
         // $Tainacan_Item_Metadata->disable_logs();
-		
+
 		$itemMetadataArray = [];
-		
+
 		$updating_item = false;
-		
+
 		if ( is_numeric($this->get_transient('item_id')) ) {
 			$item = $Tainacan_Items->fetch( (int) $this->get_transient('item_id') );
 		} else {
 			$item = new Entities\Item();
 		}
-		
+
 		if( is_numeric($this->get_transient('item_id')) ) {
-			if ( $item->get_id() == $this->get_transient('item_id') ) {
+			if ( $item instanceof Entities\Item && $item->get_id() == $this->get_transient('item_id') ) {
 				$this->add_log('item will be updated ID:' . $item->get_id() );
 				$updating_item = true;
 				// When creating a new item, disable log for each metadata to speed things up
 				$Tainacan_Item_Metadata->disable_logs();
 			} else {
-				$this->add_log('item with ID ' . $item->get_id() . ' not found. Unable to update. Creating a new one.' );
+				$this->add_log('item with ID ' . $this->get_transient('item_id') . ' not found. Unable to update. Creating a new one.' );
+				$item = new Entities\Item();
 			}
-			
+
 		}
 
-        if( $this->get_transient('item_id') && $item && is_numeric($item->get_id()) && $item->get_id() > 0 && $this->get_transient('item_action') == 'ignore' ){
-            $this->add_log('Repeated Item');
+        if( $this->get_transient('item_id') && $item instanceof Entities\Item && is_numeric($item->get_id()) && $item->get_id() > 0 && $this->get_transient('item_action') == 'ignore' ){
+            $this->add_log('Ignoring repeated Item');
             return $item;
         }
 
@@ -711,7 +713,7 @@ class CSV extends Importer {
 			if ( ! $updating_item ) {
 				$insertedItem->set_status('publish' );
 			}
-			
+
             if($insertedItem->validate()) {
                 $insertedItem = $Tainacan_Items->update( $insertedItem );
                 $this->after_inserted_item(  $insertedItem, $collection_index );
@@ -743,7 +745,7 @@ class CSV extends Importer {
     /**
      * @param $metadatum the metadata
      * @param $values the categories names
-     * 
+     *
      * @return array empty with no category or array with IDs
      */
     private function insert_hierarchy( $metadatum, $values ){
@@ -751,16 +753,16 @@ class CSV extends Importer {
 		if (empty($values)) {
 			return false;
 		}
-		
+
 		$Tainacan_Terms = \Tainacan\Repositories\Terms::get_instance();
         $taxonomy = new Entities\Taxonomy( $metadatum->get_metadata_type_options()['taxonomy_id']);
-		
+
         if ( strpos($values, '>>') === false ) {
             return $values;
         }
-        
+
         $exploded_values = explode(">>",$values);
-		
+
 		if (empty($exploded_values)) {
 			return false;
 		}
@@ -790,7 +792,7 @@ class CSV extends Importer {
                         $this->add_error_log( implode(',', $term->get_errors()) );
                         return false;
                     }
-                    
+
                 }
             }
             return $parent !== 0 ? (int)$parent : false;
diff --git a/src/importer/class-tainacan-importer.php b/src/importer/class-tainacan-importer.php
index ebc8157d5..f3bf88e47 100644
--- a/src/importer/class-tainacan-importer.php
+++ b/src/importer/class-tainacan-importer.php
@@ -10,29 +10,29 @@ abstract class Importer {
      *
      * When creating a new importer session via API, an id is returned and used to access this
      * importer instance. This is temporarily stored in the database and discarded after the bg process is triggered
-     * 
+     *
      * @var identifier
      */
 	private $id;
-    
+
 	/**
 	 * The path to the temporary file created when user uploads a file
 	 * @var string
 	 */
 	protected $tmp_file;
-	
-    
+
+
 	/**
 	 * This array holds the structure that the default step 'process_collections' will handle.
 	 *
-	 * Its an array of the target collections, with their IDs, an identifier from the source, the total number of items to be imported, the mapping array 
+	 * Its an array of the target collections, with their IDs, an identifier from the source, the total number of items to be imported, the mapping array
 	 * from the source structure to the ID of the metadata metadata in tainacan
 	 *
-	 * The format of the map is an array where the keys are the metadata IDs of the destination collection and the 
+	 * The format of the map is an array where the keys are the metadata IDs of the destination collection and the
 	 * values are the identifier from the source. This could be an ID or a string or whatever the importer finds appropriate to handle
 	 *
 	 * The source_id can be anyhting you like, that helps you relate this collection to your source.
-	 * 
+	 *
 	 * Example of the structure of this propery for one collection:
 	 * 0 => [
 	 * 	'id' => 12,
@@ -46,38 +46,38 @@ abstract class Importer {
 	 *
 	 * use add_collection() and remove_collection() to interact with thiis array.
 	 *
-	 * 
+	 *
 	 * @var array
 	 */
 	protected $collections = [];
-    
+
 	/**
 	 * Stores the options for the importer. Each importer might use this property to save
 	 * their own specific option
 	 * @var array
 	 */
 	private $options = [];
-	
+
 	/**
 	 * Stores the default options for the importer options
 	 * @var array
 	 */
 	protected $default_options = [];
-	
+
 	private $accepts = [
 		'file' => true,
 		'url'  => false,
 	];
-	
+
 	/**
 	 * Declares what are the steps the importer will run, in the right order.
 	 *
-	 * By default, there is only one step, and the callback is the process_collections method 
+	 * By default, there is only one step, and the callback is the process_collections method
 	 * that process items for the collections in the collections array.
 	 *
-	 * Child classes may declare as many steps as they want and can keep this default step to use 
+	 * Child classes may declare as many steps as they want and can keep this default step to use
 	 * this method for import the items. But it is optional.
-	 * 
+	 *
 	 * @var array
 	 */
 	protected $steps = [
@@ -87,41 +87,41 @@ abstract class Importer {
 			'callback' => 'process_collections'
 		]
 	];
-	
+
 	/**
 	 * Transients is used to store temporary data to be used accross multiple requests
 	 *
 	 * Add and remove transient data using add_transient() and delete_transient() methods
 	 *
 	 * Transitens can be strings, numbers or arrays. Avoid storing objects.
-	 * 
+	 *
 	 * @var array
 	 */
 	private $transients = [];
 
 	private $current_step = 0;
-	
+
 	private $in_step_count = 0;
-	
+
 	private $current_collection = 0;
-	
+
 	private $current_collection_item = 0;
 
 	private $url = '';
-	
+
 	private $log = [];
-	
+
 	private $error_log = [];
-	
+
 	/**
 	 * Wether to abort importer execution.
 	 * @var bool
 	 */
 	private $abort = false;
-	
+
 	/**
-	 * List of attributes that are saved in DB and that are used to 
-	 * reconstruct the object 
+	 * List of attributes that are saved in DB and that are used to
+	 * reconstruct the object
 	 * @var array
 	 */
 	private $array_attributes = [
@@ -153,10 +153,10 @@ abstract class Importer {
 				}
 			}
 		}
-		
-		
+
+
 	}
-	
+
 	public function _to_Array($short = false) {
 		$return = ['id' => $this->get_id()];
 		foreach ($this->array_attributes as $attr) {
@@ -177,10 +177,10 @@ abstract class Importer {
 
 		return $return;
 	}
-	
+
 	/////////////////////
 	// Getters and setters
-	
+
     /**
      * @return string
      */
@@ -220,51 +220,51 @@ abstract class Importer {
 	public function get_current_step() {
 		return $this->current_step;
 	}
-	
+
 	public function set_current_step($value) {
 		$this->current_step = $value;
 	}
-	
+
 	public function get_in_step_count() {
 		return $this->in_step_count;
 	}
-	
+
 	public function set_in_step_count($value) {
 		$this->in_step_count = $value;
 	}
-	
+
 	public function get_current_collection() {
 		return $this->current_collection;
 	}
-	
+
 	public function set_current_collection($value) {
 		$this->current_collection = $value;
 	}
-	
+
 	public function get_current_collection_item() {
 		return $this->current_collection_item;
 	}
-	
+
 	public function set_current_collection_item($value) {
 		$this->current_collection_item = $value;
 	}
-	
+
 	public function get_tmp_file(){
         return $this->tmp_file;
     }
-	
+
 	public function set_tmp_file($filepath){
         $this->tmp_file = $filepath;
     }
-	
+
 	public function get_collections() {
 		return $this->collections;
 	}
-	
+
 	public function set_collections($value) {
 		$this->collections = $value;
 	}
-	
+
 	/**
      * Gets the options for this importer, including default values for options
      * that were not set yet.
@@ -273,55 +273,55 @@ abstract class Importer {
     public function get_options() {
         return array_merge($this->default_options, $this->options);
     }
-	
+
 	/**
 	 * Set the options array
-	 * @param array $options 
+	 * @param array $options
 	 */
 	public function set_options($options) {
 		$this->options = $options;
 	}
-	
+
 	/**
 	 * Set the default options values.
 	 *
 	 * Must be called from the __construct method of the child importer class to set default values.
-	 * 
-	 * @param array $options 
+	 *
+	 * @param array $options
 	 */
 	protected function set_default_options($options) {
 		$this->default_options = $options;
 	}
-	
-	
+
+
     public function set_steps($steps) {
         $this->steps = $steps;
     }
-	
+
 	public function get_steps() {
         return $this->steps;
     }
-	
-	
+
+
 	private function get_transients() {
 		return $this->transients;
 	}
-	
+
 	private function set_transients(array $data) {
 		$this->transients = $data;
 	}
-	
+
 	public function get_log() {
 		return $this->log;
 	}
-	
+
 	public function get_error_log() {
 		return $this->error_log;
 	}
-	
+
 	////////////////////////////////////
 	// Utilities
-	
+
 
     /**
      * @param $file File to be managed by importer
@@ -336,8 +336,8 @@ abstract class Importer {
             return false;
         }
     }
-	
-	
+
+
     /**
      * log the actions from importer
      *
@@ -350,14 +350,14 @@ abstract class Importer {
 	public function add_error_log($message ){
         $this->error_log[] = $message;
     }
-	
+
 	public function add_collection(array $collection) {
 		if (isset($collection['id'])) {
 			$this->remove_collection($collection['id']);
 			$this->collections[] = $collection;
 		}
 	}
-	
+
 	public function remove_collection($col_id) {
 		foreach ($this->get_collections() as $index => $col) {
 			if ($col['id'] == $col_id) {
@@ -378,7 +378,7 @@ abstract class Importer {
         //$file_array['name'] = $name;
         //$file_array['tmp_name'] = $path_file;
         //$file_array['size'] = filesize( $path_file );
-		
+
 		if ( !function_exists('media_handle_upload') ) {
 			require_once(ABSPATH . "wp-admin" . '/includes/image.php');
 			require_once(ABSPATH . "wp-admin" . '/includes/file.php');
@@ -403,12 +403,12 @@ abstract class Importer {
             return $this->add_file( $this->get_id().'.txt' );
         }
     }
-    
+
     /**
      * Gets one option from the options array.
      *
      * Checks if option exist or if it have a default value. Otherwise return an empty string
-     * 
+     *
      * @param  string $key the desired option
      * @return mixed the option value, the default value or an empty string
      */
@@ -416,12 +416,12 @@ abstract class Importer {
         $options = $this->get_options();
         return isset($options[$key]) ? $options[$key] : '';
     }
-	
+
 	/**
 	 * Adds a new method accepeted by the importer
 	 *
 	 * Current possible methods are file and url
-	 * 
+	 *
 	 * @param string $method file or url
 	 * @return bool true for success, false if method does not exist
 	 */
@@ -437,7 +437,7 @@ abstract class Importer {
 	 * Removes method accepeted by the importer
 	 *
 	 * Current possible methods are file and url
-	 * 
+	 *
 	 * @param string $method file or url
 	 * @return bool true for success, false if method does not exist
 	 */
@@ -448,16 +448,16 @@ abstract class Importer {
 		}
 		return false;
 	}
-	
+
 	public function add_transient($key, $data) {
 		$this->transients[$key] = $data;
 	}
-	
+
 	public function delete_transient($key) {
 		if (isset($this->transients[$key]))
 			unset($this->transients[$key]);
 	}
-	
+
 	public function get_transient($key) {
 		if (isset($this->transients[$key]))
 			return $this->transients[$key];
@@ -473,7 +473,7 @@ abstract class Importer {
 
         return false;
     }
-	
+
 	/**
 	 * Cancel Scheduled abortion at the end of run()
 	 * @return void
@@ -481,7 +481,7 @@ abstract class Importer {
 	protected function cancel_abort() {
 		$this->abort = false;
 	}
-	
+
 	/**
 	 * Schedule importer abortion at the end of run()
 	 * @return void
@@ -489,10 +489,10 @@ abstract class Importer {
 	protected function abort() {
 		$this->abort = true;
 	}
-	
+
 	/**
 	 * Return wether importer should abort execution or not
-	 * @return bool 
+	 * @return bool
 	 */
 	public function get_abort() {
 		return $this->abort;
@@ -501,11 +501,11 @@ abstract class Importer {
 	/**
 	 * Gets the current label to be displayed below the progress bar to give
 	 * feedback to the user.
-	 * 
+	 *
 	 * It automatically gets the attribute progress_label from the current step running.
-	 * 
+	 *
 	 * Importers may change this label whenever they want
-	 * 
+	 *
 	 * @return string
 	 */
 	public function get_progress_label() {
@@ -537,17 +537,17 @@ abstract class Importer {
 	/**
 	 * Gets the current value to build the progress bar and give feedback to the user
 	 * on the background process that is running the importer.
-	 * 
+	 *
 	 * It does so by comparing the "size" attribute with the $in_step_count class attribute
-	 * where size indicates the total size of iterations the step will take and $this->in_step_count 
+	 * where size indicates the total size of iterations the step will take and $this->in_step_count
 	 * is the current iteration.
-	 * 
+	 *
 	 * For the step with "process_items" as a callback, this method will look for the the $this->collections array
-	 * and sum the value of all "total_items" attributes of each collection. Then it will look for 
+	 * and sum the value of all "total_items" attributes of each collection. Then it will look for
 	 * $this->get_current_collection and $this->set_current_collection_item to calculate the progress.
-	 * 
+	 *
 	 * The value must be from 0 to 100
-	 * 
+	 *
 	 * If a negative value is passed, it is assumed that the progress is unknown
 	 */
 	public function get_progress_value() {
@@ -595,12 +595,12 @@ abstract class Importer {
 
 	/**
 	 * Sets the total attribute for the current step
-	 * 
+	 *
 	 * The "total" attribute of a step indicates the number of iterations this step will take to complete.
-	 * 
+	 *
 	 * The iteration is counted using $this->in_step_count attribute, and comparing the two values gives us
 	 * the current progress of the process.
-	 * 
+	 *
 	 */
 	protected function set_current_step_total($value) {
 		$this->set_step_total($this->get_current_step(), $value);
@@ -608,12 +608,12 @@ abstract class Importer {
 
 	/**
 	 * Sets the total attribute for a given step
-	 * 
+	 *
 	 * The "total" attribute of a step indicates the number of iterations this step will take to complete.
-	 * 
+	 *
 	 * The iteration is counted using $this->in_step_count attribute, and comparing the two values gives us
 	 * the current progress of the process.
-	 * 
+	 *
 	 */
 	protected function set_step_total($step, $value) {
 		$steps = $this->get_steps();
@@ -626,7 +626,7 @@ abstract class Importer {
 
 	///////////////////////////////
 	// Abstract methods
-	
+
 
     /**
      * get the metadata of file/url to allow mapping
@@ -637,7 +637,7 @@ abstract class Importer {
      * @return array $metadata_source the metadata from the source
      */
     public function get_source_metadata() {}
-		
+
     /**
      * get values for a single item
      *
@@ -649,13 +649,13 @@ abstract class Importer {
      */
     abstract public function process_item( $index, $collection_id );
 
-    
-	
+
+
 	/**
 	 * Method implemented by the child importer class to return the total number of items that will be imported
 	 *
 	 * Used to build the progress bar
-	 * 
+	 *
 	 * @return int
 	 */
 	public function get_source_number_of_items() {}
@@ -665,37 +665,37 @@ abstract class Importer {
 	 * Method implemented by child importer to return the HTML of the Options Form to be rendered in the Importer page
 	 */
 	public function options_form() {}
-	
+
 	/**
-	* Called when the process is finished. returns the final message to the user with a 
+	* Called when the process is finished. returns the final message to the user with a
 	* short description of what happened. May contain HTML code and links
 	*
-	* @return string 
+	* @return string
 	*/
 	public function get_output() {
 		return '';
 	}
-	
+
 	////////////////////////////////////////
 	// Core methods
-	
+
     /**
      * process an item from the collections queue
      *
      */
     public function process_collections() {
-        
+
 		$current_collection = $this->get_current_collection();
 		$collections = $this->get_collections();
 		$collection_definition = isset($collections[$current_collection]) ? $collections[$current_collection] : false;
 		$current_collection_item = $this->get_current_collection_item();
-		
+
 		$this->add_log('Processing item ' . $current_collection_item);
 		$processed_item = $this->process_item( $current_collection_item, $collection_definition );
 		if( $processed_item ) {
 
 			if( is_bool($processed_item) ){
-				return $this->next_item();	
+				return $this->next_item();
 			}
 
 			$this->add_log('Inserting item ' . $current_collection_item);
@@ -703,66 +703,66 @@ abstract class Importer {
 		} else {
 			$this->add_error_log('failed on item '. $current_collection_item );
 		}
-		
+
 		return $this->next_item();
     }
-	
+
 	protected function next_item() {
-		
+
 		$current_collection = $this->get_current_collection();
 		$current_collection_item = $this->get_current_collection_item();
 		$collections = $this->get_collections();
 		$collection = $collections[$current_collection];
-		
+
 		$current_collection_item ++;
 		$this->set_current_collection_item($current_collection_item);
 
 		if( $this->get_transient('change_total') ){
             $collection['total_items'] = $this->get_transient('change_total');
         }
-		
+
 		if ($current_collection_item >= $collection['total_items']) {
 			return $this->next_collection();
 		}
-		
+
 		return $current_collection_item;
-		
+
 	}
-	
+
 	protected function next_collection() {
-		
+
 		$current_collection = $this->get_current_collection();
 		$collections = $this->get_collections();
-		
+
 		$this->set_current_collection_item(0);
-		
+
 		$current_collection ++;
-		
+
 		if (isset($collections[$current_collection])) {
 			$this->set_current_collection($current_collection);
 			return $current_collection;
-		}	
-		
+		}
+
 		return false;
-		
-		
+
+
 	}
-	
+
 	protected function next_step() {
-		
+
 		$current_step = $this->get_current_step();
 		$steps = $this->get_steps();
-		
+
 		$current_step ++;
 		$this->set_current_step($current_step);
-		
+
 		if (isset($steps[$current_step])) {
 			return $current_step;
-		}	
-		
+		}
+
 		return false;
-		
-		
+
+
 	}
 
     /**
@@ -771,11 +771,11 @@ abstract class Importer {
      * @param array $processed_item Associative array with metadatum source's as index with
      *                              its value or values
      * @param integet $collection_index The index in the $this->collections array of the collection the item is beeing inserted into
-     * 
+     *
      * @return Tainacan\Entities\Item Item inserted
      */
     public function insert( $processed_item, $collection_index ) {
-		
+
 		remove_action( 'post_updated', 'wp_save_post_revision' );
 		$collections = $this->get_collections();
 		$collection_definition = isset($collections[$collection_index]) ? $collections[$collection_index] : false;
@@ -783,20 +783,20 @@ abstract class Importer {
 			$this->add_error_log('Collection misconfigured');
             return false;
 		}
-		
+
 		$collection = \Tainacan\Repositories\Collections::get_instance()->fetch($collection_definition['id']);
-		
+
 		$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
         $Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
 		$Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
-		
+
 		$Tainacan_Items->disable_logs();
 		$Tainacan_Metadata->disable_logs();
 		$Tainacan_Item_Metadata->disable_logs();
 
         $item = new Entities\Item( ( $this->get_transient('item_id') ) ? $this->get_transient('item_id') : 0 );
 		$itemMetadataArray = [];
-		
+
         if( is_array( $processed_item ) ){
             foreach ( $processed_item as $metadatum_source => $values ){
                 $tainacan_metadatum_id = array_search( $metadatum_source, $collection_definition['mapping'] );
@@ -812,7 +812,7 @@ abstract class Importer {
 
             }
         }
-		
+
         if( !empty( $itemMetadataArray ) && $collection instanceof Entities\Collection ){
 			$item->set_collection( $collection );
 
@@ -823,7 +823,7 @@ abstract class Importer {
                 $this->add_error_log( $item->get_errors() );
                 return false;
             }
-			
+
             foreach ( $itemMetadataArray as $itemMetadata ) {
                 $itemMetadata->set_item( $insertedItem );  // *I told you
 
@@ -843,33 +843,33 @@ abstract class Importer {
                 //    $this->add_error_log( 'Item ' . $insertedItem->get_id() . ' has an error' );
                 //}
 			}
-			
+
 			$insertedItem->set_status('publish' );
-			
+
             if($insertedItem->validate()) {
 				$insertedItem = $Tainacan_Items->update( $insertedItem );
 
 				$this->after_inserted_item(  $insertedItem, $collection_index );
             } else {
-	            $this->add_error_log( 'Error publishing Item'  ); 
-	            $this->add_error_log( $insertedItem->get_errors() ); 
+	            $this->add_error_log( 'Error publishing Item'  );
+	            $this->add_error_log( $insertedItem->get_errors() );
 	            return false;
 			}
-			
+
             return $insertedItem;
-			
+
         } else {
             $this->add_error_log(  'Collection not set');
             return false;
         }
 
 	}
-	
+
 	/**
 	 * allow importers executes process after item is insertes
 	 * @param array $insertedItem Associative array with inserted item
      * @param integer $collection_index The index in the $this->collections array of the collection the item is beeing inserted into
-	 * 
+	 *
 	 */
 	public function after_inserted_item($insertedItem, $collection_index){}
 
@@ -881,13 +881,15 @@ abstract class Importer {
 		if ($this->is_finished()) {
 			return false;
 		}
-        
+
 		$steps = $this->get_steps();
 		$current_step = $this->get_current_step();
 		$method_name = $steps[$current_step]['callback'];
 
 		if (method_exists($this, $method_name)) {
 			$author = $this->get_transient('author');
+			$this->add_log('---------------------------');
+			$this->add_log('Starting processing new item');
 			$this->add_log('User in process: ' . $author);
 			wp_set_current_user($author);
 			$result = $this->$method_name();
@@ -903,10 +905,10 @@ abstract class Importer {
 			$this->set_in_step_count($result);
 			$return = $result;
 		}
-		
+
 		return $return;
-		
-		
+
+
     }
 
     /**
@@ -929,16 +931,16 @@ abstract class Importer {
 
         $name = $properties[0];
         $type = $properties[1];
-		
+
 		$supported_types = \Tainacan\Repositories\Metadata::get_instance()->fetch_metadata_types('NAME');
 		$supported_types = array_map('strtolower', $supported_types);
-		
+
 		if ( ! \in_array($type, $supported_types) ) {
 			// translators: Warning on import logs. Invalid metadata type passed, using text type as fallback. 1 is the invalid type; 2 the name of the metadata. Ex: Unknown Metadata type "Hexadecimal" for Color. Considering text type.
 			$this->add_log( sprintf(__('Unknown Metadata type "%1$s" for %2$s. Considering text type.', 'tainacan'), $type, $name) );
 			$type = 'text';
 		}
-		
+
         $newMetadatum = new Entities\Metadatum();
         $newMetadatum->set_name($name);
 
@@ -1005,4 +1007,4 @@ abstract class Importer {
             return false;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/importer/class-tainacan-test-importer.php b/src/importer/class-tainacan-test-importer.php
index 01448a7e7..50e1e50e1 100644
--- a/src/importer/class-tainacan-test-importer.php
+++ b/src/importer/class-tainacan-test-importer.php
@@ -510,7 +510,7 @@ class Test_Importer extends Importer {
 				'options' => [
 				'collection_id' => $col2->get_id(),
 				'repeated' => 'yes',
-				'search' => [ $col2_core_title->get_id() ]
+				'search' => $col2_core_title->get_id()
 				]
 			], $col1 );
 
diff --git a/src/js/event-bus-web-components.js b/src/js/event-bus-web-components.js
index 9306a7cb9..c96a85589 100644
--- a/src/js/event-bus-web-components.js
+++ b/src/js/event-bus-web-components.js
@@ -15,52 +15,46 @@ export const eventBus = new Vue({
         }
     },
     methods : {
-        updateValue(data){
+        updateValue({ itemId, metadatumId, values}){
             
             this.$emit('isUpdatingValue', true);
 
-            if ( data.item_id ){
+            if (itemId) {
 
-                if(data.values.length > 0 && data.values[0].value){
-                    let val = [];
-                    for(let i of data.values){
-                        val.push(i.value);
-                    }
+                if (values.length > 0 && values[0].value) {
+                    let onlyValues = values.map((aValueObject) => aValueObject.value);
+                    values = onlyValues;
+                }
 
-                    data.values = val;
-                }  
-
-                let values = ( Array.isArray( data.values[0] ) ) ? data.values[0] : data.values ;
-                const promisse = this.$store.dispatch('item/updateMetadata',
-                    { item_id: data.item_id, metadatum_id: data.metadatum_id, values: values });
-
-                promisse.then( () => {
-                    this.$emit('isUpdatingValue', false);
-                    let index = this.errors.findIndex( errorItem => errorItem.metadatum_id == data.metadatum_id );
-                    if ( index >= 0){
-                        this.errors.splice( index, 1);
-                    }
+                this.$store.dispatch('item/updateMetadata', { 
+                    item_id: itemId, 
+                    metadatum_id: metadatumId, 
+                    values: Array.isArray(values[0]) ? values[0] : values
                 })
-                .catch((error) => {
-                    this.$emit('isUpdatingValue', false);
-                    let index = this.errors.findIndex( errorItem => errorItem.metadatum_id == data.metadatum_id );
-                    let messages = [];
+                    .then(() => {
+                        this.$emit('isUpdatingValue', false);
+                        let index = this.errors.findIndex( errorItem => errorItem.metadatum_id == metadatumId );
+                        if (index >= 0)
+                            this.errors.splice( index, 1);
+                    })
+                    .catch((error) => {
+                        this.$emit('isUpdatingValue', false);
+                        let index = this.errors.findIndex( errorItem => errorItem.metadatum_id == metadatumId );
+                        let messages = [];
 
-                    for (let index in error) {
-                        messages.push(error[index]);
-                    }
+                        for (let index in error)
+                            messages.push(error[index]);
 
-                    if ( index >= 0){
-                        Vue.set( this.errors, index, { metadatum_id: data.metadatum_id, errors: messages });
-                    } else {
-                        this.errors.push( { metadatum_id: data.metadatum_id, errors: messages } );
-                    }
+                        if ( index >= 0)
+                            Vue.set( this.errors, index, { metadatum_id: metadatumId, errors: messages });
+                        else
+                            this.errors.push( { metadatum_id: metadatumId, errors: messages } );
                 });
             }
         },
         getErrors(metadatum_id) {
-            let error = this.errors.find( errorItem => errorItem.metadatum_id == metadatum_id );
-            return ( error ) ? error.errors : false
+            let error = this.errors.find(errorItem => errorItem.metadatum_id == metadatum_id);
+            return error ? error.errors : false
         },
         clearAllErrors() {
            this.errors = [];
diff --git a/src/js/store/modules/activity/actions.js b/src/js/store/modules/activity/actions.js
index 935587948..e01738345 100644
--- a/src/js/store/modules/activity/actions.js
+++ b/src/js/store/modules/activity/actions.js
@@ -1,7 +1,7 @@
 import axios from '../../../axios/axios';
 import qs from 'qs';
 
-export const fetchActivities = ({ commit }, { page, activitiesPerPage, search, searchDates} ) => {
+export const fetchActivities = ({ commit }, { page, activitiesPerPage, search, searchDates, authorId} ) => {
 
     let endpoint = `/logs?paged=${page}&perpage=${activitiesPerPage}&context=edit&orderby=id&order=desc`;
 
@@ -21,6 +21,9 @@ export const fetchActivities = ({ commit }, { page, activitiesPerPage, search, s
         endpoint += '&' + qs.stringify(dateQuery);
     }
 
+    if (authorId != undefined && authorId != null)
+        endpoint += '&authorid=' + authorId;
+
     return new Promise((resolve, reject) => {
         axios.tainacan.get(endpoint)
             .then(res => {
@@ -37,7 +40,7 @@ export const fetchActivities = ({ commit }, { page, activitiesPerPage, search, s
     });
 };
 
-export const fetchCollectionActivities = ({ commit }, { page, activitiesPerPage, collectionId, search, searchDates }) => {
+export const fetchCollectionActivities = ({ commit }, { page, activitiesPerPage, collectionId, search, searchDates, authorId }) => {
 
     let endpoint = `/collection/${collectionId}/logs?paged=${page}&perpage=${activitiesPerPage}&context=edit&orderby=id&order=desc`;
 
@@ -57,6 +60,9 @@ export const fetchCollectionActivities = ({ commit }, { page, activitiesPerPage,
         endpoint += '&' + qs.stringify(dateQuery);
     }
 
+    if (authorId != undefined && authorId != null)
+        endpoint += '&authorid=' + authorId;
+
     return new Promise((resolve, reject) => {
         axios.tainacan.get(endpoint)
             .then(res => {
@@ -73,13 +79,16 @@ export const fetchCollectionActivities = ({ commit }, { page, activitiesPerPage,
     });
 };
 
-export const fetchItemActivities = ({ commit }, { page, activitiesPerPage, itemId, search, searchDates }) => {
+export const fetchItemActivities = ({ commit }, { page, activitiesPerPage, itemId, search, searchDates, authorId }) => {
 
     let endpoint = `/item/${itemId}/logs?paged=${page}&perpage=${activitiesPerPage}&context=edit&orderby=id&order=desc`;
 
     if (search != undefined && search != '')
         endpoint += `&search=${search}`;
 
+    if (authorId != undefined && authorId != null)
+        endpoint += '&authorid=' + authorId;
+
     if (searchDates && searchDates[0] != null && searchDates[1] != null) {
         let dateQuery = {
             datequery: [
@@ -154,4 +163,17 @@ export const approve = ({commit}, activityId) => {
 
 export const notApprove = ({commit}, activityId) => {
 
+};
+
+// Users for filtering
+export const fetchUsers = ({ commit }, { search }) => {
+    return new Promise((resolve, reject) => {
+        axios.wp.get('/users?search=' + search)
+        .then(res => {
+            resolve(res.data);
+        })
+        .catch(error => {
+            reject(error);
+        });
+    });
 };
\ No newline at end of file
diff --git a/src/js/store/modules/taxonomy/actions.js b/src/js/store/modules/taxonomy/actions.js
index a8e886552..685a45e1d 100644
--- a/src/js/store/modules/taxonomy/actions.js
+++ b/src/js/store/modules/taxonomy/actions.js
@@ -296,7 +296,7 @@ export const clearTerms = ({ commit }) => {
 // Used only on Term Edition form, for autocomplete searhc for parents
 export const fetchPossibleParentTerms = ({ commit }, { taxonomyId, termId, search } ) => {
     return new Promise((resolve, reject) => {
-        axios.tainacan.get('/taxonomy/' + taxonomyId + '/terms?searchterm=' + search + '&hierarchical=1&exclude_tree=' + termId + "&hideempty=0&offset=0&number=20")
+        axios.tainacan.get('/taxonomy/' + taxonomyId + '/terms?searchterm=' + search + '&hierarchical=1&exclude_tree=' + termId + "&hideempty=0&offset=0&number=20&order=asc")
         .then(res => {
             let parentTerms = res.data;
             resolve( parentTerms );
diff --git a/src/migrations.php b/src/migrations.php
index 9d5e16789..b1c58aa80 100644
--- a/src/migrations.php
+++ b/src/migrations.php
@@ -1,38 +1,38 @@
-<?php 
+<?php
 namespace Tainacan;
 
 
 
 class Migrations {
-	
-	
+
+
 	static function run_migrations() {
-		
+
 		$migrations = get_class_methods('Tainacan\Migrations');
-		
+
 		foreach ($migrations as $migration) {
 			$option_name = '_migration_' . $migration;
 			if ('run_migrations' == $migration || get_option($option_name)) {
 				continue;
 			}
-			
+
 			update_option($option_name, 1);
-			
+
 			call_user_func(array('Tainacan\Migrations', $migration));
-			
+
 		}
-		
+
 	}
-	
-	
+
+
 	// Migrations methods below
-	
+
 	static function tainacan_create_bd_process_db() {
 		global $wpdb;
 		$table_name = $wpdb->prefix . 'tnc_bg_process';
 		$charset_collate = $wpdb->get_charset_collate();
 		$max_index_length = 191;
-		
+
 		$query = "CREATE TABLE IF NOT EXISTS $table_name (
 		  ID bigint(20) unsigned NOT NULL auto_increment,
 		  user_id bigint(20) unsigned NOT NULL default '0',
@@ -51,20 +51,20 @@ class Migrations {
 		  KEY user_id (user_id),
 		  KEY action (action($max_index_length))
 		) $charset_collate;\n";
-		
+
 		$wpdb->query($query);
 
 	}
-	
+
 	/**
 	 * We had some cases of tainacan upgrades from very old versions that missed some migrations...
 	 * This migration make sure the table strucure is updated since the very first version
 	 */
 	static function assure_bg_process_database() {
 		global $wpdb;
-		
+
 		$table_name = $wpdb->prefix . 'tnc_bg_process';
-		
+
 		$column_exists = $wpdb->get_results(  "SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = '{$wpdb->prefix}tnc_bg_process' AND column_name = 'progress_label'"  );
 
 	    if(empty($column_exists)) {
@@ -83,8 +83,8 @@ class Migrations {
 	        ADD name text NOT NULL
 	        ");
 		}
-		
-		
+
+
 		$column_exists = $wpdb->get_results(  "SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = '{$wpdb->prefix}tnc_bg_process' AND column_name = 'output'"  );
 
 	    if(empty($column_exists)) {
@@ -93,7 +93,7 @@ class Migrations {
 	        ADD output longtext
 	        ");
 		}
-		
+
 		$column_exists = $wpdb->get_results(  "SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = '{$wpdb->prefix}tnc_bg_process' AND column_name = 'status'"  );
 
         if(empty($column_exists)) {
@@ -102,14 +102,14 @@ class Migrations {
 	        ADD status ENUM('waiting','running','paused','cancelled','errored','finished','finished-errors')
 	        ");
         }
-		
+
 	}
 
 	static function init_capabilites() {
 		$Tainacan_Capabilities = \Tainacan\Capabilities::get_instance();
 		$Tainacan_Capabilities->init();
 	}
-	
+
 	static function tainacan_migrate_post_type_field_to_metadatum(){
 		global $wpdb;
 
@@ -117,7 +117,7 @@ class Migrations {
 	        ['post_type' => 'tainacan-metadatum'],
 	        ['post_type' => 'tainacan-field'],
 	        '%s', '%s');
-	      
+
 	    $wpdb->update($wpdb->postmeta,
 	        ['meta_key' => 'default_displayed_metadata'],
 	        ['meta_key' => 'default_displayed_fields'],
@@ -137,17 +137,17 @@ class Migrations {
 	        ['meta_key' => 'metadata_type'],
 	        ['meta_key' => 'field_type'],
 	        '%s', '%s');
-	    
+
 	    $wpdb->update($wpdb->postmeta,
 	        ['meta_key' => 'metadata_type_options'],
 	        ['meta_key' => 'field_type_options'],
 	        '%s', '%s');
-			
+
 		$wpdb->update($wpdb->postmeta,
 	        ['meta_key' => 'metadata_type'],
 	        ['meta_key' => 'metadatum_type'],
 	        '%s', '%s');
-	    
+
 	    $wpdb->update($wpdb->postmeta,
 	        ['meta_key' => 'metadata_type_options'],
 	        ['meta_key' => 'metadatum_type_options'],
@@ -204,8 +204,8 @@ class Migrations {
 	        ['meta_value' => 'Tainacan\Metadata_Types\Compound'],
 	        ['meta_value' => 'Tainacan\Field_Types\Compound'],
 	        '%s', '%s');
-			
-		
+
+
 		$wpdb->update($wpdb->postmeta,
 		    ['meta_value' => 'Tainacan\Metadata_Types\Core_Description'],
 		    ['meta_value' => 'Tainacan\Metadatum_Types\Core_Description'],
@@ -245,7 +245,7 @@ class Migrations {
 		    ['meta_value' => 'Tainacan\Metadata_Types\Relationship'],
 		    ['meta_value' => 'Tainacan\Metadatum_Types\Relationship'],
 	        '%s', '%s');
-	        
+
 	    $wpdb->update($wpdb->postmeta,
 		    ['meta_value' => 'Tainacan\Metadata_Types\Compound'],
 		    ['meta_value' => 'Tainacan\Metadatum_Types\Compound'],
@@ -255,7 +255,7 @@ class Migrations {
 		    ['meta_value' => 'Tainacan\Metadata_Types\Taxonomy'],
 		    ['meta_value' => 'Tainacan\Metadatum_Types\Category'],
 	        '%s', '%s');
-	        
+
 	    $wpdb->update($wpdb->postmeta,
 		    ['meta_value' => 'Tainacan\Metadata_Types\Taxonomy'],
 		    ['meta_value' => 'Tainacan\Metadata_Types\Category'],
@@ -289,20 +289,20 @@ class Migrations {
 		// update input type
 		$wpdb->query("UPDATE $wpdb->postmeta SET meta_value = REPLACE(meta_value, 'tainacan-taxonomy-selectbox', 'tainacan-taxonomy-radio')");
 	}
-	
+
 	static function update_core_metadata() {
 		global $wpdb;
         $collections = \Tainacan\Repositories\Collections::get_instance()->fetch([], 'OBJECT');
-        
+
         foreach ($collections as $collection) {
 
-            // get title 
+            // get title
             $title_meta = $collection->get_core_title_metadatum();
 
             // delete metadata if exists
             $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->postmeta WHERE meta_key = %s", $title_meta->get_id() ));
             // create metadata
-            $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->postmeta 
+            $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->postmeta
                 (post_id,meta_key,meta_value)
                 SELECT ID, %s, post_title FROM $wpdb->posts WHERE post_type = %s
                 ", $title_meta->get_id(), $collection->get_db_identifier() ));
@@ -314,7 +314,7 @@ class Migrations {
             $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->postmeta WHERE meta_key = %s", $description_meta->get_id() ));
 
             // create metadata
-            $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->postmeta 
+            $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->postmeta
                 (post_id,meta_key,meta_value)
                 SELECT ID, %s, post_content FROM $wpdb->posts WHERE post_type = %s
                 ", $description_meta->get_id(), $collection->get_db_identifier() ));
@@ -324,46 +324,46 @@ class Migrations {
 
 	static function refresh_rewrite_rules() {
 		// needed after we changed the Collections post type rewrite slug
-		
+
 		$option_name = '_migration_refresh_rewrite_rules_items';
 		if (!get_option($option_name)) {
 			return; // avoid running twice cause there is the same update right below this one
 		}
-		
+
 		flush_rewrite_rules(false);
 	}
-	
+
 	static function refresh_rewrite_rules_items() {
 		// needed after we added the /items rewrite rule
 		flush_rewrite_rules(false);
 	}
-	
+
 	static function update_filters_definition() {
 		global $wpdb;
-		
+
 		$wpdb->query("UPDATE $wpdb->postmeta SET meta_key = 'metadatum_id' WHERE
 			meta_key = 'metadatum' AND post_id IN (
 				SELECT ID FROM $wpdb->posts WHERE post_type = 'tainacan-filter'
 			)");
-		
+
 	}
-	
+
 	static function update_repository_filters_meta() {
 		global $wpdb;
-		
+
 		$wpdb->query( "UPDATE $wpdb->postmeta SET meta_value = 'default' WHERE
 			post_id IN (
 				SELECT ID FROM $wpdb->posts WHERE post_type = 'tainacan-filter'
-			) AND meta_key = 'collection_id' AND meta_value = 'filter_in_repository'" 
+			) AND meta_key = 'collection_id' AND meta_value = 'filter_in_repository'"
 		);
 
 	}
 
 	static function update_relationship_metadata_search_option() {
 		global $wpdb;
-		
+
 		$q = "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = 'metadata_type' AND meta_value = 'Tainacan\\\\Metadata_Types\\\\Relationship'";
-		
+
 		$ids = $wpdb->get_col($q);
 
 		foreach ($ids as $id) {
@@ -373,11 +373,64 @@ class Migrations {
 				update_post_meta($id, 'metadata_type_options', $meta);
 			}
 		}
-		
+
 	}
-	
+
+	static function replace_custom_interval_filters() {
+		$tainacan_filters = \Tainacan\Repositories\Filters::get_instance();
+		$filters = $tainacan_filters->fetch([
+			'nopaging' => true,
+			'filter_type' => 'Tainacan\Filter_Types\Custom_Interval',
+			'post_status' => 'any'
+		], 'OBJECT');
+
+		foreach ($filters as $filter) {
+			$meta = $filter->get_metadatum();
+			#echo 'found filter:' . $filter->get_name(). "<br>";
+			if ($meta instanceof \Tainacan\Entities\Metadatum) {
+				$type = $meta->get_metadata_type();
+				#echo 'found meta:' . $meta->get_name(). "<br>";
+				#echo 'found meta:' . $meta->get_metadata_type(). "<br>";
+
+				$newtype = false;
+				if ( $type == 'Tainacan\Metadata_Types\Date' ) {
+					$newtype = 'Tainacan\Filter_Types\Date_Interval';
+				} elseif ( $type == 'Tainacan\Metadata_Types\Numeric' ) {
+					$newtype = 'Tainacan\Filter_Types\Numeric_Interval';
+				}
+
+				#echo 'New type:' . $newtype. "<br>";
+
+				if ($newtype) {
+					$filter->set_filter_type($newtype);
+					if ($filter->validate()) {
+						#echo "INSERT\n\n";
+						$tainacan_filters->insert($filter);
+					}
+
+				}
+
+			}
+
+
+
+
+		}
+
+	}
+
+	static function update_repository_rename_document_index_meta_key() {
+		global $wpdb;
+		$wpdb->query( "UPDATE $wpdb->postmeta SET meta_key = 'document_content_index' WHERE meta_key = '_document_content_index'");
+	}
+
+	static function refresh_rewrite_rules_attachment_pages() {
+		// needed after we added the /tainacan_attachments url
+		flush_rewrite_rules(false);
+	}
+
 }
 
 
 
-?>
\ No newline at end of file
+?>
diff --git a/src/readme.txt b/src/readme.txt
index 5f2284e1c..c9034300a 100644
--- a/src/readme.txt
+++ b/src/readme.txt
@@ -1,94 +1,99 @@
-=== Tainacan ===
-Contributors: andrebenedito, daltonmartins, fabianobn, jacsonp, leogermani, weryques, wetah, eduardohumberto, ravipassos, jessicafpx, marinagiolo, omarceloavila, vnmedeiros
-Tags: museums, libraries, archives, GLAM, collections, repository
-Requires at least: 4.8
-Tested up to: 5.2.3
-Requires PHP: 5.6
-Stable tag: 0.12
-License: GPLv2 or later
-License URI: http://www.gnu.org/licenses/gpl-3.0.html
-
-Tainacan is a powerful and flexible repository platform for WordPress. Manage and publish your digital collections just as easily as you post to your blog, having all the tools of a professional repository platform.
-
-== Description ==
-
-Tainacan is a powerful and flexible repository platform for WordPress. Manage and publish your digital collections just as easily as you post to your blog, having all the tools of a professional repository platform.
-
-= Features =
-
-* "Metadata and Filters": Use a metadata standard or choose whatever set of metadata you want to describe the items in your collections. Also, choose which metadata will be used as a filter when browsing collections.
-
-* "Faceted Search". Browse your collection (and let the public browse it) using a faceted search interface with the filters you have chosen.
-
-* "Manage Taxonomies": Manage vocabularies that can be used accross all your collections.
-
-* "Themes": The Tainacan plugin has its own default theme, which helps you to showcase your collections in a beautiful and effective manner. But it can also work with any WordPress theme, so interface developers can easyly add Tainacan specific features to an existing theme.
-
-* "API and Interoperability": Tainacan implements a RESTful API (read and write) to allow other applications to interact with your repository. That way, you can expose your collection in different formats, such as Json, JsonLD, OAI-PMH and others. If your collection has a specific set of metadata, you can map this metadata to match the patterns you want to use.
-
-* "Gutenberg blocks": Tell stories with your collections. Tainacan offers you several Gutenberg blocks so you can present your collections to the public in many different ways!
-
-== Getting Started ==
-
-After installation, you will see a new menu item in your admin panel called "Tainacan". Click on it to open the Tainacan admin interface.
-
-To get an overview of the main concepts of Tainacan, please visit [this page](https://tainacan.github.io/tainacan-wiki//#/general-concepts).
-
-= Create a collection = 
-
-Click "New Collection" to create a new collection, use a mapping standard or import using one of our importers.
-
-= Configure your collection = 
-
-Navigate the top menu to set your collection up. Create the metadata that items in this collection will have, and choose, from these metadata, which ones are going to be used as a filter.
-
-= Add items = 
-
-Back to the "Items" screen, click "Add new" to create a new item.
-
-= Manage and browse your collection =
-
-Through this admin interface you can manage your collection and browse its item using the faceted search interface or advanced search interface.
-
-If you want to visit your collections in the public side of your site, using your current theme, visit http://your-site/tainacan-collection and you will get the list of your collections.
-
-= Set up Taxonomies =
-
-You can also have metada as taxonomies, which you can configure with a set of hierarchical terms of your own vocabulary.
-
-= Add links to your menu =
-
-Edit your menu and links directly to your collections. Click "Screen options" at the top of the Menu edition page and enable "Collections".
-
-If you want to add a link to the list of collections, click "View all" tab on the Collections box on the left, and then add the first item named "Collections" to the menu.
-
-= Faceted search in your theme =
-
-We are still working in a way to enable faceted search in any theme. You can try it but it might not work very well depending on your theme.
-
-In order to do this, use the shortcode "tainacan-search" in any page of your site (we recommend a full width template page), informing the ID of the collection you want to display.
-
-Example: [tainacan-search collection-id=4]
-
-== Installation ==
-
-Upload the files to the plugins directory and activate it. You can also install and activate directly from the your admin panel.
-
-If you have Imagick installed in your server, Tainacan will be able to automatically generate a thumbnail from your PDF files. This is desired but not required.
-
-== Screenshots ==
- 
-1. Manage your repository
-2. Set up your collection
-3. Choose the metadata and filters for your collection
-4. Add items described by your metadata
-5. Set up your item as a file, link or text and attach many type of documents
-6. Browse your collections with a faceted search interface
-7. Navigate through rich filtering interface
-8. Explore more with Advanced Search
-9. Set up Taxonomies to be used across your repository
-10. Bulk edit as many items as you need quickly
-11. Expose your collection using Tainacan default theme
-12. Use Gutenberg blocks to display your collections in posts and pages
-13. Choose which items will be displayed in your block
-14. Items displayed using a Gutenberg block 
+=== Tainacan ===
+Contributors: andrebenedito, daltonmartins, fabianobn, jacsonp, leogermani, weryques, wetah, eduardohumberto, ravipassos, jessicafpx, marinagiolo, omarceloavila, vnmedeiros
+Tags: museums, libraries, archives, GLAM, collections, repository
+Requires at least: 4.8
+Tested up to: 5.2.4
+Requires PHP: 5.6
+Stable tag: 0.13.1
+License: GPLv2 or later
+License URI: http://www.gnu.org/licenses/gpl-3.0.html
+
+Tainacan is an open source, powerful and flexible repository platform for WordPress. Manage and publish your digital collections just as easily as you post to your blog, having all the tools of a professional repository platform.
+
+== Description ==
+
+[Tainacan](https://tainacan.org/) is an open source, powerful and flexible repository platform for WordPress. Manage and publish your digital collections just as easily as you post to your blog, having all the tools of a professional repository platform.
+
+= Features =
+
+* "Metadata and Filters": Use a metadata standard or choose whatever set of metadata you want to describe the items in your collections. Also, choose which metadata will be used as a filter when browsing collections.
+
+* "Faceted Search". Browse your collection (and let the public browse it) using a faceted search interface with the filters you have chosen.
+
+* "Manage Taxonomies": Manage vocabularies that can be used accross all your collections.
+
+* "Themes": The Tainacan plugin has its own default theme, which helps you to showcase your collections in a beautiful and effective manner. But it can also work with any WordPress theme, so interface developers can easyly add Tainacan specific features to an existing theme.
+
+* "API and Interoperability": Tainacan implements a RESTful API (read and write) to allow other applications to interact with your repository. That way, you can expose your collection in different formats, such as Json, JsonLD, OAI-PMH and others. If your collection has a specific set of metadata, you can map this metadata to match the patterns you want to use.
+
+* "Gutenberg blocks": Tell stories with your collections. Tainacan offers you several Gutenberg blocks so you can present your collections to the public in many different ways!
+
+== Getting Started ==
+
+After installation, you will see a new menu item in your admin panel called "Tainacan". Click on it to open the Tainacan admin interface.
+
+To get an overview of the main concepts of Tainacan, please visit [this page](https://tainacan.github.io/tainacan-wiki//#/general-concepts).
+
+= Create a collection =
+
+Click "New Collection" to create a new collection, use a mapping standard or import using one of our importers.
+
+= Configure your collection =
+
+Navigate the top menu to set your collection up. Create the metadata that items in this collection will have, and choose, from these metadata, which ones are going to be used as a filter.
+
+= Add items =
+
+Back to the "Items" screen, click "Add new" to create a new item.
+
+= Manage and browse your collection =
+
+Through this admin interface you can manage your collection and browse its item using the faceted search interface or advanced search interface.
+
+If you want to visit your collections in the public side of your site, using your current theme, visit http://your-site/tainacan-collection and you will get the list of your collections.
+
+= Set up Taxonomies =
+
+You can also have metada as taxonomies, which you can configure with a set of hierarchical terms of your own vocabulary.
+
+= Add links to your menu =
+
+Edit your menu and links directly to your collections. Click "Screen options" at the top of the Menu edition page and enable "Collections".
+
+If you want to add a link to the list of collections, click "View all" tab on the Collections box on the left, and then add the first item named "Collections" to the menu.
+
+= Faceted search in your theme =
+
+We are still working in a way to enable faceted search in any theme. You can try it but it might not work very well depending on your theme.
+
+In order to do this, use the shortcode "tainacan-search" in any page of your site (we recommend a full width template page), informing the ID of the collection you want to display.
+
+Example: [tainacan-search collection-id=4]
+
+== Installation ==
+
+Upload the files to the plugins directory and activate it. You can also install and activate directly from the your admin panel.
+
+If you have Imagick installed in your server, Tainacan will be able to automatically generate a thumbnail from your PDF files. This is desired but not required.
+
+== Find out more ==
+
+* Visit our oficial website: [https://tainacan.org/](https://tainacan.org/)
+* Check our documentation Wiki: [https://wiki.tainacan.org/](https://wiki.tainacan.org/)
+
+== Screenshots ==
+
+1. Manage your repository
+2. Set up your collection
+3. Choose the metadata and filters for your collection
+4. Add items described by your metadata
+5. Set up your item as a file, link or text and attach many type of documents
+6. Browse your collections with a faceted search interface
+7. Navigate through rich filtering interface
+8. Explore more with Advanced Search
+9. Set up Taxonomies to be used across your repository
+10. Bulk edit as many items as you need quickly
+11. Expose your collection using Tainacan default theme
+12. Use Gutenberg blocks to display your collections in posts and pages
+13. Choose which items will be displayed in your block
+14. Items displayed using a Gutenberg block
diff --git a/src/tainacan.php b/src/tainacan.php
index f6c3273ac..43a7b6af0 100644
--- a/src/tainacan.php
+++ b/src/tainacan.php
@@ -2,15 +2,15 @@
 /*
 Plugin Name: Tainacan
 Plugin URI: https://tainacan.org/
-Description: powerfull and flexible repository platform for WordPress. Manage and publish you digital collections as easily as publishing a post to your blog, while having all the tools of a professional respository platform.
+Description: Open source, powerfull and flexible repository platform for WordPress. Manage and publish you digital collections as easily as publishing a post to your blog, while having all the tools of a professional respository platform.
 Author: Tainacan.org
-Version: 0.13RC
+Version: 0.13.1
 Text Domain: tainacan
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 */
 
-const TAINACAN_VERSION = '0.13RC';
+const TAINACAN_VERSION = '0.13.1';
 
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 $TAINACAN_BASE_URL = plugins_url('', __FILE__);
diff --git a/src/theme-helper/template-tags.php b/src/theme-helper/template-tags.php
index e58d87cea..fc77df42a 100644
--- a/src/theme-helper/template-tags.php
+++ b/src/theme-helper/template-tags.php
@@ -1,33 +1,33 @@
-<?php 
+<?php
 
 use \Tainacan\Entities;
 use \Tainacan\Repositories;
 
 /**
  * To be used inside The Loop
- * 
+ *
  * Return the item metadata as a HTML string to be used as output.
  *
  * Each metadata is a label with the metadatum name and the value.
  *
  * If an ID, a slug or a Tainacan\Entities\Metadatum object is passed in 'metadata' parameter, it returns only one metadata, otherwise
  * it returns all metadata
- * 
+ *
  * @param array|string $args {
 	 *     Optional. Array or string of arguments.
-	 * 
+	 *
 	 * 	   @type mixed		 $metadata					Metadatum object, ID or slug to retrieve only one metadatum. empty returns all metadata
-	 * 
+	 *
 	 *     @type array		 $metadata__in				Array of metadata IDs or Slugs to be retrieved. Default none
-	 * 
+	 *
 	 *     @type array		 $metadata__not_in			Array of metadata IDs (slugs not accepted) to excluded. Default none
-	 * 
+	 *
 	 *     @type bool		 $exclude_title				Exclude the Core Title Metadata from result. Default false
-	 * 
+	 *
 	 *     @type bool		 $exclude_description		Exclude the Core Description Metadata from result. Default false
-	 * 
+	 *
 	 *     @type bool		 $exclude_core				Exclude Core Metadata (title and description) from result. Default false
-	 * 
+	 *
 	 *     @type bool        $hide_empty                Wether to hide or not metadata the item has no value to
 	 *                                                  Default: true
 	 *     @type string      $before                    String to be added before each metadata block
@@ -46,7 +46,7 @@ use \Tainacan\Repositories;
  * @return string        The HTML output
  */
 function tainacan_get_the_metadata($args = array()) {
-	
+
 	$item = tainacan_get_item();
 
 	if ($item instanceof \Tainacan\Entities\Item) {
@@ -54,7 +54,7 @@ function tainacan_get_the_metadata($args = array()) {
 	}
 
 	return '';
-	
+
 }
 
 function tainacan_the_metadata($args = array()) {
@@ -63,19 +63,19 @@ function tainacan_the_metadata($args = array()) {
 
 /**
  * To be used inside The Loop
- * 
+ *
  * Return the item document as a HTML string to be used as output.
  *
  * @return string        The HTML output
  */
 function tainacan_get_the_document() {
 	$item = tainacan_get_item();
-	
+
 	if (!$item)
 		return;
-	
+
 	return apply_filters('tainacan-get-the-document', $item->get_document_as_html(), $item);
-	
+
 }
 
 function tainacan_the_document() {
@@ -84,17 +84,17 @@ function tainacan_the_document() {
 
 /**
  * To be used inside The Loop
- * 
+ *
  * Check whether the current item has a document or not
  *
  * @return bool True if item has document, false if it does not
  */
 function tainacan_has_document() {
-	
+
 	$document = tainacan_get_the_document();
 
 	return ! empty($document);
-	
+
 }
 
 /**
@@ -114,8 +114,8 @@ function tainacan_get_collection_id() {
 /**
  * When visiting a collection archive or single, returns the current collection object
  *
- * @uses tainacan_get_collection_id() 
- * @return \Tainacan\Entities\Collection | false 
+ * @uses tainacan_get_collection_id()
+ * @return \Tainacan\Entities\Collection | false
  */
 function tainacan_get_collection() {
 	$collection_id = tainacan_get_collection_id();
@@ -181,20 +181,20 @@ function tainacan_the_collection_description() {
 function tainacan_the_faceted_search() {
 
 	$props = ' ';
-	
+
 	$default_view_mode = apply_filters( 'tainacan-default-view-mode-for-themes', 'masonry' );
 	$enabled_view_modes = apply_filters( 'tainacan-enabled-view-modes-for-themes', ['table', 'cards', 'masonry', 'slideshow'] );
-	
+
 	// if in a collection page
 	$collection_id = tainacan_get_collection_id();
 	if ($collection_id) {
-		
+
 		$props .= 'collection-id="' . $collection_id . '" ';
 		$collection = new  \Tainacan\Entities\Collection($collection_id);
 		$default_view_mode = $collection->get_default_view_mode();
 		$enabled_view_modes = $collection->get_enabled_view_modes();
 	}
-	
+
 	// if in a tainacan taxonomy
 	$term = tainacan_get_term();
 	if ($term) {
@@ -203,18 +203,18 @@ function tainacan_the_faceted_search() {
 		// $props .= 'custom-filters="[72432,84385]" '; // Only to be used when dealing with custom filters
 		// $props .= 'collection-id="43385" '; // Only to be used when dealing with custom filters
 	}
-	
+
 	$props .= 'default-view-mode="' . $default_view_mode . '" ';
 	$props .= 'enabled-view-modes="' . implode(',', $enabled_view_modes) . '" ';
 
 	echo "<main id='tainacan-items-page' $props ></main>";
-	
+
 }
 
 /**
  * When visiting a term archive, returns the current term object if it belongs to a Tainacan taxonomy
  *
- * @return false|\WP_Term 
+ * @return false|\WP_Term
  */
 function tainacan_get_term() {
 	if ( is_tax() ) {
@@ -275,7 +275,7 @@ function tainacan_the_term_description() {
 
 /**
  * To be used inside The Loop
- * 
+ *
  * Return the list of attachments of the current item (by default, excluding the document and the thumbnail)
  *
  * @param string|array IDs of attachments to be excluded (by default this function already excludes the document and the thumbnail)
@@ -283,12 +283,16 @@ function tainacan_the_term_description() {
  */
 function tainacan_get_the_attachments($exclude = null) {
 	$item = tainacan_get_item();
-	
+
 	if (!$item)
 		return [];
-	
+
 	return apply_filters('tainacan-get-the-attachments', $item->get_attachments(), $item);
-	
+
+}
+
+function tainacan_get_attachment_html_url($attachment_id) {
+	return \Tainacan\Media::get_instance()->get_attachment_html_url($attachment_id);
 }
 
 /**
@@ -300,21 +304,21 @@ function tainacan_register_view_mode($slug, $args = []) {
 
 /**
  * Gets the Tainacan Item Entity object
- * 
+ *
  * If used inside the Loop of items, will get the Item object for the current post
  */
 function tainacan_get_item($post_id = 0) {
 	$post = get_post( $post_id );
-	
+
 	if (!$post) {
 		return null;
 	}
-	
+
 	$theme_helper = \Tainacan\Theme_Helper::get_instance();
-	
+
 	if (!$theme_helper->is_post_an_item($post))
 		return null;
-	
+
 	$item = new Entities\Item($post);
 
 	return $item;
@@ -323,14 +327,14 @@ function tainacan_get_item($post_id = 0) {
 
 /**
  * To be used inside The Loop of a faceted serach view mode template.
- * 
+ *
  * Returns true or false indicating wether a certain property or metadata is
  * selected to be displayed
- * 
+ *
  * @param string|integer The property to be checked. If a string is passed, it will check against
- * 	one of the native property of the item, such as title, description and creation_date. 
+ * 	one of the native property of the item, such as title, description and creation_date.
  *  If an integer is passed, it will check against the IDs of the metadata.
- * 
+ *
  * @return bool
  */
 function tainacan_current_view_displays($property) {
@@ -353,56 +357,56 @@ function tainacan_current_view_displays($property) {
 
 /**
  *
- * Displays the link to the edit page of an item, if current user have permission 
- * 
+ * Displays the link to the edit page of an item, if current user have permission
+ *
  * Can be used outside The Lopp if an ID is provided.
- * 
- * The same as edit_post_link() (@see https://developer.wordpress.org/reference/functions/edit_post_link/) but for 
+ *
+ * The same as edit_post_link() (@see https://developer.wordpress.org/reference/functions/edit_post_link/) but for
  * Tainacan Items
  *
- * @param string $text 	(optional) Anchor text. If null, default is 'Edit this item'. 
- * @param string $before 	(optional) Display before edit link 
- * @param string $afer 	(optional) Display after edit link 
+ * @param string $text 	(optional) Anchor text. If null, default is 'Edit this item'.
+ * @param string $before 	(optional) Display before edit link
+ * @param string $afer 	(optional) Display after edit link
  * @param int|WP_Post $id 	(optional) Post ID or post object. Default is the global $post.
  * @param string $class 	(optional) Add custom class to link
- * 
+ *
  */
 function tainacan_the_item_edit_link( $text = null, $before = '', $after = '', $id = 0, $class = 'post-edit-link' ) {
 	if ( ! $item = tainacan_get_item( $id ) ) {
 		return;
 	}
-	
+
 	if ( ! $item->can_edit() || ! $url = $item->get_edit_url() ) {
 		return;
 	}
-	
+
 	if ( null === $text ) {
 		$text = __( 'Edit this item', 'tainacan' );
 	}
-	
+
 	$link = '<a class="' . esc_attr( $class ) . '" href="' . esc_url( $url ) . '">' . $text . '</a>';
-	
+
 	echo $before . $link . $after;
 }
 
 /**
  * Gets the initials from a name.
- * 
+ *
  * By default, returns 2 uppercase letters representing the name. The first letter from the first name and the first letter from the last.
- * 
+ *
  * @param string $string The name to extract the initials from
  * @param bool $one whether to return only the first letter, instead of two
- * 
+ *
  * @return string
  */
 function tainacan_get_initials($string, $one = false) {
-	
+
 	if (empty($string)) {
 		return '';
 	}
-	
+
 	$string = remove_accents($string);
-	
+
 	if (strlen($string) == 1) {
 		return strtoupper($string);
 	}
@@ -414,13 +418,13 @@ function tainacan_get_initials($string, $one = false) {
 	}
 
 	$words=explode(" ",$string);
-	
+
 	if (sizeof($words) < 2) {
 		$second = $string[1];
 	} else {
 		$second = $words[ sizeof($words) - 1 ][0];
 	}
-	
-	$result = strtoupper($first . $second);	
+
+	$result = strtoupper($first . $second);
 	return apply_filters('tainacan-get-initials', $result, $string, $one);
-}
\ No newline at end of file
+}
diff --git a/src/theme-helper/view-mode-cards.vue b/src/theme-helper/view-mode-cards.vue
index 2f838f653..9e66c53a3 100644
--- a/src/theme-helper/view-mode-cards.vue
+++ b/src/theme-helper/view-mode-cards.vue
@@ -156,6 +156,14 @@ export default {
     $gray4: #555758;
     $gray5: #454647; 
 
+    // Grid mixin for display: grid compatibility
+    @mixin display-grid {
+        flex-wrap: wrap;
+        display: flex;
+        display: -ms-grid;
+        display: grid;
+    }
+
     @import "../../src/admin/scss/_view-mode-cards.scss";
 
     .tainacan-cards-container .tainacan-card .metadata-title {
diff --git a/tests/test-api-filters.php b/tests/test-api-filters.php
index 0f8be513e..03bebda5a 100644
--- a/tests/test-api-filters.php
+++ b/tests/test-api-filters.php
@@ -3,7 +3,7 @@
 namespace Tainacan\Tests;
 
 /**
- * @group api 
+ * @group api
  */
 class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 
@@ -33,7 +33,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 
 		$request_body = json_encode(
 			array(
-				'filter_type'   => '\Tainacan\Filter_Types\Custom_Interval',
+				'filter_type'   => 'Tainacan\Filter_Types\Numeric_Interval',
 				'filter'        => [
 					'name'        => 'Filter name',
 					'description' => 'This is CUSTOM INTERVAL!',
@@ -49,7 +49,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 
 		$data = $response->get_data();
 		$this->assertTrue(is_array($data) && array_key_exists('filter_type', $data), sprintf('cannot create a custom interval, response: %s', print_r($data, true)));
-		$this->assertEquals('Tainacan\Filter_Types\Custom_Interval', $data['filter_type']);
+		$this->assertEquals('Tainacan\Filter_Types\Numeric_Interval', $data['filter_type']);
 		$this->assertEquals('Filter name', $data['name']);
 	}
 
@@ -82,7 +82,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 				'collection'  => $collection,
 				'description' => 'descricao',
 				'metadatum_id'    => $metadatum->get_id(),
-				'filter_type' => 'Tainacan\Filter_Types\Custom_Interval',
+				'filter_type' => 'Tainacan\Filter_Types\Numeric_Interval',
 			),
 			true
 		);
@@ -143,8 +143,6 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			true
 		);
 
-		$filter_type = $this->tainacan_filter_factory->create_filter('custom_interval');
-
 		$filter = $this->tainacan_entity_factory->create_entity(
 			'filter',
 			array(
@@ -152,7 +150,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 				'collection'  => $collection,
 				'description' => 'descricao',
 				'metadatum_id'    => $metadatum->get_id(),
-				'filter_type' => $filter_type,
+				'filter_type' => 'Tainacan\Filter_Types\Numeric_Interval',
 			),
 			true
 		);
@@ -209,8 +207,6 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			true
 		);
 
-		$filter_type = $this->tainacan_filter_factory->create_filter('custom_interval');
-
 		$filter = $this->tainacan_entity_factory->create_entity(
 			'filter',
 			array(
@@ -218,7 +214,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 				'collection'  => $collection,
 				'description' => 'descricao',
 				'metadatum'       => $metadatum,
-				'filter_type' => $filter_type,
+				'filter_type' => 'Tainacan\Filter_Types\Numeric_Interval',
 				'status'      => 'publish'
 			),
 			true
@@ -231,7 +227,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 				'collection'  => $collection,
 				'description' => 'descricao',
 				'metadatum'       => $metadatum2,
-				'filter_type' => $filter_type,
+				'filter_type' => 'Tainacan\Filter_Types\Numeric_Interval',
 				'status'      => 'publish'
 			),
 			true
@@ -366,9 +362,9 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 		$this->assertCount(2, $data4);
 		//$this->assertEquals('4x Filter', $data4[0]['name']);
 	}
-	
+
 	public function test_return_filter_type_options_in_get_item() {
-		
+
 		$collection1 = $this->tainacan_entity_factory->create_entity(
 			'collection',
 			array(
@@ -377,7 +373,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			),
 			true
 		);
-		
+
 		$meta = $this->tainacan_entity_factory->create_entity(
 			'metadatum',
 			array(
@@ -388,7 +384,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			),
 			true
 		);
-	
+
 		$filter_numeric = $this->tainacan_entity_factory->create_entity(
 			'filter',
 			array(
@@ -403,7 +399,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			),
 			true
 		);
-		
+
 		$request = new \WP_REST_Request(
 			'GET',
 			$this->namespace . '/filters/' . $filter_numeric->get_id()
@@ -416,11 +412,11 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 		$this->assertEquals($filter_numeric->get_id(), $data['id']);
 		$this->assertEquals('numeric', $data['name']);
 		$this->assertEquals(3, $data['filter_type_options']['step']);
-		
+
 	}
-	
+
 	public function test_return_filter_type_options_in_get_items() {
-		
+
 		$collection1 = $this->tainacan_entity_factory->create_entity(
 			'collection',
 			array(
@@ -429,7 +425,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			),
 			true
 		);
-	
+
 		$meta = $this->tainacan_entity_factory->create_entity(
 			'metadatum',
 			array(
@@ -440,7 +436,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			),
 			true
 		);
-	
+
 		$filter_numeric = $this->tainacan_entity_factory->create_entity(
 			'filter',
 			array(
@@ -455,7 +451,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			),
 			true
 		);
-		
+
 		$request = new \WP_REST_Request(
 			'GET',
 			$this->namespace . '/collection/' . $collection1->get_id() . '/filters'
@@ -464,7 +460,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 		$response = $this->server->dispatch($request);
 
 		$data = $response->get_data();
-		
+
 		//var_dump($data, $this->namespace . '/collection/' . $collection2->get_id() . '/metadata/');
 		foreach ($data as $d) {
 			if ($d['id'] == $filter_numeric->get_id()) {
@@ -472,15 +468,15 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 				break;
 			}
 		}
-		
+
 		$this->assertEquals($filter_numeric->get_id(), $meta['id']);
 		$this->assertEquals('numeric', $meta['name']);
 		$this->assertEquals(3, $meta['filter_type_options']['step']);
-		
+
 	}
-	
+
 	public function test_return_filter_type_options_in_get_item_default_value() {
-		
+
 		$collection1 = $this->tainacan_entity_factory->create_entity(
 			'collection',
 			array(
@@ -489,7 +485,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			),
 			true
 		);
-		
+
 		$meta = $this->tainacan_entity_factory->create_entity(
 			'metadatum',
 			array(
@@ -500,7 +496,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			),
 			true
 		);
-	
+
 		$filter_numeric = $this->tainacan_entity_factory->create_entity(
 			'filter',
 			array(
@@ -515,7 +511,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			),
 			true
 		);
-		
+
 		$request = new \WP_REST_Request(
 			'GET',
 			$this->namespace . '/filters/' . $filter_numeric->get_id()
@@ -529,11 +525,11 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 		$this->assertEquals('numeric', $data['name']);
 		$this->assertEquals(1, $data['filter_type_object']['options']['step']);
 		$this->assertEquals(1, $data['filter_type_options']['step']);
-		
+
 	}
-	
+
 	public function test_return_metadata_type_options_inside_metadatum_property() {
-		
+
 		$collection1 = $this->tainacan_entity_factory->create_entity(
 			'collection',
 			array(
@@ -542,7 +538,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			),
 			true
 		);
-		
+
 		$collection2 = $this->tainacan_entity_factory->create_entity(
 			'collection',
 			array(
@@ -551,9 +547,9 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			),
 			true
 		);
-		
+
 		$core1 = $collection1->get_core_title_metadatum();
-		
+
 		$meta_relationship = $this->tainacan_entity_factory->create_entity(
 			'metadatum',
 			array(
@@ -569,7 +565,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			),
 			true
 		);
-	
+
 		$filter = $this->tainacan_entity_factory->create_entity(
 			'filter',
 			array(
@@ -581,7 +577,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			),
 			true
 		);
-		
+
 		$request = new \WP_REST_Request(
 			'GET',
 			$this->namespace . '/filters/' . $filter->get_id()
@@ -595,9 +591,9 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 		$this->assertEquals('yes', $data['metadatum']['metadata_type_object']['options']['repeated']);
 		$this->assertEquals($collection1->get_id(), $data['metadatum']['metadata_type_object']['options']['collection_id']);
 		$this->assertEquals($core1->get_id(), $data['metadatum']['metadata_type_object']['options']['search']);
-		
+
 	}
-	
+
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/tests/test-api-metadata.php b/tests/test-api-metadata.php
index d098984e1..fe8a5c193 100644
--- a/tests/test-api-metadata.php
+++ b/tests/test-api-metadata.php
@@ -575,6 +575,98 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 		
 	}
 
+	public function test_update_taxonomy_metadata() {
+		$Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
+
+		$collection = $this->tainacan_entity_factory->create_entity(
+			'collection',
+			array(
+				'name'   => 'test_col',
+				'status' => 'publish'
+			),
+			true
+		);
+		
+		$tax = $this->tainacan_entity_factory->create_entity(
+			'taxonomy',
+			array(
+				'name'   => 'tax_test',
+				'collections' => [$collection],
+				'status' => 'publish'
+			),
+			true
+		);
+
+		$this->tainacan_entity_factory->create_entity(
+			'term',
+			array(
+				'taxonomy' => $tax->get_db_identifier(),
+				'name'     => 'Rock',
+				'user'     => 56
+			),
+			true
+		);
+
+		$this->tainacan_entity_factory->create_entity(
+			'term',
+			array(
+				'taxonomy' => $tax->get_db_identifier(),
+				'name'     => 'Samba',
+				'user'     => 56
+			),
+			true
+		);
+		
+		$metadatum = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
+			array(
+				'name'   => 'tax',
+				'status' => 'publish',
+				'collection' => $collection,
+				'metadata_type'  => 'Tainacan\Metadata_Types\Taxonomy',
+				'metadata_type_options' => [
+					'taxonomy_id' => $tax->get_id(),
+				]
+			),
+			true
+		);
+
+		$i1 = $this->tainacan_entity_factory->create_entity(
+			'item',
+			array(
+				'title'       => 'item teste',
+				'description' => 'adasdasdsa',
+				'collection'  => $collection
+			),
+			true
+		);
+
+		$itemMeta1 = new \Tainacan\Entities\Item_Metadata_Entity($i1, $metadatum);
+		$itemMeta1->set_value('Rock');
+		$itemMeta1->validate();
+		$Tainacan_Item_Metadata->insert($itemMeta1);
+		
+		$request = new \WP_REST_Request(
+			'GET',
+			$this->namespace . '/item/' . $i1->get_id() . '/metadata/' . $metadatum->get_id()
+		);
+		$response = $this->server->dispatch($request);
+		$data = $response->get_data();
+
+		$this->assertEquals(false, empty($data['value']));
+
+		$request = new \WP_REST_Request(
+			'PATCH',
+			$this->namespace . '/item/' . $i1->get_id() . '/metadata/' . $metadatum->get_id()
+		);
+		$attributes = json_encode(['values' => '']);
+		$request->set_body($attributes);
+		$response = $this->server->dispatch($request);
+		$data = $response->get_data();
+
+		$this->assertEquals(true, empty($data['value']));
+	}
+
 }
 
 ?>
\ No newline at end of file
diff --git a/tests/test-filters.php b/tests/test-filters.php
index c97ade42d..4218db7cd 100644
--- a/tests/test-filters.php
+++ b/tests/test-filters.php
@@ -78,7 +78,7 @@ class Filters extends TAINACAN_UnitTestCase {
 		    true
 	    );
 
-        $filter_range_type = $this->tainacan_filter_factory->create_filter('custom_interval');
+        $filter_range_type = $this->tainacan_filter_factory->create_filter('Numeric_Interval');
 
         //nao devera permitir um filtro Range para o tipo string
          $this->assertTrue( $filter->set_filter_type( $filter_range_type ) === null );
@@ -97,7 +97,7 @@ class Filters extends TAINACAN_UnitTestCase {
         $Tainacan_Filters = \Tainacan\Repositories\Filters::get_instance();
 
         $all_filter_types = $Tainacan_Filters->fetch_filter_types();
-        $this->assertEquals( 12, count( $all_filter_types ) );
+        $this->assertEquals( 11, count( $all_filter_types ) );
 
         $float_filters = $Tainacan_Filters->fetch_supported_filter_types('float');
         $this->assertTrue( count( $float_filters ) > 0 );
@@ -150,12 +150,12 @@ class Filters extends TAINACAN_UnitTestCase {
         $filter2->set_collection($collection);
         $filter2->set_description('description');
         $filter2->set_metadatum($metadatum2);
-        $filter2->set_filter_type('Tainacan\Filter_Types\Custom_Interval');
+        $filter2->set_filter_type('Tainacan\Filter_Types\Numeric_Interval');
 
         $this->assertFalse($filter2->validate(), 'filter with a metadatum with unsupported primitive type should not validate');
 
     }
-	
+
 	/**
      * test if parent metadatum are visible for children collection
      */
@@ -173,7 +173,7 @@ class Filters extends TAINACAN_UnitTestCase {
 	        ),
 	        true
         );
-		
+
 		$this->tainacan_entity_factory->create_entity(
         	'filter',
 	        array(
@@ -282,14 +282,14 @@ class Filters extends TAINACAN_UnitTestCase {
         );
 
         $retrieve_filters =  $Tainacan_Filters->fetch_by_collection( $collection_son, [], 'OBJECT' );
-		
+
 		$retrieve_filters_ids =  $Tainacan_Filters->fetch_ids_by_collection( $collection_son, [] );
 
         // should return 4
         $this->assertEquals( 4, sizeof( $retrieve_filters ) );
 		$this->assertEquals( 4, sizeof( $retrieve_filters_ids ) );
     }
-    
+
     function test_metadatum_getter_setter(){
         $Tainacan_Filters = \Tainacan\Repositories\Filters::get_instance();
 
@@ -319,29 +319,29 @@ class Filters extends TAINACAN_UnitTestCase {
         $filter2->set_description('description');
         $filter2->set_metadatum($metadatum2);
         $filter2->set_filter_type('Tainacan\Filter_Types\Selectbox');
-        
+
         $filter2->validate();
-        
+
         $filter = $Tainacan_Filters->insert($filter2);
-        
+
         $this->assertEquals($metadatum2->get_id(), $filter->get_metadatum_id());
         $this->assertEquals($metadatum2->get_name(), $filter->get_metadatum()->get_name());
-        
-        
+
+
         $filter3 = new \Tainacan\Entities\Filter();
         $filter3->set_name('filter 3');
         $filter3->set_collection($collection);
         $filter3->set_description('description');
         $filter3->set_metadatum_id($metadatum2->get_id());
         $filter3->set_filter_type('Tainacan\Filter_Types\Selectbox');
-        
+
         $filter3->validate();
-        
+
         $filter = $Tainacan_Filters->insert($filter3);
-        
+
         $this->assertEquals($metadatum2->get_id(), $filter->get_metadatum_id());
         $this->assertEquals($metadatum2->get_name(), $filter->get_metadatum()->get_name());
-        
+
         $metadatum3 = $this->tainacan_entity_factory->create_entity(
             'metadatum',
             array(
@@ -352,27 +352,27 @@ class Filters extends TAINACAN_UnitTestCase {
             ),
             true
         );
-        
+
         $filter4 = new \Tainacan\Entities\Filter();
         $filter4->set_name('filter 4');
-        
+
         $filter4->set_metadatum_id($metadatum3->get_id());
         $this->assertEquals($metadatum3->get_id(), $filter4->get_metadatum_id());
         $this->assertEquals($metadatum3->get_name(), $filter4->get_metadatum()->get_name());
-        
+
         $filter4->set_metadatum($metadatum2);
         $this->assertEquals($metadatum2->get_id(), $filter4->get_metadatum_id());
         $this->assertEquals($metadatum2->get_name(), $filter4->get_metadatum()->get_name());
-        
-        
+
+
     }
-	
-	
+
+
 	function test_delete_filter_when_metadata_deleted() {
-		
+
 		$Tainacan_Filters = \Tainacan\Repositories\Filters::get_instance();
 		$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
-		
+
 		$collection = $this->tainacan_entity_factory->create_entity(
 			'collection',
 			array(
@@ -381,7 +381,7 @@ class Filters extends TAINACAN_UnitTestCase {
 			),
 			true
 		);
-		
+
 		$metadatum2 = $this->tainacan_entity_factory->create_entity(
 			'metadatum',
 			array(
@@ -392,7 +392,7 @@ class Filters extends TAINACAN_UnitTestCase {
 			),
 			true
 		);
-		
+
 		$filter = $this->tainacan_entity_factory->create_entity(
 			'filter',
 			array(
@@ -404,20 +404,20 @@ class Filters extends TAINACAN_UnitTestCase {
 			),
 			true
 		);
-		
+
 		$Tainacan_Metadata->delete($metadatum2);
-		
+
 		$x = $Tainacan_Filters->fetch( $filter->get_id() );
-		
+
 		$this->assertEmpty($x);
-		
+
 	}
-	
+
 	function test_trash_filter_when_metadata_trashed() {
-		
+
 		$Tainacan_Filters = \Tainacan\Repositories\Filters::get_instance();
 		$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
-		
+
 		$collection = $this->tainacan_entity_factory->create_entity(
 			'collection',
 			array(
@@ -426,7 +426,7 @@ class Filters extends TAINACAN_UnitTestCase {
 			),
 			true
 		);
-		
+
 		$metadatum2 = $this->tainacan_entity_factory->create_entity(
 			'metadatum',
 			array(
@@ -437,7 +437,7 @@ class Filters extends TAINACAN_UnitTestCase {
 			),
 			true
 		);
-		
+
 		$filter = $this->tainacan_entity_factory->create_entity(
 			'filter',
 			array(
@@ -449,20 +449,20 @@ class Filters extends TAINACAN_UnitTestCase {
 			),
 			true
 		);
-		
+
 		$Tainacan_Metadata->trash($metadatum2);
-		
+
 		$x = $Tainacan_Filters->fetch( $filter->get_id() );
-		
+
 		$this->assertEquals('trash', $x->get_status());
-		
+
 	}
-	
+
 	function test_private_metadatum() {
-		
+
 		$Tainacan_Filters = \Tainacan\Repositories\Filters::get_instance();
 		$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
-		
+
 		$collection = $this->tainacan_entity_factory->create_entity(
 			'collection',
 			array(
@@ -471,7 +471,7 @@ class Filters extends TAINACAN_UnitTestCase {
 			),
 			true
 		);
-		
+
 		$metadatum2 = $this->tainacan_entity_factory->create_entity(
 			'metadatum',
 			array(
@@ -483,27 +483,27 @@ class Filters extends TAINACAN_UnitTestCase {
 			),
 			true
 		);
-		
+
 		$filter = new \Tainacan\Entities\Filter();
 		$filter->set_name('teste');
 		$filter->set_metadatum($metadatum2);
 		$filter->set_status('publish');
-		
+
 		$this->assertFalse($filter->validate());
 		$this->assertArrayHasKey('status', $filter->get_errors()[0]);
-		
+
 		$filter->set_status('private');
-		
+
 		$this->assertTrue($filter->validate());
-		
-		
+
+
 	}
 
 	function test_private_metadatum_update() {
-		
+
 		$Tainacan_Filters = \Tainacan\Repositories\Filters::get_instance();
 		$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
-		
+
 		$collection = $this->tainacan_entity_factory->create_entity(
 			'collection',
 			array(
@@ -512,7 +512,7 @@ class Filters extends TAINACAN_UnitTestCase {
 			),
 			true
 		);
-		
+
 		$metadatum2 = $this->tainacan_entity_factory->create_entity(
 			'metadatum',
 			array(
@@ -524,7 +524,7 @@ class Filters extends TAINACAN_UnitTestCase {
 			),
 			true
 		);
-		
+
 		$filter = $this->tainacan_entity_factory->create_entity(
 			'filter',
 			array(
@@ -537,18 +537,18 @@ class Filters extends TAINACAN_UnitTestCase {
 			),
 			true
 		);
-		
+
 		$this->assertEquals('publish', $filter->get_status());
-		
+
 		$metadatum2->set_status('private');
 		$metadatum2->validate();
 		$Tainacan_Metadata->insert($metadatum2);
-		
+
 		$check_filter = $Tainacan_Filters->fetch( $filter->get_id() );
-		
+
 		$this->assertEquals('private', $check_filter->get_status());
-		
+
 	}
 
-	
-}
\ No newline at end of file
+
+}
diff --git a/tests/test-taxonomies.php b/tests/test-taxonomies.php
index 6d13b6070..e30d6a5d7 100644
--- a/tests/test-taxonomies.php
+++ b/tests/test-taxonomies.php
@@ -69,9 +69,9 @@ class Taxonomies extends TAINACAN_UnitTestCase {
         $this->assertEquals( $test->get_name(), 'Rock' );
         $this->assertEquals( $test->get_user(), 56 );
     }
-	
+
 	function test_terms_of_draft_taxonomy() {
-		
+
 		$taxonomy = $this->tainacan_entity_factory->create_entity(
         	'taxonomy',
 	        array(
@@ -82,14 +82,14 @@ class Taxonomies extends TAINACAN_UnitTestCase {
 	        ),
 	        true
         );
-		
+
 		$Tainacan_Taxonomies = \Tainacan\Repositories\Taxonomies::get_instance();
 		$Tainacan_Terms = \Tainacan\Repositories\Terms::get_instance();
 
 		$terms = $Tainacan_Terms->fetch(['hide_empty' => false], $taxonomy->get_id());
-		
+
 		$this->assertEquals(0, sizeof($terms), 'new auto draft taxonomy should return 0 terms');
-		
+
 		$term = $this->tainacan_entity_factory->create_entity(
 		    'term',
 		    array(
@@ -98,17 +98,17 @@ class Taxonomies extends TAINACAN_UnitTestCase {
 		    ),
 		    true
 	    );
-		
-		
-		
+
+
+
 		$terms = $Tainacan_Terms->fetch(['hide_empty' => false], $taxonomy->get_id());
-		
+
 		$this->assertEquals(1, sizeof($terms), 'you should be able to create a term even if the taxonomy is still auto-draft');
-		
+
 	}
-	
+
 	function test_term_exists() {
-		
+
 		$taxonomy = $this->tainacan_entity_factory->create_entity(
         	'taxonomy',
 	        array(
@@ -119,10 +119,10 @@ class Taxonomies extends TAINACAN_UnitTestCase {
 	        ),
 	        true
         );
-		
+
 		$Tainacan_Taxonomies = \Tainacan\Repositories\Taxonomies::get_instance();
 		$Tainacan_Terms = \Tainacan\Repositories\Terms::get_instance();
-		
+
 		$term = $this->tainacan_entity_factory->create_entity(
 		    'term',
 		    array(
@@ -131,7 +131,7 @@ class Taxonomies extends TAINACAN_UnitTestCase {
 		    ),
 		    true
 	    );
-		
+
 		$parent = $this->tainacan_entity_factory->create_entity(
 		    'term',
 		    array(
@@ -140,7 +140,7 @@ class Taxonomies extends TAINACAN_UnitTestCase {
 		    ),
 		    true
 	    );
-		
+
 		$child = $this->tainacan_entity_factory->create_entity(
 		    'term',
 		    array(
@@ -150,14 +150,14 @@ class Taxonomies extends TAINACAN_UnitTestCase {
 		    ),
 		    true
 	    );
-		
+
 		$this->assertFalse( $Tainacan_Terms->term_exists('Reggae', $taxonomy->get_db_identifier()) );
 		$this->assertTrue( $Tainacan_Terms->term_exists('Rock', $taxonomy->get_db_identifier()) );
-		
+
 		//var_dump( $Tainacan_Terms->term_exists('Rock', $taxonomy->get_db_identifier(), 0, true) );
-		
-		// test extreme case 
-		
+
+		// test extreme case
+
 		$term_2 = $this->tainacan_entity_factory->create_entity(
 		    'term',
 		    array(
@@ -167,49 +167,49 @@ class Taxonomies extends TAINACAN_UnitTestCase {
 		    ),
 		    true
 	    );
-		
+
 		$this->assertFalse( $Tainacan_Terms->term_exists('test 123', $taxonomy->get_db_identifier(), 0) ); // parent 0
 		$this->assertTrue( $Tainacan_Terms->term_exists('test    123', $taxonomy->get_db_identifier(), $term->get_id()) ); // spaces in between
-		
-		// testing passing taxonomy object 
+
+		// testing passing taxonomy object
 		$this->assertTrue( $Tainacan_Terms->term_exists('Rock', $taxonomy) );
-		
+
 		// testing passing taxonomy ID
 		$this->assertTrue( $Tainacan_Terms->term_exists('Rock', $taxonomy->get_id()) );
-		
+
 		// testing via Taxonomy object
 		$this->assertTrue( $taxonomy->term_exists('Rock') );
-		
-		// testing retrieving the term 
+
+		// testing retrieving the term
 		$this->assertTrue( $taxonomy->term_exists('Rock', 0, true) instanceof \WP_Term );
 		$this->assertEquals( $term->get_id(), $taxonomy->term_exists('Rock', 0, true)->term_taxonomy_id );
-		
-		// test parent 
+
+		// test parent
 		$this->assertTrue( $Tainacan_Terms->term_exists('Child', $taxonomy->get_db_identifier()) ); // parent null
 		$this->assertFalse( $Tainacan_Terms->term_exists('Child', $taxonomy->get_db_identifier(), 0) ); // parent 0
-		$this->assertTrue( $Tainacan_Terms->term_exists('Child', $taxonomy->get_db_identifier(), $parent->get_id()) ); // parent 
-		
-		// test with ID 
+		$this->assertTrue( $Tainacan_Terms->term_exists('Child', $taxonomy->get_db_identifier(), $parent->get_id()) ); // parent
+
+		// test with ID
 		$this->assertTrue( $Tainacan_Terms->term_exists($term->get_id(), $taxonomy->get_id()) );
-		
-		// test get term 
+
+		// test get term
 		$test_term = $Tainacan_Terms->term_exists($term->get_id(), $taxonomy->get_id(), null, true);
 		$this->assertEquals($term->get_id(), $test_term->term_id);
-		
+
 		$test_term = $Tainacan_Terms->term_exists('Rock', $taxonomy->get_id(), null, true);
 		$this->assertEquals($term->get_id(), $test_term->term_id);
-		
+
 		$test_term = $Tainacan_Terms->term_exists('Parent', $taxonomy->get_id(), null, true);
 		$this->assertEquals($parent->get_id(), $test_term->term_id);
-		
+
 		// test brackets
 		$test_term = $Tainacan_Terms->term_exists('[Rock]', $taxonomy->get_id(), null, true);
 		$this->assertFalse($test_term);
-		
+
 	}
-	
+
 	function test_term_validation() {
-		
+
 		$taxonomy = $this->tainacan_entity_factory->create_entity(
         	'taxonomy',
 	        array(
@@ -220,10 +220,10 @@ class Taxonomies extends TAINACAN_UnitTestCase {
 	        ),
 	        true
         );
-		
+
 		$Tainacan_Taxonomies = \Tainacan\Repositories\Taxonomies::get_instance();
 		$Tainacan_Terms = \Tainacan\Repositories\Terms::get_instance();
-		
+
 		$term = $this->tainacan_entity_factory->create_entity(
 		    'term',
 		    array(
@@ -232,7 +232,7 @@ class Taxonomies extends TAINACAN_UnitTestCase {
 		    ),
 		    true
 	    );
-		
+
 		$parent = $this->tainacan_entity_factory->create_entity(
 		    'term',
 		    array(
@@ -241,7 +241,7 @@ class Taxonomies extends TAINACAN_UnitTestCase {
 		    ),
 		    true
 	    );
-		
+
 		$child = $this->tainacan_entity_factory->create_entity(
 		    'term',
 		    array(
@@ -251,27 +251,27 @@ class Taxonomies extends TAINACAN_UnitTestCase {
 		    ),
 		    true
 	    );
-		
+
 		$newTerm = new \Tainacan\Entities\Term();
 		$newTerm->set_name('Child');
 		$newTerm->set_taxonomy($taxonomy->get_db_identifier());
-		
+
 		$this->assertTrue( $newTerm->validate() );
-		
+
 		$newTerm->set_parent($parent->get_id());
-		
+
 		$this->assertFalse( $newTerm->validate(), 'term should not validate because it has a duplicate in the same level' );
-		
+
 		$child->set_description('changed');
-		
+
 		$this->assertTrue( $child->validate(), 'child should validate');
-		
-		
-		
+
+
+
 	}
-    
+
     /**
-    * @group enabled 
+    * @group enabled
     */
     function test_enabled_post_types(){
         $Tainacan_Taxonomies = \Tainacan\Repositories\Taxonomies::get_instance();
@@ -287,15 +287,15 @@ class Taxonomies extends TAINACAN_UnitTestCase {
 	    );
 
         $taxonomy = $Tainacan_Taxonomies->insert($taxonomy);
-        
+
 	    $pto = get_object_taxonomies('post');
 	    $pages = get_object_taxonomies('page');
         $this->assertContains($taxonomy->get_db_identifier(), $pto);
         $this->assertNotContains($taxonomy->get_db_identifier(), $pages);
     }
-	
+
 	function test_brackets() {
-		
+
 		$taxonomy = $this->tainacan_entity_factory->create_entity(
         	'taxonomy',
 	        array(
@@ -306,10 +306,10 @@ class Taxonomies extends TAINACAN_UnitTestCase {
 	        ),
 	        true
         );
-		
+
 		$Tainacan_Taxonomies = \Tainacan\Repositories\Taxonomies::get_instance();
 		$Tainacan_Terms = \Tainacan\Repositories\Terms::get_instance();
-		
+
 		$term = $this->tainacan_entity_factory->create_entity(
 		    'term',
 		    array(
@@ -318,7 +318,7 @@ class Taxonomies extends TAINACAN_UnitTestCase {
 		    ),
 		    true
 	    );
-		
+
 		$term2 = $this->tainacan_entity_factory->create_entity(
 		    'term',
 		    array(
@@ -327,16 +327,16 @@ class Taxonomies extends TAINACAN_UnitTestCase {
 		    ),
 		    true
 	    );
-		
+
 		$terms = $Tainacan_Terms->fetch(['hide_empty' => false], $taxonomy);
 		$this->assertEquals(2, sizeof($terms));
-		
+
 	}
-	
+
 	function test_brackets_2() {
-		
+
 		$Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
-		
+
 		$collection = $this->tainacan_entity_factory->create_entity(
         	'collection',
 	        array(
@@ -345,7 +345,7 @@ class Taxonomies extends TAINACAN_UnitTestCase {
 	        ),
 	        true
         );
-		
+
 		$taxonomy = $this->tainacan_entity_factory->create_entity(
         	'taxonomy',
 	        array(
@@ -381,7 +381,7 @@ class Taxonomies extends TAINACAN_UnitTestCase {
 	        ),
 	        true
         );
-		
+
 		$i2 = $this->tainacan_entity_factory->create_entity(
         	'item',
 	        array(
@@ -391,29 +391,198 @@ class Taxonomies extends TAINACAN_UnitTestCase {
 	        ),
 	        true
         );
-		
+
 		$itemMeta1 = new \Tainacan\Entities\Item_Metadata_Entity($i1, $metadatum);
 		$itemMeta1->set_value('Rock');
 		$itemMeta1->validate();
 		$Tainacan_Item_Metadata->insert($itemMeta1);
-		
+
 		//$this->assertNotFalse(term_exists( 'Rock', $taxonomy->get_db_identifier() ));
 		// term_exists() is not to be trusted
 		//$this->assertFalse(term_exists( '[Rock]', $taxonomy->get_db_identifier() ));
-		
+
 		$itemMeta2 = new \Tainacan\Entities\Item_Metadata_Entity($i2, $metadatum);
 		$itemMeta2->set_value('[Rock]');
 		$itemMeta2->validate();
 		$Tainacan_Item_Metadata->insert($itemMeta2);
-		
+
 		$itemMeta1_check = new \Tainacan\Entities\Item_Metadata_Entity($i1, $metadatum);
 		$this->assertEquals('Rock', $itemMeta1_check->get_value()->get_name());
-		
+
 		$itemMeta2_check = new \Tainacan\Entities\Item_Metadata_Entity($i2, $metadatum);
 		$this->assertEquals('[Rock]', $itemMeta2_check->get_value()->get_name());
-		
-		
-		
+
+
+
 	}
-	
-}
\ No newline at end of file
+
+	function test_metadata_taxonomy_term_count() {
+		$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
+		$Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
+
+		$collection_1 = $this->tainacan_entity_factory->create_entity(
+			'collection',
+			array( 'name'   => 'test-1', 'status' => 'publish', ),
+			true
+		);
+
+		$collection_2 = $this->tainacan_entity_factory->create_entity(
+			'collection',
+			array( 'name'   => 'test-2', 'status' => 'publish', ),
+			true
+		);
+
+		$tax = $this->tainacan_entity_factory->create_entity(
+			'taxonomy',
+			array(
+				'name'   => 'tax_test',
+				'status' => 'publish',
+				//'enabled_post_types' => [$collection_1->get_db_identifier(), $collection_2->get_db_identifier()]
+			),
+			true
+		);
+
+		$tax_repository = $this->tainacan_entity_factory->create_entity(
+			'taxonomy',
+			array(
+				'name'   => 'tax_test_repository',
+				'status' => 'publish'
+			),
+			true
+		);
+
+		$t1 = $this->tainacan_entity_factory->create_entity(
+			'term',
+			array(
+				'taxonomy' => $tax->get_db_identifier(),
+				'name'     => 'term',
+				'user'     => get_current_user_id(),
+			),
+			true
+		);
+
+		$t2 = $this->tainacan_entity_factory->create_entity(
+			'term',
+			array(
+				'taxonomy' => $tax_repository->get_db_identifier(),
+				'name'     => 'term_repository'
+			),
+			true
+		);
+
+		$metadatum_1 = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
+			array(
+				'name' => 'meta-1',
+				'description' => 'description-1',
+				'collection' => $collection_1,
+				'metadata_type' => 'Tainacan\Metadata_Types\Taxonomy',
+				'status'	 => 'publish',
+				'metadata_type_options' => [
+					'taxonomy_id' => $tax->get_id(),
+					'allow_new_terms' => 'no'
+				]
+			),
+			true
+		);
+
+		$metadatum_2 = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
+			array(
+				'name' => 'meta-2',
+				'description' => 'description-2',
+				'collection' => $collection_2,
+				'metadata_type' => 'Tainacan\Metadata_Types\Taxonomy',
+				'status'	 => 'publish',
+				'metadata_type_options' => [
+					'taxonomy_id' => $tax->get_id(),
+					'allow_new_terms' => 'no'
+				]
+			),
+			true
+		);
+
+		$metadatum_repository = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
+			array(
+				'name' => 'meta-1',
+				'description' => 'description-1',
+				'collection_id' => $Tainacan_Metadata->get_default_metadata_attribute(),
+				'metadata_type' => 'Tainacan\Metadata_Types\Taxonomy',
+				'status'	 => 'publish',
+				'metadata_type_options' => [
+					'taxonomy_id' => $tax_repository->get_id(),
+					'allow_new_terms' => 'no'
+				]
+			),
+			true
+		);
+
+		$i1 = $this->tainacan_entity_factory->create_entity(
+			'item',
+			array(
+				'title'       => 'item teste',
+				'description' => 'adasdasdsa',
+				'collection'  => $collection_1,
+				'status' => 'publish'
+			),
+			true
+		);
+		$itemMeta1 = new \Tainacan\Entities\Item_Metadata_Entity($i1, $metadatum_1);
+		$itemMeta1->set_value('term');
+		$itemMeta1->validate();
+		$Tainacan_Item_Metadata->insert($itemMeta1);
+
+		$itemMeta1_repo = new \Tainacan\Entities\Item_Metadata_Entity($i1, $metadatum_repository);
+		$itemMeta1_repo->set_value('term_repository');
+		$itemMeta1_repo->validate();
+		$Tainacan_Item_Metadata->insert($itemMeta1_repo);
+
+
+		$i2 = $this->tainacan_entity_factory->create_entity(
+			'item',
+			array(
+				'title'       => 'item teste',
+				'description' => 'adasdasdsa',
+				'collection'  => $collection_2,
+				'status' => 'private'
+			),
+			true
+		);
+		$itemMeta2 = new \Tainacan\Entities\Item_Metadata_Entity($i2, $metadatum_2);
+		$itemMeta2->set_value('term');
+		$itemMeta2->validate();
+		$Tainacan_Item_Metadata->insert($itemMeta2);
+
+		$itemMeta2_repo = new \Tainacan\Entities\Item_Metadata_Entity($i2, $metadatum_repository);
+		$itemMeta2_repo->set_value('term_repository');
+		$itemMeta2_repo->validate();
+		$Tainacan_Item_Metadata->insert($itemMeta2_repo);
+
+		$terms = get_terms([
+			'taxonomy' => $tax->get_db_identifier(),
+			//'hide_empty' => false,
+		]);
+		$this->assertEquals(1, count($terms));
+
+		wp_update_term_count($t1->get_term_id(), $tax->get_db_identifier());
+		wp_update_term_count($t2->get_term_id(), $tax_repository->get_db_identifier());
+
+		$term = get_term($t1->get_term_id());
+		$term_repo = get_term($t2->get_term_id());
+		$tax_used = get_object_taxonomies( [$collection_1->get_db_identifier(), $collection_2->get_db_identifier()]);
+
+		$tax = get_taxonomy($tax->get_db_identifier());
+		$tax_repository = get_taxonomy($tax_repository->get_db_identifier());
+
+		$this->assertContains($collection_1->get_db_identifier(), $tax->object_type);
+		$this->assertContains($collection_2->get_db_identifier(), $tax->object_type);
+
+		$this->assertContains($collection_1->get_db_identifier(), $tax_repository->object_type);
+		$this->assertContains($collection_2->get_db_identifier(), $tax_repository->object_type);
+
+		$this->assertEquals(2, $term->count);
+		$this->assertEquals(2, $term_repo->count);
+	}
+
+}