diff --git a/.travis.yml b/.travis.yml
index 0cde988b1..1a6796d4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,21 +45,6 @@ install:
 - echo 'if ( php -v|grep -q --only-matching --perl-regexp "5\.\\d+\.\\d+" );then /usr/local/bin/phpunit-5 $@;else /usr/local/bin/phpunit-6 $@;fi;exit $?' |sudo tee -a /usr/local/bin/phpunit > /dev/null
 - sudo chmod +x /usr/local/bin/phpunit
 script: /usr/local/bin/phpunit # phpunit 
-before_deploy:
-- echo "Seção executada antes do deploy!"
-- openssl aes-256-cbc -K $encrypted_cb93ef43fcd2_key -iv $encrypted_cb93ef43fcd2_iv
-  -in deploy_rsa.enc -out /tmp/deploy_rsa -d
-- eval "$(ssh-agent -s)"
-- chmod 600 /tmp/deploy_rsa
-- ssh-add /tmp/deploy_rsa
-- echo -e "Host  $ssh_host\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
-- ssh-add -l
-deploy:
-- provider: script
-  script:  sshpass -p '$ssh_password' ssh $ssh_user@$ssh_host sh /home/l3p/atualiza_git/atualiza_todos.sh   #MECHI AQUI!!   #ssh   $ssh_user@$ssh_host $script_deploy_tainacan
-  skip_cleanup: true
-  on:
-    branch: develop
 cache:
   directories:
   - vendor
diff --git a/build.sh b/build.sh
index 25d42b5be..57c66af03 100755
--- a/build.sh
+++ b/build.sh
@@ -72,6 +72,8 @@ rsync -axz --exclude='vendor/bin/phpc*' --exclude='vendor/squizlabs' --exclude='
  --exclude='vendor/respect/validation/docs' --exclude='vendor/respect/validation/tests' \
  --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/compile-sass.sh b/compile-sass.sh
index 92369e83c..08d2bbea9 100644
--- a/compile-sass.sh
+++ b/compile-sass.sh
@@ -31,5 +31,7 @@ sass -E 'UTF-8' --cache-location .tmp/sass-cache-10 src/gutenberg-blocks/tainaca
 
 sass -E 'UTF-8' --cache-location .tmp/sass-cache-11 src/gutenberg-blocks/tainacan-facets/facets-list/facets-list.scss:src/assets/css/tainacan-gutenberg-block-facets-list.css
 
+sass -E 'UTF-8' --cache-location .tmp/sass-cache-12 src/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list.scss:src/assets/css/tainacan-gutenberg-block-carousel-terms-list.css
+
 echo "Compilação do Sass Concluído!"
 exit 0
diff --git a/package-lock.json b/package-lock.json
index 128b22f63..9e6ec88b6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1951,9 +1951,9 @@
       }
     },
     "buefy": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/buefy/-/buefy-0.8.3.tgz",
-      "integrity": "sha512-01aHoCy4LAD08MmUahXC8mVqtGK/kzJ45ysXskwLWILAhyLMqkZ5fvdMKD9Ky6iDsMttPHdwUe2csmdnIx9caw==",
+      "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 8ddcd0e23..9adf8c99c 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "axios": "^0.19.0",
-    "buefy": "^0.8.3",
+    "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/bulk-edition/bulk-edition-modal.vue b/src/admin/components/bulk-edition/bulk-edition-modal.vue
index fa3cdd9f9..f12fb76f8 100644
--- a/src/admin/components/bulk-edition/bulk-edition-modal.vue
+++ b/src/admin/components/bulk-edition/bulk-edition-modal.vue
@@ -1,5 +1,12 @@
 <template>
-    <div class="tainacan-modal-content this-tainacan-modal-content">
+    <div 
+            aria-labelledby="alert-dialog-title"
+            autofocus
+            role="alertdialog"
+            tabindex="-1"
+            aria-modal
+            class="tainacan-modal-content this-tainacan-modal-content"
+            ref="bulkEditionModal">
         <header class="tainacan-modal-title">
             <h2>{{ modalTitle }}
                 <small class="tainacan-total-objects-info">
@@ -17,7 +24,7 @@
 
                     <b-select
                             :loading="metadataIsLoading"
-                            :class="{'is-field-history': bulkEditionProcedures[criterion].isDone}"
+                            :class="{'is-field-history': bulkEditionProcedures[criterion].isDone, 'hidden-select-arrow': !!bulkEditionProcedures[criterion].metadatumID}"
                             :disabled="!!bulkEditionProcedures[criterion].metadatumID || metadataIsLoading"
                             class="tainacan-bulk-edition-field tainacan-bulk-edition-field-not-last"
                             :placeholder="$i18n.get('instruction_select_a_metadatum')"
@@ -40,7 +47,7 @@
                     </b-select>
 
                     <b-select
-                            :class="{'is-field-history': bulkEditionProcedures[criterion].isDone}"
+                            :class="{'is-field-history': bulkEditionProcedures[criterion].isDone, 'hidden-select-arrow': !!bulkEditionProcedures[criterion].action }"
                             v-if="bulkEditionProcedures[criterion] &&
                             bulkEditionProcedures[criterion].metadatumID"
                             :disabled="!!bulkEditionProcedures[criterion].action"
@@ -118,7 +125,7 @@
                             v-else-if="bulkEditionProcedures[criterion] &&
                              bulkEditionProcedures[criterion].metadatumID == 'status'">
                         <b-select
-                                :class="{'is-field-history': bulkEditionProcedures[criterion].isDone}"
+                                :class="{'is-field-history': bulkEditionProcedures[criterion].isDone, 'hidden-select-arrow': bulkEditionProcedures[criterion].isDone}"
                                 :disabled="bulkEditionProcedures[criterion].isDone"
                                 class="tainacan-bulk-edition-field tainacan-bulk-edition-field-last"
                                 :placeholder="$i18n.get('instruction_select_a_status2')"
@@ -353,6 +360,10 @@
                 this.groupID = this.getGroupID();
             });
         },
+        mounted() {
+            if (this.$refs.bulkEditionModal)
+                this.$refs.bulkEditionModal.focus();
+        },
         computed: {
             metadata() {
                 return this.getMetadata();
@@ -370,10 +381,10 @@
                     add: this.$i18n.get('add_value'),
                     redefine: this.$i18n.get('set_new_value'),
                     remove: this.$i18n.get('remove_value'),
-                    replace: this.$i18n.get('replace_value'),
+                    replace: this.$i18n.get('replace_value')
                 },
                 editionActionsForNotMultiple: {
-                    redefine: this.$i18n.get('set_new_value'),
+                    redefine: this.$i18n.get('set_new_value')
                 },
                 bulkEditionProcedures: {
                     1: {
@@ -432,7 +443,7 @@
                 let index = this.editionCriteria.indexOf(criterion);
 
                 this.dones[index] = !withError;
-
+ 
                 this.$set(this.bulkEditionProcedures[criterion], 'isExecuting', false);
             },
             executeBulkEditionProcedure(criterion){
diff --git a/src/admin/components/edition/collection-edition-form.vue b/src/admin/components/edition/collection-edition-form.vue
index 32f76842a..4850da6b5 100644
--- a/src/admin/components/edition/collection-edition-form.vue
+++ b/src/admin/components/edition/collection-edition-form.vue
@@ -204,7 +204,8 @@
                                     ref="enabledViewModesDropdown"
                                     :mobile-modal="true"
                                     :disabled="Object.keys(registeredViewModes).length < 0"
-                                    aria-role="list">
+                                    aria-role="list"
+                                    trap-focus>
                                 <button
                                         class="button is-white"
                                         slot="trigger"
@@ -297,7 +298,7 @@
                         <div class="status-radios">
                             <b-radio
                                     v-model="form.status"
-                                    v-for="(statusOption, index) of $statusHelper.getStatuses()"
+                                    v-for="(statusOption, index) of $statusHelper.getStatuses().filter((status) => status.slug != 'draft')"
                                     :key="index"
                                     :native-value="statusOption.slug">
                                 <span class="icon has-text-gray">
diff --git a/src/admin/components/edition/exporter-edition-form.vue b/src/admin/components/edition/exporter-edition-form.vue
index 99d44bf9c..d6f93d046 100644
--- a/src/admin/components/edition/exporter-edition-form.vue
+++ b/src/admin/components/edition/exporter-edition-form.vue
@@ -142,10 +142,12 @@
             ...mapActions('collection', [
                 'fetchCollections'
             ]),
-            updateExporterOptions(){
+            runExporter(){
+                this.runButtonLoading = true;
+
                 let formElement = document.getElementById('exporterOptionsForm');
                 let formData = new FormData(formElement);
-
+ 
                 let options = {};
 
                 for (let [key, value] of formData.entries())
@@ -153,21 +155,9 @@
 
                 let exporterSessionUpdated = {
                     body: {
-                        options: options,
-                    },
-                    id: this.exporterSession.id,
-                };
-
-                return this.updateExporterSession(exporterSessionUpdated)
-                    .then(exporterSessionUpdated => this.verifyError(exporterSessionUpdated));
-            },
-            runExporter(){
-                this.runButtonLoading = true;
-
-                let exporterSessionUpdated = {
-                    body: {
-                        mapping_selected: this.selectedMapping ? this.selectedMapping : this.selectedMapping,
-                        send_email: this.sendEmail
+                        mapping_selected: this.selectedMapping,
+                        send_email: this.sendEmail,
+                        options: options
                     },
                     id: this.exporterSession.id,
                 };
@@ -176,26 +166,28 @@
                     exporterSessionUpdated['body']['collection'] = {
                         id: this.selectedCollection
                     };
-                }                
+                }             
 
                 this.updateExporterSession(exporterSessionUpdated)
-                    .then(exporterSessionUpdated => {
-                        this.verifyError(exporterSessionUpdated);
+                    .then(() => {
+
+                        if (!this.formErrorMessage) {
+                            this.runExporterSession(this.exporterSession.id)
+                                .then((bgp) => {
+                                    this.runButtonLoading = false;
+                                    this.$router.push(this.$routerHelper.getProcessesPage(bgp.bg_process_id));
+                                })
+                                .catch((error) => {
+                                    this.formErrorMessage = error.error_message;
+                                    this.runButtonLoading = false;
+                                });
+                        }
 
-                        this.updateExporterOptions().then(() => {
-                            if(!this.formErrorMessage) {
-                                this.runExporterSession(this.exporterSession.id)
-                                    .then((bgp) => {
-                                        this.runButtonLoading = false;
-                                        this.$router.push(this.$routerHelper.getProcessesPage(bgp.bg_process_id));
-                                    })
-                                    .catch(() => {
-                                        this.runButtonLoading = false;
-                                    });
-                            }
-                        });
                     })
-                    .catch(() => this.runButtonLoading = false); 
+                    .catch((error) => {
+                        this.formErrorMessage = error.error_message;
+                        this.runButtonLoading = false;
+                    }); 
             },
             formIsValid(){
                 return (
@@ -204,15 +196,6 @@
                         this.exporterSession.accept_no_mapping) &&
                     !this.formErrorMessage
                 );
-            },
-            verifyError(response){
-                if(response.constructor.name === 'Object' &&
-                    (response.data && response.data.status &&
-                        response.data.status.toString().split('')[0] != 2) || response.error_message) {
-                    this.formErrorMessage = response.data.error_message;
-                } else {
-                    this.exporterSession = response.data;
-                }
             }
         },
         created(){
diff --git a/src/admin/components/edition/importer-mapping-form.vue b/src/admin/components/edition/importer-mapping-form.vue
index 7cd03307e..c64fd3f4f 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>
@@ -92,60 +92,69 @@
                     <p v-if="(!importerSourceInfo.source_special_fields || importerSourceInfo.source_special_fields.length <= 0)">{{ $i18n.get('info_no_special_fields_available') }}<br></p>
                     <b-modal 
                             @close="onMetadatumEditionCanceled()"
-                            :active.sync="isNewMetadatumModalActive">
-                         <b-loading 
-                                :is-full-page="isFullPage" 
-                                :active.sync="isLoadingMetadatumTypes"/>
+                            :active.sync="isNewMetadatumModalActive"
+                            trap-focus
+                            aria-modal
+                            aria-role="dialog">
                         <div 
-                                v-if="selectedMetadatumType == undefined && !isEditingMetadatum"
-                                class="tainacan-modal-content">
-                            <div class="tainacan-modal-title">
-                                <h2>{{ $i18n.get('instruction_select_metadatum_type') }}</h2>
-                                <hr>
-                            </div>
-                            <section class="tainacan-form">
-                                <div class="metadata-types-container">
-                                    <div
-                                            class="metadata-type"
-                                            v-for="(metadatumType, index) of metadatumTypes"
-                                            :key="index"
-                                            @click="onSelectMetadatumType(metadatumType)">
-                                        <h4>{{ metadatumType.name }}</h4>           
-                                    </div>
+                                autofocus="true"
+                                tabindex="-1"
+                                role="dialog"
+                                aria-modal>
+                            <b-loading 
+                                    :is-full-page="isFullPage" 
+                                    :active.sync="isLoadingMetadatumTypes"/>
+                            <div 
+                                    v-if="selectedMetadatumType == undefined && !isEditingMetadatum"
+                                    class="tainacan-modal-content">
+                                <div class="tainacan-modal-title">
+                                    <h2>{{ $i18n.get('instruction_select_metadatum_type') }}</h2>
+                                    <hr>
                                 </div>
-                                <div class="field is-grouped form-submit">
-                                    <div class="control">
-                                        <button
-                                                id="button-cancel-importer-edition"
-                                                class="button is-outlined"
-                                                type="button"
-                                                @click="onMetadatumEditionCanceled(); isNewMetadatumModalActive = false">
-                                            {{ $i18n.get('cancel') }}</button>
+                                <section class="tainacan-form">
+                                    <div class="metadata-types-container">
+                                        <div
+                                                class="metadata-type"
+                                                v-for="(metadatumType, index) of metadatumTypes"
+                                                :key="index"
+                                                @click="onSelectMetadatumType(metadatumType)">
+                                            <h4>{{ metadatumType.name }}</h4>           
+                                        </div>
                                     </div>
-                                </div>
-                            </section>
-                        </div>
-                        <div 
-                                v-if="isEditingMetadatum"
-                                class="tainacan-modal-content">
-                            <div class="tainacan-modal-title">
-                                <h2>{{ $i18n.get('instruction_configure_new_metadatum') }}</h2>
-                                <a 
-                                        class="back-link" 
-                                        @click="isEditingMetadatum = false">
-                                    {{ $i18n.get('back') }}
-                                </a>
-                                <hr>
+                                    <div class="field is-grouped form-submit">
+                                        <div class="control">
+                                            <button
+                                                    id="button-cancel-importer-edition"
+                                                    class="button is-outlined"
+                                                    type="button"
+                                                    @click="onMetadatumEditionCanceled(); isNewMetadatumModalActive = false">
+                                                {{ $i18n.get('cancel') }}</button>
+                                        </div>
+                                    </div>
+                                </section>
+                            </div>
+                            <div 
+                                    v-if="isEditingMetadatum"
+                                    class="tainacan-modal-content">
+                                <div class="tainacan-modal-title">
+                                    <h2>{{ $i18n.get('instruction_configure_new_metadatum') }}</h2>
+                                    <a 
+                                            class="back-link" 
+                                            @click="isEditingMetadatum = false">
+                                        {{ $i18n.get('back') }}
+                                    </a>
+                                    <hr>
+                                </div>
+                                <metadatum-edition-form
+                                        :collection-id="collectionId"
+                                        :is-repository-level="false"
+                                        @onEditionFinished="onMetadatumEditionFinished()"
+                                        @onEditionCanceled="onMetadatumEditionCanceled()"
+                                        :index="0"
+                                        :original-metadatum="metadatum"
+                                        :edited-metadatum="editedMetadatum"
+                                        :is-on-modal="true"/>
                             </div>
-                            <metadatum-edition-form
-                                    :collection-id="collectionId"
-                                    :is-repository-level="false"
-                                    @onEditionFinished="onMetadatumEditionFinished()"
-                                    @onEditionCanceled="onMetadatumEditionCanceled()"
-                                    :index="0"
-                                    :original-metadatum="metadatum"
-                                    :edited-metadatum="editedMetadatum"
-                                    :is-on-modal="true"/>
                         </div>
                     </b-modal>
                     <a
diff --git a/src/admin/components/edition/item-bulk-edition-form.vue b/src/admin/components/edition/item-bulk-edition-form.vue
index 5f6b6f8cc..9bbef9cb1 100644
--- a/src/admin/components/edition/item-bulk-edition-form.vue
+++ b/src/admin/components/edition/item-bulk-edition-form.vue
@@ -337,7 +337,8 @@ export default {
                             this.amountFinished --;
                         });
                     }
-                }
+                },
+                trapFocus: true
             });
         },
     },
diff --git a/src/admin/components/edition/item-edition-form.vue b/src/admin/components/edition/item-edition-form.vue
index 5b990391e..e4c3bd74c 100644
--- a/src/admin/components/edition/item-edition-form.vue
+++ b/src/admin/components/edition/item-edition-form.vue
@@ -212,7 +212,10 @@
                                 :can-cancel="false"
                                 :active.sync="isTextModalActive"
                                 :width="640"
-                                scroll="keep">
+                                scroll="keep"
+                                trap-focus
+                                aria-modal
+                                aria-role="dialog">
                             <div class="tainacan-modal-content">
                                 <div class="tainacan-modal-title">
                                     <h2>{{ $i18n.get('instruction_write_text') }}</h2>
@@ -248,7 +251,12 @@
                                 :can-cancel="false"
                                 :active.sync="isURLModalActive"
                                 :width="640"
-                                scroll="keep">
+                                scroll="keep"
+                                trap-focus   
+                                role="dialog"
+                                tabindex="-1"
+                                aria-modal
+                                aria-role="dialog">
                             <div class="tainacan-modal-content">
                                 <div class="tainacan-modal-title">
                                     <h2>{{ $i18n.get('instruction_insert_url') }}</h2>
@@ -1095,7 +1103,8 @@ export default {
                                 this.$console.error(error);
                             });
                     }
-                } 
+                },
+                trapFocus: true 
             });
 
         },
@@ -1191,7 +1200,8 @@ export default {
                         this.deleteItem({ itemId: this.itemId, isPermanently: true });
                         this.$router.push(this.$routerHelper.getCollectionPath(this.form.collectionId))
                     }
-                }
+                },
+                trapFocus: true
             });
         },
         loadExistingItem() {
@@ -1372,7 +1382,8 @@ export default {
                     onConfirm: () => {
                         next();
                     },
-                }
+                },
+                trapFocus: true
             });  
         } else {
             next()
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 47264f68e..5779108b6 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"/>
@@ -308,7 +308,8 @@ export default {
                         onConfirm: () => {
                             this.$router.push(this.$routerHelper.getCollectionItemsPath(this.collectionId));
                         }
-                    }
+                    },
+                    trapFocus: true
                 });
                 
             } else if (status == 'trash') {
@@ -336,7 +337,8 @@ export default {
                                     this.isTrashingItems = false;
                                 });
                         }
-                    }
+                    },
+                    trapFocus: true
                 });            
             }
         },
diff --git a/src/admin/components/edition/taxonomy-edition-form.vue b/src/admin/components/edition/taxonomy-edition-form.vue
index f46ac7904..72c1c38b5 100644
--- a/src/admin/components/edition/taxonomy-edition-form.vue
+++ b/src/admin/components/edition/taxonomy-edition-form.vue
@@ -274,7 +274,8 @@
                         onConfirm: () => {
                             next();
                         }
-                    }
+                    },
+                    trapFocus: true
                 });  
             } else if (this.isEditingTerm) {
                 this.$buefy.modal.open({
@@ -287,7 +288,8 @@
                         onConfirm: () => {
                             next();
                         }
-                    }
+                    },
+                    trapFocus: true
                 });  
             } else {
                 next();
diff --git a/src/admin/components/edition/term-edition-form.vue b/src/admin/components/edition/term-edition-form.vue
index 60675b3bc..7c1c21dd6 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>
     
@@ -181,16 +190,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 +442,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/activities-list.vue b/src/admin/components/lists/activities-list.vue
index c0f7c4eb6..f699fe642 100644
--- a/src/admin/components/lists/activities-list.vue
+++ b/src/admin/components/lists/activities-list.vue
@@ -70,19 +70,19 @@
                             class="table-creation column-small-width"
                             @click="openActivityDetailsModal(activity)"
                             :label="$i18n.get('label_activity_date')"
-                            :aria-label="$i18n.get('label_activity_date') + ': ' + activity.log_date">
+                            :aria-label="$i18n.get('label_activity_date') + ': ' + activity.date">
                         <p
                                 v-tooltip="{
                                     delay: {
                                         show: 500,
                                         hide: 300,
                                     },
-                                    content: activity.log_date,
+                                    content: activity.date,
                                     autoHide: false,
                                     classes: ['tooltip', 'repository-tooltip'],
                                     placement: 'auto-start'
                                 }"
-                                v-html="activity.log_date"/>
+                                v-html="activity.date"/>
                     </td>
                     <!-- Approbation -->
                     <!--<td-->
@@ -125,9 +125,9 @@
 </template>
 
 <script>
-    import {mapActions} from 'vuex';
+    import { mapActions } from 'vuex';
 
-    import ActivityDetailsModal from '../other/activity/activity-details-modal.vue';
+    import ActivityDetailsModal from '../other/activity-details-modal.vue';
     import ThreeStateToggleButton from '../other/three-state-toggle-button.vue';
 
     export default {
@@ -154,9 +154,9 @@
                 'approve',
                 'notApprove'
             ]),
-            getThis(){
-                return this;
-            },
+            // getThis(){
+            //     return this;
+            // },
             approveActivity(activity) {
                 this.approve(activity.id)
                     .then(data => {
@@ -172,12 +172,13 @@
                     parent: this,
                     component: ActivityDetailsModal,
                     props: {
-                        activity: activity,
+                        activityId: activity.id,
                     },
                     events: {
                         approveActivity: (activityId) => this.approveActivity(activityId),
                         notApproveActivity: (activityId) => this.notApproveActivity(activityId)
-                    }
+                    },
+                    trapFocus: true
                 });
             },
         },
diff --git a/src/admin/components/lists/basic-term-item.vue b/src/admin/components/lists/basic-term-item.vue
index 053475aa0..279500104 100644
--- a/src/admin/components/lists/basic-term-item.vue
+++ b/src/admin/components/lists/basic-term-item.vue
@@ -91,7 +91,8 @@ export default {
                         title: this.$i18n.get('label_warning'),
                         message: this.$i18n.get('info_warning_terms_not_saved'),
                         onConfirm: () => { this.removeTerm(); },
-                    }
+                    },
+                    trapFocus: true
                 });  
             } else {
                 this.removeTerm();
@@ -110,8 +111,9 @@ export default {
                     onConfirm: () => { 
                         // If all checks passed, term can be deleted
                         this.$termsListBus.onDeleteBasicTermItem(this.term);
-                    },
-                }
+                    }                
+                },
+                trapFocus: true
             });  
         },
         eventOnEditTerm() {
diff --git a/src/admin/components/lists/collections-list.vue b/src/admin/components/lists/collections-list.vue
index 398ac8e5d..9d474cdd6 100644
--- a/src/admin/components/lists/collections-list.vue
+++ b/src/admin/components/lists/collections-list.vue
@@ -16,7 +16,8 @@
                         v-if="$userCaps.hasCapability('delete_tainacan-collections')"
                         :disabled="!isSelectingCollections"
                         id="bulk-actions-dropdown"
-                        aria-role="list">
+                        aria-role="list"
+                        trap-focus>
                     <button
                             class="button is-white"
                             slot="trigger">
@@ -54,7 +55,8 @@
 
                 <b-dropdown 
                         inline
-                        :style="{ top: cursorPosY + 'px', left: cursorPosX + 'px' }">
+                        :style="{ top: cursorPosY + 'px', left: cursorPosX + 'px' }"
+                        trap-focus>
                     <b-dropdown-item
                             @click="openCollection()" 
                             v-if="!isOnTrash">
@@ -387,8 +389,8 @@ export default {
                         //     })
                         });
                     }
-                
-                }
+                },
+                trapFocus: true
             });
             this.clearContextMenu();
         },
@@ -426,8 +428,9 @@ export default {
                             }
                         }
                         this.allCollectionsOnPageSelected = false;
-                    },
-                }
+                    }
+                },
+                trapFocus: true
             });
         },
         openCollection() {
@@ -473,48 +476,6 @@ export default {
             this.contextMenuCollection = null;
             this.contextMenuIndex = null;
         }
-    },
-    mounted() {
-        // COLUMN RESIZE
-        // This feature is not implemented as it would require whitespace 
-        // on table cells to be 'wrap' instead of 'no-wrap'. Once the table
-        // needs a scroll, the minimum size for the columns would be reached
-        // text would start to ellipsis, but the column is not resizible anymore.
-        // (function () {
-        //     var thElm;
-        //     var startOffset;
-
-        //     Array.prototype.forEach.call(
-        //     document.querySelectorAll("table th"),
-        //     function (th) {
-        //         th.style.position = 'relative';
-
-        //         var grip = document.createElement('div');
-        //         grip.innerHTML = "&nbsp;";
-        //         grip.style.top = 0;
-        //         grip.style.right = 0;
-        //         grip.style.bottom = 0;
-        //         grip.style.width = '5px';
-        //         grip.style.position = 'absolute';
-        //         grip.style.cursor = 'col-resize';
-        //         grip.addEventListener('mousedown', function (e) {
-        //             thElm = th;
-        //             startOffset = th.offsetWidth - e.pageX;
-        //         });
-
-        //         th.appendChild(grip);
-        //     });
-
-        //     document.addEventListener('mousemove', function (e) {
-        //     if (thElm) {
-        //         thElm.style.width = startOffset + e.pageX + 'px';
-        //     }
-        //     });
-
-        //     document.addEventListener('mouseup', function () {
-        //         thElm = undefined;
-        //     });
-        // })();  
     }
 }
 </script>
diff --git a/src/admin/components/lists/filters-list.vue b/src/admin/components/lists/filters-list.vue
index da180a040..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'"> 
@@ -117,7 +117,7 @@
                                         @input="onChangeEnable($event, index)"/>
                                 <a 
                                         :style="{ visibility: filter.collection_id != collectionId && !isRepositoryLevel? 'hidden' : 'visible' }"
-                                        @click.prevent="editFilter(filter)">
+                                        @click.prevent="toggleFilterEdition(filter.id)">
                                     <span 
                                             v-tooltip="{
                                                 content: $i18n.get('edit'),
@@ -234,8 +234,15 @@
         <b-modal 
                 ref="filterTypeModal"
                 :width="680"
-                :active.sync="isSelectingFilterType">
+                :active.sync="isSelectingFilterType"
+                trap-focus
+                aria-modal
+                aria-role="dialog">
             <div 
+                    autofocus
+                    role="dialog"
+                    tabindex="-1"
+                    aria-modal
                     class="tainacan-modal-content" 
                     style="width: auto">
                 <header class="tainacan-modal-title">
@@ -353,6 +360,18 @@ export default {
     components: {
         FilterEditionForm
     },
+    watch: {
+        '$route.query': {
+            handler(newQuery) {
+                if (newQuery.edit != undefined) {
+                    let existingFilterIndex = this.activeFilterList.findIndex((filter) => filter.id == newQuery.edit);
+                    if (existingFilterIndex >= 0)
+                        this.editFilter(this.activeFilterList[existingFilterIndex])                        
+                }
+            },
+            immediate: true
+        }
+    },
     beforeRouteLeave ( to, from, next ) {
         let hasUnsavedForms = false;
         for (let editForm in this.editForms) {
@@ -371,7 +390,8 @@ export default {
                         this.onEditionCanceled();
                         next();
                     },
-                }
+                },
+                trapFocus: true
             });  
         } else {
             next()
@@ -463,9 +483,9 @@ export default {
             // Removes element from filters list
             this.activeFilterList.splice(this.newFilterIndex, 1);
         },
-        handleChangeOnMetadata($event) {    
+        handleChangeOnMetadata($event) {
             if ($event.removed) {
-                this.oldMetadatumIndex = $event.removed.oldIndex; 
+                this.oldMetadatumIndex = $event.removed.oldIndex;
             }
         },
         updateFiltersOrder() {
@@ -509,7 +529,7 @@ export default {
                 collectionId: this.collectionId, 
                 metadatumId: this.choosenMetadatum.id,
                 name: this.choosenMetadatum.name,
-                filterType: this.selectedFilterType.name, 
+                filterType: this.selectedFilterType.className,
                 status: 'auto-draft', 
                 isRepositoryLevel: this.isRepositoryLevel,
                 newIndex: this.newFilterIndex
@@ -524,7 +544,7 @@ export default {
                 this.selectedFilterType = {}
                 this.allowedFilterTypes = [];
 
-                this.editFilter(filter);
+                this.toggleFilterEdition(filter.id);
             })
             .catch((error) => {
                 this.$console.error(error);
@@ -559,46 +579,43 @@ export default {
             // this.deleteTemporaryFilter(this.newFilterIndex);
             this.newFilterIndex = 0;
         },
-        editFilter(filter) {
+        toggleFilterEdition(filterId) {
             // Closing collapse
-            if (this.openedFilterId == filter.id) {                
+            if (this.openedFilterId == filterId) {
                 this.openedFilterId = '';
+                this.$router.push({ query: {}});
 
             // Opening collapse
             } else {
-                
-                if (this.openedFilterId == '' && this.choosenMetadatum.id != undefined) {
-                    this.availableMetadata.push(this.choosenMetadatum);
-                    this.choosenMetadatum = {};
-                    this.allowedFilterTypes = [];
-                    this.selectedFilterType = {};
-                    // this.deleteTemporaryFilter(this.newFilterIndex);
-                    this.newFilterIndex = 0;
-                }
-                this.openedFilterId = filter.id;
+                this.$router.push({ query: { edit: filterId}})
+            }
+        },
+        editFilter(filter) {
+            this.openedFilterId = filter.id;
 
-                // First time opening
-                if (this.editForms[this.openedFilterId] == undefined) {
-                    this.editForms[this.openedFilterId] = JSON.parse(JSON.stringify(filter));
-                    this.editForms[this.openedFilterId].saved = true;
-                    
-                    // Filter inserted now
-                    if (this.editForms[this.openedFilterId].status == 'auto-draft') {
-                        this.editForms[this.openedFilterId].status = 'publish'; 
-                        this.editForms[this.openedFilterId].saved = false;
-                    }
-                }      
-            }   
+            // First time opening
+            if (this.editForms[this.openedFilterId] == undefined) {
+                this.editForms[this.openedFilterId] = JSON.parse(JSON.stringify(filter));
+                this.editForms[this.openedFilterId].saved = true;
+                
+                // Filter inserted now
+                if (this.editForms[this.openedFilterId].status == 'auto-draft') {
+                    this.editForms[this.openedFilterId].status = 'publish'; 
+                    this.editForms[this.openedFilterId].saved = false;
+                }
+            }      
         },
         onEditionFinished() {
             this.formWithErrors = '';
             delete this.editForms[this.openedFilterId];
             this.openedFilterId = '';
+            this.$router.push({ query: {}});
         },
         onEditionCanceled() {
             this.formWithErrors = '';
             delete this.editForms[this.openedFilterId];
             this.openedFilterId = '';
+            this.$router.push({ query: {}});
         },
         getProperPreviewMinHeight() {
             for (let filterType of this.allowedFilterTypes) {
@@ -610,6 +627,55 @@ export default {
                 }
             }
             return 190;
+        },
+        refreshFilters() {
+            this.fetchFilters({
+                collectionId: this.collectionId,
+                isRepositoryLevel: this.isRepositoryLevel,
+                isContextEdit: !this.isOnTheme,
+                includeDisabled: true,
+            }).then((resp) => {
+                resp.request
+                    .then(() => {
+                        
+                        this.isLoadingMetadatumTypes = true;
+
+                        // Checks URL as router watcher would not wait for list to load
+                        if (this.$route.query.edit != undefined) {
+                            let existingFilterIndex = this.activeFilterList.findIndex((filter) => filter.id == this.$route.query.edit);
+                            if (existingFilterIndex >= 0)
+                                this.editFilter(this.activeFilterList[existingFilterIndex]);                        
+                        }
+
+                        // Cancels previous Request
+                        if (this.metadataSearchCancel != undefined)
+                            this.metadataSearchCancel.cancel('Metadata search Canceled.');
+
+                        // Needs to be done after activeFilterList exists to compare and remove chosen metadata.
+                        this.fetchMetadata({
+                            collectionId: this.collectionId, 
+                            isRepositoryLevel: this.isRepositoryLevel, 
+                            isContextEdit: true 
+                        }).then((resp) => {
+                                resp.request
+                                    .then(() => {
+                                        this.isLoadingMetadatumTypes = false;
+                                        this.updateListOfMetadata();
+                                    })
+                                    .catch(() => {
+                                        this.isLoadingMetadatumTypes = false;
+                                    });
+                                // Search Request Token for cancelling
+                            this.metadataSearchCancel = resp.source;
+                        })
+                        .catch(() => this.isLoadingMetadatumTypes = false);  
+                    })
+                    .catch(() => this.isLoadingFilters = false);
+
+                // Search Request Token for cancelling
+                this.filtersSearchCancel = resp.source;
+            })
+            .catch(() => this.isLoadingFilters = false);
         }
     },
     mounted() {
@@ -643,52 +709,8 @@ export default {
         if (this.filtersSearchCancel != undefined)
             this.filtersSearchCancel.cancel('Filters search Canceled.');
 
-        this.fetchFilters({
-                collectionId: this.collectionId,
-                isRepositoryLevel: this.isRepositoryLevel,
-                isContextEdit: !this.isOnTheme,
-                includeDisabled: true,
-            }).then((resp) => {
-                    resp.request
-                        .then(() => {
-                            
-                            this.isLoadingMetadatumTypes = true;
-
-                            // Cancels previous Request
-                            if (this.metadataSearchCancel != undefined)
-                                this.metadataSearchCancel.cancel('Metadata search Canceled.');
-
-                            // Needs to be done after activeFilterList exists to compare and remove chosen metadata.
-                            this.fetchMetadata({
-                                collectionId: this.collectionId, 
-                                isRepositoryLevel: this.isRepositoryLevel, 
-                                isContextEdit: true 
-                            }).then((resp) => {
-                                    resp.request
-                                        .then(() => {
-                                            this.isLoadingMetadatumTypes = false;
-                                            this.updateListOfMetadata();
-                                        })
-                                        .catch(() => {
-                                            this.isLoadingMetadatumTypes = false;
-                                        });
-                                 // Search Request Token for cancelling
-                                this.metadataSearchCancel = resp.source;
-                            })
-                            .catch(() => this.isLoadingMetadatumTypes = false);  
-                        })
-                        .catch(() => this.isLoadingFilters = false);
-
-                    // Search Request Token for cancelling
-                    this.filtersSearchCancel = resp.source;
-                })
-                .catch(() => this.isLoadingFilters = false);
-
-        // On repository level we also fetch collection filters
-        if (this.isRepositoryLevel) {
-            this.fetchRepositoryCollectionFilters()
-                .catch(() => this.isLoadingFilters = false);
-        }
+        // Loads Filters
+        this.refreshFilters();
 
         // Obtains collection name
         if (!this.isRepositoryLevel) {
@@ -1152,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/items-list.vue b/src/admin/components/lists/items-list.vue
index ab94c147f..fe0086163 100644
--- a/src/admin/components/lists/items-list.vue
+++ b/src/admin/components/lists/items-list.vue
@@ -31,7 +31,8 @@
                         v-if="items.length > 0 && items[0].current_user_can_edit"
                         :disabled="selectedItems.length <= 1"
                         id="bulk-actions-dropdown"
-                        aria-role="list">
+                        aria-role="list"
+                        trap-focus>
                     <button
                             class="button is-white"
                             slot="trigger">
@@ -85,7 +86,8 @@
 
                 <b-dropdown 
                         inline
-                        :style="{ top: cursorPosY + 'px', left: cursorPosX + 'px' }">
+                        :style="{ top: cursorPosY + 'px', left: cursorPosX + 'px' }"
+                        trap-focus>
                     <b-dropdown-item
                             @click="openItem()" 
                             v-if="!isOnTrash && !$route.query.iframemode">
@@ -1030,6 +1032,7 @@ export default {
                     collectionID: this.$route.params.collectionId,
                 },
                 width: 'calc(100% - 8.333333333%)',
+                trapFocus: true
             });
         },
         sequenceEditSelectedItems() {
@@ -1068,7 +1071,8 @@ export default {
                             this.$eventBusSearch.loadItems();
                         }
                     }
-                }
+                },
+                trapFocus: true
             });
 
             this.clearContextMenu();
@@ -1099,7 +1103,8 @@ export default {
                             });
                         });
                     }
-                }
+                },
+                trapFocus: true
             });
         },
         deleteOneItem(itemId) {
@@ -1121,7 +1126,8 @@ export default {
                             this.$eventBusSearch.loadItems();
                         });
                     }
-                }
+                },
+                trapFocus: true
             });
             this.clearContextMenu();
         },
@@ -1151,7 +1157,8 @@ export default {
                             });
                         });
                     }
-                }
+                },
+                trapFocus: true
             });
         },
         deleteSelectedItems() {
@@ -1189,7 +1196,8 @@ export default {
                             }
                         });
                     }
-                }
+                },
+                trapFocus: true
             });
         },
         openItem() {
diff --git a/src/admin/components/lists/metadata-list.vue b/src/admin/components/lists/metadata-list.vue
index a30cfdb10..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"
@@ -372,8 +369,15 @@
                         </section>
                         <b-modal
                                 @close="onCancelNewMetadataMapperMetadata"
-                                :active.sync="isMapperMetadataCreating">
+                                :active.sync="isMapperMetadataCreating"
+                                trap-focus
+                                aria-modal
+                                aria-role="dialog">
                             <div 
+                                    autofocus
+                                    role="dialog"
+                                    tabindex="-1"
+                                    aria-modal
                                     class="tainacan-modal-content">
                                 <div class="tainacan-modal-title">
                                     <h2>{{ $i18n.get('instruction_insert_mapper_metadatum_info') }}</h2>
@@ -527,7 +531,8 @@ export default {
                         this.onEditionCanceled();
                         next();
                     },
-                }
+                },
+                trapFocus: true
             });  
         } else {
             next()
@@ -594,7 +599,14 @@ export default {
 
         },
         addNewMetadatum(newMetadatum, newIndex) {
-            this.sendMetadatum({collectionId: this.collectionId, name: newMetadatum.name, metadatumType: newMetadatum.className, status: 'auto-draft', isRepositoryLevel: this.isRepositoryLevel, newIndex: newIndex})
+            this.sendMetadatum({
+                collectionId: this.collectionId, 
+                name: newMetadatum.name, 
+                metadatumType: newMetadatum.className, 
+                status: 'auto-draft', 
+                isRepositoryLevel: this.isRepositoryLevel, 
+                newIndex: newIndex
+            })
             .then((metadatum) => {
 
                 if (!this.isRepositoryLevel)
@@ -626,8 +638,9 @@ export default {
                             .catch(() => {
                                 this.$console.log("Error deleting metadatum.")
                             });
-                    },
-                }
+                    }
+                },
+                trapFocus: true
             }); 
         },
         toggleMetadatumEdition(metadatumId) {
diff --git a/src/admin/components/lists/processes-list.vue b/src/admin/components/lists/processes-list.vue
index 70add7611..93f8a753e 100644
--- a/src/admin/components/lists/processes-list.vue
+++ b/src/admin/components/lists/processes-list.vue
@@ -15,7 +15,8 @@
                 <b-dropdown
                         position="is-bottom-left"
                         :disabled="!isSelecting"
-                        id="bulk-actions-dropdown">
+                        id="bulk-actions-dropdown"
+                        trap-focus>
                     <button
                             class="button is-white"
                             slot="trigger">
@@ -389,7 +390,8 @@
                                     // });
                                 });
                         }
-                    }
+                    },
+                    trapFocus: true
                 });
             },
             deleteSelected() {
@@ -427,7 +429,8 @@
                             }
                             this.allOnPageSelected = false;
                         }
-                    }
+                    },
+                    trapFocus: true
                 });
             },
             getDate(rawDate) {
@@ -451,7 +454,8 @@
                         onConfirm: () => {
                             this.updateProcess({ id: this.processes[index].ID, status: 'closed' });
                         },
-                    }
+                    },
+                    trapFocus: true
                 });
             }
         },
diff --git a/src/admin/components/lists/recursive-term-item.vue b/src/admin/components/lists/recursive-term-item.vue
index 887c66907..90a1181cd 100644
--- a/src/admin/components/lists/recursive-term-item.vue
+++ b/src/admin/components/lists/recursive-term-item.vue
@@ -218,7 +218,8 @@ export default {
                         title: this.$i18n.get('label_warning'),
                         message: this.$i18n.get('info_warning_terms_not_saved'),
                         onConfirm: () => { this.removeTerm(); },
-                    }
+                    },
+                    trapFocus: true
                 });  
             } else {
                 this.removeTerm();
@@ -258,8 +259,9 @@ export default {
                                 });                     
                             } 
                         }    
-                    },
-                }
+                    }
+                },
+                trapFocus: true
             });  
         },
         eventOnChildTermDeleted(parentTermId) {
diff --git a/src/admin/components/lists/taxonomies-list.vue b/src/admin/components/lists/taxonomies-list.vue
index cf17f3b37..46e64207d 100644
--- a/src/admin/components/lists/taxonomies-list.vue
+++ b/src/admin/components/lists/taxonomies-list.vue
@@ -17,7 +17,8 @@
                         v-if="$userCaps.hasCapability('delete_tainacan-taxonomies')"
                         :disabled="!isSelecting"
                         id="bulk-actions-dropdown"
-                        aria-role="list">
+                        aria-role="list"
+                        trap-focus>
                     <button
                             class="button is-white"
                             slot="trigger">
@@ -267,7 +268,8 @@
                                     // });
                                 });
                         }
-                    }
+                    },
+                    trapFocus: true
                 });
             },
             deleteSelected() {
@@ -305,7 +307,8 @@
                             }
                             this.allOnPageSelected = false;
                         }
-                    }
+                    },
+                    trapFocus: true
                 });
             },
             onClickTaxonomy($event, taxonomyId, index) {
diff --git a/src/admin/components/lists/terms-list.vue b/src/admin/components/lists/terms-list.vue
index cf4ad7d40..ca4e72492 100644
--- a/src/admin/components/lists/terms-list.vue
+++ b/src/admin/components/lists/terms-list.vue
@@ -16,7 +16,8 @@
                     :mobile-modal="true"
                     :disabled="localTerms.length <= 0 || isLoadingTerms || isEditingTerm"
                     @input="onChangeOrder(order == 'asc' ? 'desc' : 'asc')"
-                    aria-role="list">
+                    aria-role="list"
+                    trap-focus>
                 <button
                             :aria-label="$i18n.get('label_sorting_direction')"
                             class="button is-white"
@@ -64,15 +65,15 @@
                         type="search"
                         :aria-label="$i18n.get('instruction_search') + ' ' + $i18n.get('terms')"
                         autocomplete="on"
-                        :value="searchQuery"
-                        @keyup.enter="searchQuery = $event.target.value;searchTerms(0)"
+                        v-model="searchQuery"
+                        @keyup.enter="searchTerms(0)"
                         :disabled="isEditingTerm">
-                    <span
-                            @click="searchTerms(0)"
-                            class="icon is-right"
-                            :class="{ 'has-text-gray3': isEditingTerm }">
-                        <i class="tainacan-icon tainacan-icon-search" />
-                    </span>
+                <span
+                        @click="searchTerms(0)"
+                        class="icon is-right"
+                        :class="{ 'has-text-gray3': isEditingTerm }">
+                    <i class="tainacan-icon tainacan-icon-search" />
+                </span>
             </div>
         </div>
     </div>
diff --git a/src/admin/components/navigation/tainacan-header.vue b/src/admin/components/navigation/tainacan-header.vue
index 62c07f6ff..6056a2357 100644
--- a/src/admin/components/navigation/tainacan-header.vue
+++ b/src/admin/components/navigation/tainacan-header.vue
@@ -61,7 +61,8 @@
                         ref="advancedSearchShortcut"
                         class="advanced-search-header-dropdown"
                         position="is-bottom-left"
-                        aria-role="list">
+                        aria-role="list"
+                        trap-focus>
                     <a
                             class="advanced-search-text"
                             slot="trigger">
diff --git a/src/admin/components/navigation/tainacan-repository-subheader.vue b/src/admin/components/navigation/tainacan-repository-subheader.vue
index 1a9b4fae3..d6e3710c2 100644
--- a/src/admin/components/navigation/tainacan-repository-subheader.vue
+++ b/src/admin/components/navigation/tainacan-repository-subheader.vue
@@ -130,7 +130,8 @@ export default {
                 props: {
                     sourceCollection: this.collectionId,
                     hideWhenManualCollection: true
-                }
+                },
+                trapFocus: true
             });
         }
     }
diff --git a/src/admin/components/other/activity-details-modal.vue b/src/admin/components/other/activity-details-modal.vue
new file mode 100644
index 000000000..b9e624167
--- /dev/null
+++ b/src/admin/components/other/activity-details-modal.vue
@@ -0,0 +1,790 @@
+<template>
+    <div 
+            autofocus
+            role="dialog"
+            class="tainacan-modal-content"
+            tabindex="-1"
+            aria-modal
+            ref="activityDetailsModal">
+        <header 
+                v-if="!isLoadingActivity"
+                class="tainacan-modal-title">
+            <h2>{{ activity.title ? activity.title : $i18n.get('activity') }}</h2>
+            <hr>
+            <p>{{ activityCreationDate + ', ' + $i18n.get('info_by_inner') }} <strong> {{ activity.user_name }}</strong></p>
+        </header>
+        <b-loading 
+                :is-full-page="false"
+                :active.sync="isLoadingActivity" 
+                :can-cancel="false"/>
+        <div 
+                v-if="!isLoadingActivity"
+                class="modal-card-body">
+            <div class="content">
+                <p v-if="activity.description"><strong>{{ $i18n.get('label_activity_description') }}:</strong> {{ activity.description }}</p>
+                <p v-if="activity.object">
+                    <strong>{{ $i18n.get('label_related_to') }}: </strong>
+                    <span v-html="relatedToLink" />
+                </p>
+            </div>
+
+            <!-- LEGACY LOG API RETURN -->
+            <div v-if="activity.legacy != undefined && activity.legacy == true">
+                <template v-for="(diff, attributeName, index) in activity.log_diffs">
+                    <div 
+                            :key="index"
+                            class="columns">
+                        <!-- OLD -->
+                        <div class="column is-6">
+
+                            <!-- Thumbnail -->
+                            <div
+                                    class="content"
+                                    v-if="attributeName == 'thumbnail'">
+                                <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>
+                                </p>
+                                <div>
+                                    <picture>
+                                        <img
+                                                width="150px"
+                                                :src="diff.old ? diff.old : placeholderSquareImage"
+                                                :alt="attributeName">
+                                    </picture>
+                                </div>
+                            </div>
+
+                            <div
+                                    v-if="attributeName == 'attachments'"
+                                    class="content">
+                                <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>
+                                </p>
+                                <div
+                                        class="tainacan-attachments-in-modal"
+                                        v-if="diff.old.length">
+                                    <template v-for="(attachment, anotherIndex) in diff.old">
+                                        <file-item 
+                                                :key="anotherIndex"
+                                                :modal-on-click="false"
+                                                :show-name="true"
+                                                :file="{ 
+                                                    title: { rendered: attachment.title },
+                                                    guid: { rendered: attachment.url }, 
+                                                    mime_type: attachment.mime_type,
+                                                    media_type: attachment.mime_type.includes('image') ? 'image' : 'other'
+                                                }"/>
+                                    </template>
+                                </div>
+                                <div v-else>
+                                    <p>{{ infoEmpty }}</p>
+                                </div>
+                            </div>
+
+                            <div
+                                    class="content"
+                                    v-if="!['thumbnail', 'attachments'].includes(attributeName)">
+                                <p class="is-capitalized has-text-blue5 has-text-weight-bold">
+                                    {{ attributeName.replace(/_/g, ' ') }}
+                                    <small class="has-text-gray4 has-text-weight-normal"> {{ `(${$i18n.get('info_logs_before')})` }}</small>
+                                </p>
+
+                                <!-- Is array with length 1 -->
+                                <p
+                                        class="tainacan-p-break"
+                                        v-if="(diff.old instanceof Array) &&
+                                         (diff.old.length == 1) &&
+                                          !(diff.old[0] instanceof Object)">
+                                    {{ diff.old.toString() }}
+                                </p>
+
+                                <div
+                                        v-else-if="attributeName == 'metadata_order'"
+                                        class="content">
+                                    <p
+                                            class="tainacan-p-break"
+                                            v-for="(diffContent, diffTitle) in diff.old"
+                                            :key="diffTitle">
+                                        {{ diff.old ? `ID: ${diffContent.id} | Enabled: ${diffContent.enabled}` : infoEmpty }}
+                                    </p>
+                                </div>
+
+                                <div
+                                        v-else-if="attributeName == 'filters_order'"
+                                        class="content">
+                                    <p
+                                            class="tainacan-p-break"
+                                            v-for="(diffContent, diffTitle) in diff.old"
+                                            :key="diffTitle">
+                                        {{ diff.old ? `ID: ${diffContent.id} | Enabled: ${diffContent.enabled}` : infoEmpty }}
+                                    </p>
+                                </div>
+
+                                <div
+                                        v-else-if="attributeName == 'metadata_type_options'"
+                                        class="content">
+                                    <p class="tainacan-p-break">
+                                        {{ diff.old ?
+                                        `Taxonomy ID: ${diff.old.taxonomy_id};
+                                        Input type: ${diff.old.input_type};
+                                        Allow new terms: ${diff.old.allow_new_terms}` : infoEmpty }}
+                                    </p>
+                                </div>
+
+                                <!--  -->
+                                <p
+                                        class="tainacan-p-break"
+                                        v-else>
+                                    {{ diff.old ? (diff.old instanceof Array && !diff.old.length) ? infoEmpty : diff.old.toString().replace(/,/g, ' ') : infoEmpty }}
+                                </p>
+
+                            </div>
+                        </div>
+
+                        <!-- NEW -->
+                        <div class="column is-6">
+
+                            <!-- Thumbnail -->
+                            <div
+                                    class="content"
+                                    v-if="attributeName == 'thumbnail'">
+                                <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_after')})` }}</small>
+                                </p>
+                                <div>
+                                    <picture>
+                                        <img
+                                                width="150px"
+                                                :src="diff.new ? diff.new : placeholderSquareImage"
+                                                :alt="attributeName">
+                                    </picture>
+                                </div>
+                            </div>
+
+                            <div
+                                    v-if="attributeName == 'attachments'"
+                                    class="content">
+                                <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_after')})` }}</small>
+                                </p>
+                                <div
+                                        class="tainacan-attachments-in-modal"
+                                        v-if="diff.new.length">
+                                    <template v-for="(attachment, index) in diff.new">
+                                        <file-item 
+                                                :key="index"
+                                                :modal-on-click="false"
+                                                :show-name="true"
+                                                :file="{ 
+                                                    title: { rendered: attachment.title },
+                                                    guid: { rendered: attachment.url }, 
+                                                    mime_type: attachment.mime_type,
+                                                    media_type: attachment.mime_type.includes('image') ? 'image' : 'other'
+                                                }"/>
+                                    </template>
+                                </div>
+                                <div v-else>
+                                    <p>{{ infoEmpty }}</p>
+                                </div>
+                            </div>
+
+                            <div
+                                    class="content"
+                                    v-if="!['thumbnail', 'attachments'].includes(attributeName)">
+                                <p class="is-capitalized has-text-blue5 has-text-weight-bold">
+                                    {{ attributeName.replace(/_/g, ' ') }}
+                                    <small class="has-text-gray4 has-text-weight-normal"> {{ `(${$i18n.get('info_logs_after')})` }}</small>
+                                </p>
+
+                                <!-- Is array with length 1 -->
+                                <p
+                                        class="tainacan-p-break"
+                                        v-if="(diff.new instanceof Array) &&
+                                         (diff.new.length == 1) &&
+                                          !(diff.new[0] instanceof Object)">
+                                    {{ diff.new.toString() }}
+                                </p>
+
+
+                                <div
+                                        v-else-if="attributeName == 'metadata_order'"
+                                        class="content">
+                                    <p
+                                            class="tainacan-p-break"
+                                            v-for="(diffContent, diffTitle) in diff.new"
+                                            :key="diffTitle">
+                                        {{ `ID: ${diffContent.id} | Enabled: ${diffContent.enabled}` }}
+                                    </p>
+                                </div>
+
+                                <div
+                                        v-else-if="attributeName == 'filters_order'"
+                                        class="content">
+                                    <p
+                                            class="tainacan-p-break"
+                                            v-for="(diffContent, diffTitle) in diff.new"
+                                            :key="diffTitle">
+                                        {{ `ID: ${diffContent.id} | Enabled: ${diffContent.enabled}` }}
+                                    </p>
+                                </div>
+
+                                <div
+                                        v-else-if="attributeName == 'metadata_type_options'"
+                                        class="content">
+                                    <p class="tainacan-p-break">
+                                        {{ `Taxonomy ID: ${diff.new.taxonomy_id};
+                                            Input type: ${diff.new.input_type};
+                                            Allow new terms: ${diff.new.allow_new_terms}` }}
+                                    </p>
+                                </div>
+
+                                <!-- -->
+                                <p
+                                        class="tainacan-p-break"
+                                        v-else>
+                                    {{ diff.new ? (diff.new instanceof Array && !diff.new.length) ? infoEmpty : diff.new.toString().replace(/,/g, ' ') : infoEmpty }}
+                                </p>
+
+                            </div>
+                        </div>
+                    </div>
+                </template>
+            </div>
+
+            <!-- NEW LOG API RETURN -->
+            <div v-else>
+                <div class="columns">
+                    <!-- OLD -->
+                    <div class="column is-6">
+
+                        <div
+                                v-if="activity.action == 'update-thumbnail'"
+                                class="content">
+                             <p class="is-capitalized has-text-blue5 has-text-weight-bold">
+                                {{ $i18n.get('label_thumbnail') }}
+                                <small class="has-text-gray4 has-text-weight-normal"> {{ `(${$i18n.get('info_logs_before')})` }}</small>
+                            </p>
+                            <p 
+                                    v-if="activity.old_value && activity.old_value.thumb && activity.old_value.thumb[0]"
+                                    class="tainacan-p-break">
+                                <img 
+                                        style="margin: 12px 0; max-width: 150px;"
+                                        :alt="$i18n.get('label_thumbnail')"
+                                        :src="activity.old_value.thumb[0]" >
+                            </p>
+                            <p v-else>{{ infoEmpty }}</p>
+                        </div>
+
+                        <div
+                                v-if="activity.action == 'new-attachment'"
+                                class="content">
+                            <p class="is-capitalized has-text-blue5 has-text-weight-bold">
+                                {{ $i18n.get('label_attachment') }}
+                                <small class="has-text-gray4 has-text-weight-normal"> {{ `(${$i18n.get('info_logs_before')})` }}</small>
+                            </p>
+                            <div v-if="activity.old_value.url">
+                                <file-item 
+                                        :modal-on-click="false"
+                                        :show-name="true"
+                                        :file="{ 
+                                            title: { rendered: activity.old_value.title },
+                                            guid: { rendered: activity.old_value.url }, 
+                                            mime_type: activity.old_value.mime_type,
+                                            media_type: activity.old_value.mime_type.includes('image') ? 'image' : 'other'
+                                        }"/>
+                            </div>
+                            <div v-else>
+                                <p>{{ infoEmpty }}</p>
+                            </div>
+                        </div>
+
+                        <div
+                                v-if="activity.action == 'update-document'"
+                                class="content">
+                            <p class="is-capitalized has-text-blue5 has-text-weight-bold">
+                                {{ $i18n.get('label_document') }}
+                                <small class="has-text-gray4 has-text-weight-normal"> {{ `(${$i18n.get('info_logs_before')})` }}</small>
+                            </p>
+                            <div
+                                    :key="index"
+                                    v-for="(attributeValue, attributeName, index) of activity.old_value">
+                                <p 
+                                        v-if="attributeName == 'thumb' && attributeValue[0]"
+                                        class="tainacan-p-break">                                                          
+                                    <img 
+                                            style="margin: 12px 0; max-width: 150px;"
+                                            :alt="$i18n.get('label_document')"
+                                            :src="attributeValue[0]" >
+                                </p>
+                                <p 
+                                        v-else
+                                        v-html="`<strong>` + attributeName + `: </strong>` + (attributeValue ? attributeValue : infoEmpty)"
+                                        class="tainacan-p-break" />
+                            </div>
+                        </div>
+
+                        <div
+                                class="content"
+                                v-if="activity.action == 'update-metadata-order' || activity.action == 'update-filters-order'">
+                            <div 
+                                    :key="index"
+                                    v-for="(attributeValue, attributeName, index) in activity.old_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>
+                                </p>
+
+                                <div class="content">
+                                    <p
+                                            class="tainacan-p-break"
+                                            v-for="(diffContent, diffTitle) in attributeValue"
+                                            :key="diffTitle"
+                                            v-html="attributeValue ? `ID: ${diffContent.id} <span class='is-italic'>(${diffContent.enabled ? $i18n.get('label_enabled') : $i18n.get('label_disabled')})</span>` : infoEmpty " />
+                                </div>
+                            </div>
+                        </div>
+
+                        <div
+                                class="content"
+                                v-if="activity.action == 'update'">
+                            <div 
+                                    :key="index"
+                                    v-for="(attributeValue, attributeName, index) in activity.old_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>
+                                </p>
+
+                                <!-- Is array with length 1 -->
+                                <p
+                                        class="tainacan-p-break"
+                                        v-if="(attributeValue instanceof Array) &&
+                                            (attributeValue.length == 1) &&
+                                            !(attributeValue[0] instanceof Object)">
+                                    {{ attributeValue.toString() }}
+                                </p>
+
+                                <div
+                                        v-else-if="attributeName == 'metadata_type_options'"
+                                        class="content">
+                                    <p 
+                                            :key="innerIndex"
+                                            v-for="(innerValue, innerName, innerIndex) of attributeValue"
+                                            class="tainacan-p-break">
+                                        <strong>{{ innerName + ': ' }}</strong>{{ innerValue ? innerValue : infoEmpty }}
+                                        <br>
+                                    </p>
+                                </div>
+
+                                <p
+                                        class="tainacan-p-break"
+                                        v-else
+                                        v-html="(!attributeValue || (attributeValue instanceof Array && !attributeValue.length)) ? infoEmpty : (attributeValue instanceof Array ? attributeValue.join(`<span class='multivalue-separator'>|</span>`) : attributeValue)" />
+                            </div>
+                        </div>
+
+                        <div
+                                class="content"
+                                v-if="activity.action == 'update-metadata-value'">
+                            <p class="is-capitalized has-text-blue5 has-text-weight-bold">
+                                {{ activity.metadata && activity.metadata.name ? activity.metadata.name : $i18n.get('metadatum') }}
+                                <small class="has-text-gray4 has-text-weight-normal"> {{ `(${$i18n.get('info_logs_before')})` }}</small>
+                            </p>
+                            <p
+                                class="tainacan-p-break"
+                                v-html="!activity.old_value ? infoEmpty : (activity.old_value instanceof Array ? activity.old_value.join(`<span class='multivalue-separator'>|</span>`) : activity.old_value)" />
+                        </div>
+                    </div>
+
+                    <!-- NEW -->
+                    <div class="column is-6">
+
+                        <div
+                                v-if="activity.action == 'update-thumbnail'"
+                                class="content">
+                             <p class="is-capitalized has-text-blue5 has-text-weight-bold">
+                                {{ $i18n.get('label_thumbnail') }}
+                                <small class="has-text-gray4 has-text-weight-normal"> {{ `(${$i18n.get('info_logs_after')})` }}</small>
+                            </p>
+                            <p 
+                                    v-if="activity.new_value && activity.new_value.thumb && activity.new_value.thumb[0]"
+                                    class="tainacan-p-break">
+                                <img 
+                                        style="margin: 12px 0; max-width: 150px;"
+                                        :alt="$i18n.get('label_thumbnail')"
+                                        :src="activity.new_value.thumb[0]" >
+                            </p>
+                            <p v-else>{{ infoEmpty }}</p>
+                        </div>
+
+                        <div
+                                v-if="activity.action == 'new-attachment'"
+                                class="content">
+                            <p class="is-capitalized has-text-blue5 has-text-weight-bold">
+                                {{ $i18n.get('label_attachment') }}
+                                <small class="has-text-gray4 has-text-weight-normal"> {{ `(${$i18n.get('info_logs_after')})` }}</small>
+                            </p>
+                            <div v-if="activity.new_value.url">
+                                <file-item 
+                                        :modal-on-click="false"
+                                        :show-name="true"
+                                        :file="{ 
+                                            title: { rendered: activity.new_value.title },
+                                            guid: { rendered: activity.new_value.url }, 
+                                            mime_type: activity.new_value.mime_type,
+                                            media_type: activity.new_value.mime_type.includes('image') ? 'image' : 'other'
+                                        }"/>
+                            </div>
+                            <div v-else>
+                                <p>{{ infoEmpty }}</p>
+                            </div>
+                        </div>
+
+                        <div
+                                v-if="activity.action == 'update-document'"
+                                class="content">
+                            <p class="is-capitalized has-text-blue5 has-text-weight-bold">
+                                {{ $i18n.get('label_document') }}
+                                <small class="has-text-gray4 has-text-weight-normal"> {{ `(${$i18n.get('info_logs_after')})` }}</small>
+                            </p>
+                            <div
+                                    :key="index"
+                                    v-for="(attributeValue, attributeName, index) of activity.new_value">
+                                <p 
+                                        v-if="attributeName == 'thumb' && attributeValue[0]"
+                                        class="tainacan-p-break">                                                          
+                                    <img 
+                                            style="margin: 12px 0; max-width: 150px;"
+                                            :alt="$i18n.get('label_document')"
+                                            :src="attributeValue[0]" >
+                                </p>
+                                <p 
+                                        v-else
+                                        v-html="`<strong>` + attributeName + `: </strong>` + (attributeValue ? attributeValue : infoEmpty)"
+                                        class="tainacan-p-break" />
+                            </div>
+                        </div>
+
+                        <div
+                                class="content"
+                                v-if="activity.action == 'update-metadata-order' || activity.action == 'update-filters-order'">
+                            <div 
+                                    :key="index"
+                                    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_after')})` }}</small>
+                                </p>
+
+                                <div class="content">
+                                    <p
+                                            class="tainacan-p-break"
+                                            v-for="(diffContent, diffTitle) in attributeValue"
+                                            :key="diffTitle"
+                                            v-html="attributeValue ? `ID: ${diffContent.id} <span class='is-italic'>(${diffContent.enabled ? $i18n.get('label_enabled') : $i18n.get('label_disabled')})</span>` : infoEmpty " />
+                                </div>
+                            </div>
+                        </div>
+
+                        <div 
+                                :key="index"
+                                v-for="(attributeValue, attributeName, index) in activity.new_value">
+                            <div
+                                    class="content"
+                                    v-if="activity.action == 'update'">
+                                <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_after')})` }}</small>
+                                </p>
+
+                                <div
+                                        v-if="attributeName == 'metadata_type_options'"
+                                        class="content">
+                                    <p 
+                                            :key="innerIndex"
+                                            v-for="(innerValue, innerName, innerIndex) of attributeValue"
+                                            class="tainacan-p-break">
+                                        <strong>{{ innerName + ': ' }}</strong>{{ innerValue ? innerValue : infoEmpty }}
+                                        <br>
+                                    </p>
+                                </div>
+
+                                <div
+                                        v-else-if="attributeName == 'header_image_id'"
+                                        class="content">
+                                    <p class="tainacan-p-break">
+                                        {{ attributeValue ? attributeValue : infoEmpty }}
+                                        <br>
+                                        <img 
+                                                style="margin: 12px 0; max-width: 160px;"
+                                                v-if="activity.terms && activity.terms.header_image"
+                                                :alt="$i18n.get('label_header_image')"
+                                                :src="activity.terms.header_image" >
+                                    </p>
+                                </div>
+
+                                <p
+                                        class="tainacan-p-break"
+                                        v-else
+                                        v-html="(!attributeValue || (attributeValue instanceof Array && !attributeValue.length)) ? infoEmpty : (attributeValue instanceof Array ? attributeValue.join(`<span class='multivalue-separator'>|</span>`) : attributeValue)" />
+                            </div>
+                        </div>
+                        
+                        <div
+                                class="content"
+                                v-if="activity.action == 'update-metadata-value'">
+                            <p class="is-capitalized has-text-blue5 has-text-weight-bold">
+                                {{ activity.metadata && activity.metadata.name ? activity.metadata.name : $i18n.get('metadatum') }}
+                                <small class="has-text-gray4 has-text-weight-normal"> {{ `(${$i18n.get('info_logs_after')})` }}</small>
+                            </p>
+                            <p
+                                class="tainacan-p-break"
+                                v-html="!activity.new_value ? infoEmpty : (activity.new_value instanceof Array ? activity.new_value.join(`<span class='multivalue-separator'>|</span>`) : activity.new_value)" />
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <footer>
+            <div class="control">
+                <button
+                        class="button is-outlined"
+                        type="button"
+                        @click="$parent.close()">
+                    {{ $i18n.get('close') }}
+                </button>
+                <div class="buttons is-pulled-right">
+                    <!--<button-->
+                            <!--v-if="activity.status != 'publish'"-->
+                            <!--@click="notApproveActivity"-->
+                            <!--type="button"-->
+                            <!--class="button is-danger">-->
+                        <!--<b-icon-->
+                                <!--size="is-small"-->
+                                <!--icon="close"/>-->
+                        <!--<span>{{ $i18n.get('not_approve_item') }}</span>-->
+                    <!--</button>-->
+                    <!--<button-->
+                            <!--v-if="activity.status != 'publish'"-->
+                            <!--@click="approveActivity"-->
+                            <!--type="button"-->
+                            <!--class="button is-secondary">-->
+                        <!--<b-icon-->
+                                <!--size="is-small"-->
+                                <!--icon="check"/>-->
+                        <!--<span>{{ $i18n.get('approve_item') }}</span>-->
+                    <!--</button>-->
+
+                    <!--<button-->
+                            <!--v-if="activity.status == 'publish'"-->
+                            <!--@click="notApproveActivity"-->
+                            <!--type="button"-->
+                            <!--class="button is-blue5">-->
+                        <!--<b-icon-->
+                                <!--custom-class="mdi-flip-h"-->
+                                <!--size="is-small"-->
+                                <!--icon="share"/>-->
+                        <!--<span>{{ $i18n.get('undo') }}</span>-->
+                    <!--</button>-->
+
+                    <!-- <button
+                            v-if="activity.status == 'publish'"
+                            @click="$parent.close()"
+                            type="button"
+                            class="button is-secondary">
+                        <span>OK</span>
+                    </button> -->
+                </div>
+            </div>
+        </footer>
+    </div>
+</template>
+
+<script>
+    import { mapActions, mapGetters } from 'vuex';
+    import moment from 'moment';
+    import FileItem from './file-item.vue';
+
+    export default {
+        name: "ActivityDetailsModal",
+        props: {
+            activityId: String
+        },
+        data() {
+            return {
+                infoEmpty: `[ ${this.$i18n.get('info_empty').toLowerCase()} ]`,
+                dateFormat: '',
+                activityCreationDate: '',
+                placeholderSquareImage: `${tainacan_plugin.base_url}/admin/images/placeholder_square.png`,
+                isLoadingActivity: false,
+                adminFullURL: tainacan_plugin.admin_url + 'admin.php?page=tainacan_admin#', 
+            }
+        },
+        components: {
+            FileItem
+        },
+        watch: {
+            '$route' (to, from) {
+                if (to !== from)
+                    this.$parent.close();
+            }
+        },
+        computed: {
+            activity() {
+                return this.getActivity();
+            },
+            relatedToLink() {
+                switch(this.activity.object_type) {
+                    case 'Tainacan\\Entities\\Collection':
+                        return `${ this.$i18n.get('collection') } 
+                                <a href="${ this.adminFullURL + this.$routerHelper.getCollectionPath(this.activity.object_id) }">${ this.activity.object.name }</a>
+                                <span class="icon has-text-gray3">&nbsp;<i class="tainacan-icon tainacan-icon-20px tainacan-icon-collections"/></span>`;
+                    case 'Tainacan\\Entities\\Taxonomy':
+                        return `${ this.$i18n.get('taxonomy') } 
+                                <a href="${ this.adminFullURL + this.$routerHelper.getTaxonomyPath(this.activity.object_id) }">${ this.activity.object.name }</a>
+                                <span class="icon has-text-gray3">&nbsp;<i class="tainacan-icon tainacan-icon-20px tainacan-icon-taxonomies"/></span>`;
+                    case 'Tainacan\\Entities\\Metadatum':
+                        return `${ this.$i18n.get('metadatum') } 
+                                <a href="${ this.adminFullURL + (this.activity.object.collection_id == 'default' ? this.$routerHelper.getMetadataEditPath(this.activity.object_id) : this.$routerHelper.getCollectionMetadataEditPath(this.activity.object.collection_id, this.activity.object_id)) }">${ this.activity.object.name }</a>
+                                <span class="icon has-text-gray3">&nbsp;<i class="tainacan-icon tainacan-icon-20px tainacan-icon-metadata"/></span>`;
+                    case 'Tainacan\\Entities\\Filter':
+                        return `${ this.$i18n.get('filter') } 
+                                <a href="${ this.adminFullURL + (this.activity.object.collection_id == 'default' ? this.$routerHelper.getFilterEditPath(this.activity.object_id) : this.$routerHelper.getCollectionFilterEditPath(this.activity.object.collection_id, this.activity.object_id)) }">${ this.activity.object.name }</a>
+                                <span class="icon has-text-gray3">&nbsp;<i class="tainacan-icon tainacan-icon-20px tainacan-icon-filters"/></span>`;
+                    case 'Tainacan\\Entities\\Term':
+                        return `${ this.$i18n.get('term') } 
+                                <a href="${ this.adminFullURL + this.$routerHelper.getTermEditPath(this.activity.object.taxonomy.replace( /^\D+/g, ''), this.activity.object_id) }">${ this.activity.object.name }</a>
+                                <span class="icon has-text-gray3">&nbsp;<i class="tainacan-icon tainacan-icon-20px tainacan-icon-terms"/></span>`;
+                    case 'Tainacan\\Entities\\Item':
+                        return `${ this.$i18n.get('item') } 
+                                <a href="${ this.adminFullURL + this.$routerHelper.getItemEditPath(this.activity.object.collection_id, this.activity.object_id) }">${ this.activity.object.title }</a>
+                                <span class="icon has-text-gray3">&nbsp;<i class="tainacan-icon tainacan-icon-20px tainacan-icon-items"/></span>`;
+                    case 'Tainacan\\Entities\\Item_Metadata_Entity':
+                        return `${ this.$i18n.get('item') } 
+                                <a href="${ this.adminFullURL + this.$routerHelper.getItemEditPath(this.activity.object.collection_id, this.activity.item.id) }">${ this.activity.item.title }</a>
+                                <span class="icon has-text-gray3">&nbsp;<i class="tainacan-icon tainacan-icon-20px tainacan-icon-items"/></span>`;
+                }
+            }
+        },
+        created() {
+            this.loadActivity();
+        },
+        mounted() {
+            if (this.$refs.activityDetailsModal)
+                this.$refs.activityDetailsModal.focus()
+        },
+        methods: {
+            ...mapActions('activity', [
+                'fetchActivity'
+            ]),
+            ...mapGetters('activity', [
+                'getActivity'
+            ]),
+            approveActivity(){
+                this.$emit('approveActivity', this.activity.id);
+            },
+            notApproveActivity(){
+                this.$emit('notApproveActivity', this.activity.id);
+            },
+            loadActivity() {
+                this.isLoadingActivity = true;
+                this.fetchActivity(this.activityId)
+                    .then(() => {
+                        this.isLoadingActivity = false;
+
+                        let locale = navigator.language;
+
+                        moment.locale(locale);
+
+                        let localeData = moment.localeData();
+                        this.dateFormat = localeData.longDateFormat('lll');
+
+                        let logDate = this.activity.log_date;
+
+                        let date = moment(logDate).format(this.dateFormat);
+
+                        if (date != 'Invalid date') {
+                            this.activityCreationDate = date;
+                        } else {
+                            this.activityCreationDate = this.$i18n.get('info_unknown_date');
+                        }
+                    })
+                    .catch(() => this.isLoadingActivity = false);
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+
+    @import "../../scss/_variables.scss";
+
+    .tainacan-modal-title {
+        align-self: baseline;
+        display: flex;
+        flex-direction: column;
+        width: 100%;
+
+        p {
+            margin-right: auto;
+        }
+    }
+
+    .tainacan-modal-content {
+        width: auto;
+        min-height: 500px;
+        
+        p {
+            font-size: 0.875rem;
+        }
+    }
+
+    .modal-card-body {
+        min-height: 300px;
+        padding: 0;
+        .columns {
+            margin: 6px $page-side-padding 0 $page-side-padding;
+        }
+    }
+
+    .tainacan-attachments-in-modal {
+        display: flex;
+        flex-wrap: wrap;
+        flex-direction: row;
+        align-content: baseline;
+        resize: vertical;
+        overflow-y: auto;
+        overflow-x: hidden;
+        height: 200px;
+        border: 1px solid $gray3;
+
+        &>div {
+            margin: 0.5rem;
+        }
+    }
+
+    .tainacan-p-overflow {
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        max-width: 150px;
+        overflow: hidden;
+    }
+
+    p.is-capitalized {
+        margin-bottom: 0.125rem;
+    }
+    .tainacan-p-break {
+        word-break: break-word;
+        margin-bottom: 0.5rem;
+    }
+
+    .tainacan-figure {
+        width: 150px;
+        height: 150px;
+        overflow: auto;
+    }
+</style>
\ No newline at end of file
diff --git a/src/admin/components/other/activity/activity-details-modal.vue b/src/admin/components/other/activity/activity-details-modal.vue
deleted file mode 100644
index a39eb5fe0..000000000
--- a/src/admin/components/other/activity/activity-details-modal.vue
+++ /dev/null
@@ -1,401 +0,0 @@
-<template>
-    <div class="tainacan-modal-content">
-        <header class="tainacan-modal-title">
-            <h2>{{ $i18n.get('activity') }}</h2>
-            <hr>
-        </header>
-        <div class="modal-card-body">
-            <div class="content">
-                <p><strong>{{ $i18n.get('label_activity_description') }}:</strong> {{ activity.description }}</p>
-                <p><strong>{{ $i18n.get('label_activity_creation_date') }}:</strong> {{ activityCreationDate }}</p>
-                <p><strong>{{ $i18n.get('label_activity_author') }}:</strong> {{ activity.user_name }}</p>
-            </div>
-            <div>
-                <template v-for="(diff, attributeName, index) in activity.log_diffs">
-                    <div 
-                            :key="index"
-                            class="columns">
-
-                        <!-- OLD -->
-                        <div class="column is-6">
-
-                            <!-- Thumbnail -->
-                            <div
-                                    class="content"
-                                    v-if="attributeName == 'thumbnail'">
-                                <p class="is-capitalized has-text-blue5">
-                                    {{ attributeName }}
-                                    <small class="has-text-gray4"> {{ `(${$i18n.get('info_logs_before')})` }}</small>
-                                </p>
-                                <div>
-                                    <picture>
-                                        <img
-                                                width="150px"
-                                                :src="diff.old ? diff.old : placeholderSquareImage"
-                                                :alt="attributeName">
-                                    </picture>
-                                </div>
-                            </div>
-
-                            <div
-                                    v-if="attributeName == 'attachments'"
-                                    class="content">
-                                <p class="is-capitalized has-text-blue5">
-                                    {{ attributeName }}
-                                    <small class="has-text-gray4"> {{ `(${$i18n.get('info_logs_before')})` }}</small>
-                                </p>
-                                <div
-                                        class="tainacan-attachments-in-modal"
-                                        v-if="diff.old.length">
-                                    <template v-for="(attachment, anotherIndex) in diff.old">
-                                        <file-item 
-                                                :key="anotherIndex"
-                                                :modal-on-click="false"
-                                                :show-name="true"
-                                                :file="{ 
-                                                    title: { rendered: attachment.title },
-                                                    guid: { rendered: attachment.url }, 
-                                                    mime_type: attachment.mime_type,
-                                                    media_type: attachment.mime_type.includes('image') ? 'image' : 'other'
-                                                }"/>
-                                    </template>
-                                </div>
-                                <div v-else>
-                                    <p>{{ infoEmpty }}</p>
-                                </div>
-                            </div>
-
-                            <div
-                                    class="content"
-                                    v-if="!['thumbnail', 'attachments'].includes(attributeName)">
-                                <p class="is-capitalized has-text-blue5">
-                                    {{ attributeName.replace(/_/g, ' ') }}
-                                    <small class="has-text-gray4"> {{ `(${$i18n.get('info_logs_before')})` }}</small>
-                                </p>
-
-                                <!-- Is array with length 1 -->
-                                <p
-                                        class="tainacan-p-break"
-                                        v-if="(diff.old instanceof Array) &&
-                                         (diff.old.length == 1) &&
-                                          !(diff.old[0] instanceof Object)">
-                                    {{ diff.old.toString() }}
-                                </p>
-
-                                <div
-                                        v-else-if="attributeName == 'metadata_order'"
-                                        class="content">
-                                    <p
-                                            class="tainacan-p-break"
-                                            v-for="(diffContent, diffTitle) in diff.old"
-                                            :key="diffTitle">
-                                        {{ diff.old ? `ID: ${diffContent.id} | Enabled: ${diffContent.enabled}` : infoEmpty }}
-                                    </p>
-                                </div>
-
-                                <div
-                                        v-else-if="attributeName == 'filters_order'"
-                                        class="content">
-                                    <p
-                                            class="tainacan-p-break"
-                                            v-for="(diffContent, diffTitle) in diff.old"
-                                            :key="diffTitle">
-                                        {{ diff.old ? `ID: ${diffContent.id} | Enabled: ${diffContent.enabled}` : infoEmpty }}
-                                    </p>
-                                </div>
-
-                                <div
-                                        v-else-if="attributeName == 'metadata_type_options'"
-                                        class="content">
-                                    <p class="tainacan-p-break">
-                                        {{ diff.old ?
-                                        `Taxonomy ID: ${diff.old.taxonomy_id};
-                                        Input type: ${diff.old.input_type};
-                                        Allow new terms: ${diff.old.allow_new_terms}` : infoEmpty }}
-                                    </p>
-                                </div>
-
-                                <!--  -->
-                                <p
-                                        class="tainacan-p-break"
-                                        v-else>
-                                    {{ diff.old ? (diff.old instanceof Array && !diff.old.length) ? infoEmpty : diff.old.toString().replace(/,/g, ' ') : infoEmpty }}
-                                </p>
-
-                            </div>
-                        </div>
-
-                        <!-- NEW -->
-                        <div class="column is-6">
-
-                            <!-- Thumbnail -->
-                            <div
-                                    class="content"
-                                    v-if="attributeName == 'thumbnail'">
-                                <p class="is-capitalized has-text-blue5">
-                                    {{ attributeName }}
-                                    <small class="has-text-gray4"> {{ `(${$i18n.get('info_logs_after')})` }}</small>
-                                </p>
-                                <div>
-                                    <picture>
-                                        <img
-                                                width="150px"
-                                                :src="diff.new ? diff.new : placeholderSquareImage"
-                                                :alt="attributeName">
-                                    </picture>
-                                </div>
-                            </div>
-
-                            <div
-                                    v-if="attributeName == 'attachments'"
-                                    class="content">
-                                <p class="is-capitalized has-text-blue5">
-                                    {{ attributeName }}
-                                    <small class="has-text-gray4"> {{ `(${$i18n.get('info_logs_after')})` }}</small>
-                                </p>
-                                <div
-                                        class="tainacan-attachments-in-modal"
-                                        v-if="diff.new.length">
-                                    <template v-for="(attachment, index) in diff.new">
-                                        <file-item 
-                                                :key="index"
-                                                :modal-on-click="false"
-                                                :show-name="true"
-                                                :file="{ 
-                                                    title: { rendered: attachment.title },
-                                                    guid: { rendered: attachment.url }, 
-                                                    mime_type: attachment.mime_type,
-                                                    media_type: attachment.mime_type.includes('image') ? 'image' : 'other'
-                                                }"/>
-                                    </template>
-                                </div>
-                                <div v-else>
-                                    <p>{{ infoEmpty }}</p>
-                                </div>
-                            </div>
-
-                            <div
-                                    class="content"
-                                    v-if="!['thumbnail', 'attachments'].includes(attributeName)">
-                                <p class="is-capitalized has-text-blue5">
-                                    {{ attributeName.replace(/_/g, ' ') }}
-                                    <small class="has-text-gray4"> {{ `(${$i18n.get('info_logs_after')})` }}</small>
-                                </p>
-
-                                <!-- Is array with length 1 -->
-                                <p
-                                        class="tainacan-p-break"
-                                        v-if="(diff.new instanceof Array) &&
-                                         (diff.new.length == 1) &&
-                                          !(diff.new[0] instanceof Object)">
-                                    {{ diff.new.toString() }}
-                                </p>
-
-
-                                <div
-                                        v-else-if="attributeName == 'metadata_order'"
-                                        class="content">
-                                    <p
-                                            class="tainacan-p-break"
-                                            v-for="(diffContent, diffTitle) in diff.new"
-                                            :key="diffTitle">
-                                        {{ `ID: ${diffContent.id} | Enabled: ${diffContent.enabled}` }}
-                                    </p>
-                                </div>
-
-                                <div
-                                        v-else-if="attributeName == 'filters_order'"
-                                        class="content">
-                                    <p
-                                            class="tainacan-p-break"
-                                            v-for="(diffContent, diffTitle) in diff.new"
-                                            :key="diffTitle">
-                                        {{ `ID: ${diffContent.id} | Enabled: ${diffContent.enabled}` }}
-                                    </p>
-                                </div>
-
-                                <div
-                                        v-else-if="attributeName == 'metadata_type_options'"
-                                        class="content">
-                                    <p class="tainacan-p-break">
-                                        {{ `Taxonomy ID: ${diff.new.taxonomy_id};
-                                            Input type: ${diff.new.input_type};
-                                            Allow new terms: ${diff.new.allow_new_terms}` }}
-                                    </p>
-                                </div>
-
-                                <!-- -->
-                                <p
-                                        class="tainacan-p-break"
-                                        v-else>
-                                    {{ diff.new ? (diff.new instanceof Array && !diff.new.length) ? infoEmpty : diff.new.toString().replace(/,/g, ' ') : infoEmpty }}
-                                </p>
-
-                            </div>
-                        </div>
-                    </div>
-                </template>
-
-            </div>
-        </div>
-        <footer>
-            <div class="control">
-                <button
-                        class="button is-outlined"
-                        type="button"
-                        @click="$parent.close()">
-                    {{ $i18n.get('close') }}
-                </button>
-                <div class="buttons is-pulled-right">
-                    <!--<button-->
-                            <!--v-if="activity.status != 'publish'"-->
-                            <!--@click="notApproveActivity"-->
-                            <!--type="button"-->
-                            <!--class="button is-danger">-->
-                        <!--<b-icon-->
-                                <!--size="is-small"-->
-                                <!--icon="close"/>-->
-                        <!--<span>{{ $i18n.get('not_approve_item') }}</span>-->
-                    <!--</button>-->
-                    <!--<button-->
-                            <!--v-if="activity.status != 'publish'"-->
-                            <!--@click="approveActivity"-->
-                            <!--type="button"-->
-                            <!--class="button is-secondary">-->
-                        <!--<b-icon-->
-                                <!--size="is-small"-->
-                                <!--icon="check"/>-->
-                        <!--<span>{{ $i18n.get('approve_item') }}</span>-->
-                    <!--</button>-->
-
-                    <!--<button-->
-                            <!--v-if="activity.status == 'publish'"-->
-                            <!--@click="notApproveActivity"-->
-                            <!--type="button"-->
-                            <!--class="button is-blue5">-->
-                        <!--<b-icon-->
-                                <!--custom-class="mdi-flip-h"-->
-                                <!--size="is-small"-->
-                                <!--icon="share"/>-->
-                        <!--<span>{{ $i18n.get('undo') }}</span>-->
-                    <!--</button>-->
-
-                    <!-- <button
-                            v-if="activity.status == 'publish'"
-                            @click="$parent.close()"
-                            type="button"
-                            class="button is-secondary">
-                        <span>OK</span>
-                    </button> -->
-                </div>
-            </div>
-        </footer>
-    </div>
-</template>
-
-<script>
-    import moment from 'moment';
-    import FileItem from '../file-item.vue';
-
-    export default {
-        name: "ActivityDetailsModal",
-        props: {
-            activity: Object
-        },
-        data() {
-            return {
-                infoEmpty: `[${this.$i18n.get('info_empty').toLowerCase()}]`,
-                dateFormat: '',
-                activityCreationDate: '',
-                placeholderSquareImage: `${tainacan_plugin.base_url}/admin/images/placeholder_square.png`,
-            }
-        },
-        components: {
-            FileItem
-        },
-        created() {
-
-            let locale = navigator.language;
-
-            moment.locale(locale);
-
-            let localeData = moment.localeData();
-            this.dateFormat = localeData.longDateFormat('lll');
-
-            let logDate = this.activity.log_date;
-
-            let date = moment(logDate).format(this.dateFormat);
-
-            if (date != 'Invalid date') {
-                this.activityCreationDate = date;
-            } else {
-                this.activityCreationDate = this.$i18n.get('info_unknown_date');
-            }
-        },
-        methods: {
-            approveActivity(){
-                this.$emit('approveActivity', this.activity.id);
-            },
-            notApproveActivity(){
-                this.$emit('notApproveActivity', this.activity.id);
-            },
-            undo(){
-
-            }
-        }
-    }
-</script>
-
-<style lang="scss" scoped>
-
-    @import "../../scss/_variables.scss";
-
-    .tainacan-modal-title {
-        align-self: baseline;
-        display: flex;
-        flex-direction: column;
-        width: 100%;
-    }
-
-    .tainacan-modal-content {
-        width: auto;
-        min-height: 600px;
-    }
-
-    .modal-card-body {
-        min-height: 400px;
-    }
-
-    .tainacan-attachments-in-modal {
-        display: flex;
-        flex-wrap: wrap;
-        flex-direction: row;
-        align-content: baseline;
-        resize: vertical;
-        overflow-y: auto;
-        overflow-x: hidden;
-        height: 200px;
-        border: 1px solid $gray3;
-
-        &>div {
-            margin: 0.5rem;
-        }
-    }
-
-    .tainacan-p-overflow {
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        max-width: 150px;
-        overflow: hidden;
-    }
-
-    .tainacan-p-break {
-        word-break: break-word;
-    }
-
-    .tainacan-figure {
-        width: 150px;
-        height: 150px;
-        overflow: auto;
-    }
-</style>
\ No newline at end of file
diff --git a/src/admin/components/other/available-exporters-modal.vue b/src/admin/components/other/available-exporters-modal.vue
index 509ad676d..dcd175aa9 100644
--- a/src/admin/components/other/available-exporters-modal.vue
+++ b/src/admin/components/other/available-exporters-modal.vue
@@ -1,5 +1,12 @@
 <template>
-    <form action="">
+    <form 
+            action=""
+            autofocus
+            role="dialog"
+            class="tainacan-modal-content"
+            tabindex="-1"
+            aria-modal
+            ref="availableExportersModal">
         <div
                 class="tainacan-modal-content"
                 style="width: auto">
@@ -77,6 +84,9 @@
                     this.$console.log(error);
                     this.isLoading = false;
                 });
+
+            if (this.$refs.availableExportersModal)
+                this.$refs.availableExportersModal.focus();
         }
     }
 </script>
diff --git a/src/admin/components/other/available-importers-modal.vue b/src/admin/components/other/available-importers-modal.vue
index c1f1ad765..5a1c58d15 100644
--- a/src/admin/components/other/available-importers-modal.vue
+++ b/src/admin/components/other/available-importers-modal.vue
@@ -1,5 +1,12 @@
 <template>
-    <form action="">
+    <form 
+            action=""
+            autofocus
+            role="dialog"
+            class="tainacan-modal-content"
+            tabindex="-1"
+            aria-modal
+            ref="availableImportersModal">
         <div 
                 class="tainacan-modal-content" 
                 style="width: auto">
@@ -79,6 +86,9 @@ export default {
                 this.$console.log(error);
                 this.isLoading = false;
             });
+
+        if (this.$refs.availableImportersModal)
+            this.$refs.availableImportersModal.focus();
     }
 }
 </script>
diff --git a/src/admin/components/other/checkbox-radio-modal.vue b/src/admin/components/other/checkbox-radio-modal.vue
index 9cf44266a..33fc82151 100644
--- a/src/admin/components/other/checkbox-radio-modal.vue
+++ b/src/admin/components/other/checkbox-radio-modal.vue
@@ -1,5 +1,11 @@
 <template>
-    <div class="tainacan-modal-content">
+    <div 
+            autofocus
+            role="dialog"
+            class="tainacan-modal-content"
+            tabindex="-1"
+            aria-modal
+            ref="checkboxRadioModal">
         <header class="tainacan-modal-title">
             <h2 v-if="isFilter">{{ $i18n.get('filter') }} <em>{{ filter.name }}</em></h2>
             <h2 v-else>{{ $i18n.get('metadatum') }} <em>{{ metadatum.name }}</em></h2>
@@ -131,7 +137,7 @@
                             </b-field>
                             <li v-if="finderColumn.children.length">
                                 <div
-                                        v-if="totalRemaining[key].remaining === true || (finderColumn.length < totalRemaining[key].remaining)"
+                                        v-if="shouldShowMoreButton(key)"
                                         @click="getMoreOptions(finderColumn, key)"
                                         class="tainacan-show-more">
                                     <span class="icon">
@@ -200,7 +206,7 @@
                 </b-tab-item>
             </b-tabs>
             <!--<pre>{{ hierarchicalPath }}</pre>-->
-            <!-- <pre>{{ totalRemaining }}</pre> -->
+            <!--<pre>{{ totalRemaining }}</pre>-->
             <!--<pre>{{ selected }}</pre>-->
             <!--<pre>{{ options }}</pre>-->
             <!--<pre>{{ searchResults }}</pre>-->
@@ -272,11 +278,11 @@
 <script>
     import qs from 'qs';
     import { tainacan as axios, isCancel } from '../../../js/axios/axios';
-    import { filter_type_mixin } from '../../../classes/filter-types/filter-types-mixin';
+    import {  dynamicFilterTypeMixin } from '../../../classes/filter-types/filter-types-mixin';
 
     export default {
         name: 'CheckboxFilterModal',
-        mixins: [ filter_type_mixin ],
+        mixins: [ dynamicFilterTypeMixin ],
         props: {
             isFilter: {
                 type: Boolean,
@@ -286,8 +292,8 @@
             parent: Number,
             taxonomy_id: Number,
             taxonomy: String,
-            collection_id: Number,
-            metadatum_id: Number,
+            collectionId: Number,
+            metadatumId: Number,
             metadatum: Object,
             selected: Array,
             isTaxonomy: {
@@ -295,7 +301,7 @@
                 default: false,
             },
             metadatum_type: String,
-            metadatum_object: Object,
+            query: Object,
             isRepositoryLevel: Boolean,
             isCheckbox: {
                 type: Boolean,
@@ -318,7 +324,6 @@
                 maxNumSearchResultsShow: 20,
                 maxNumOptionsCheckboxFinderColumns: 100,
                 checkboxListOffset: 0,
-                collection: this.collection_id,
                 isCheckboxListLoading: false,
                 isSearchingLoading: false,
                 noMorePage: 0,
@@ -345,7 +350,14 @@
                 this.getOptions(0);
             }
         },
+        mounted() {
+            if (this.$refs.checkboxRadioModal)
+                this.$refs.checkboxRadioModal.focus()
+        },
         methods: {
+            shouldShowMoreButton(key) {
+                return this.totalRemaining[key].remaining === true || (this.finderColumns[key].children.length < this.totalRemaining[key].remaining);
+            },
             fetchSelectedLabels() {
 
                 let selected = this.selected instanceof Array ? this.selected : [this.selected];
@@ -443,7 +455,7 @@
                 if ( this.metadatum_type === 'Tainacan\\Metadata_Types\\Relationship' )
                     promise = this.getValuesRelationship( this.optionName, this.isRepositoryLevel, [], offset, this.maxNumOptionsCheckboxList, true);
                 else
-                    promise = this.getValuesPlainText( this.metadatum_id, this.optionName, this.isRepositoryLevel, [], offset, this.maxNumOptionsCheckboxList, true);
+                    promise = this.getValuesPlainText( this.metadatumId, this.optionName, this.isRepositoryLevel, [], offset, this.maxNumOptionsCheckboxList, true);
                 
                 promise.request
                     .then((data) => {
@@ -486,10 +498,10 @@
                     if (!this.isFilter)
                         query += '&hideempty=0';
 
-                    let route = `/collection/${this.collection_id}/facets/${this.metadatum_id}${query}`;
+                    let route = `/collection/${this.collectionId}/facets/${this.metadatumId}${query}`;
 
-                    if(this.collection_id == 'default' || this.collection_id == 'filter_in_repository'){
-                        route = `/facets/${this.metadatum_id}${query}`
+                    if(this.collectionId == 'default'){
+                        route = `/facets/${this.metadatumId}${query}`
                     }
 
                     axios.get(route)
@@ -609,10 +621,10 @@
 
                 this.isColumnLoading = true;
 
-                let route = `/collection/${this.collection_id}/facets/${this.metadatum_id}${query}`;
+                let route = `/collection/${this.collectionId}/facets/${this.metadatumId}${query}`;
 
-                if(this.collection_id == 'default' || this.collection_id == 'filter_in_repository'){
-                    route = `/facets/${this.metadatum_id}${query}`
+                if (this.collectionId == 'default'){
+                    route = `/facets/${this.metadatumId}${query}`
                 }
                 
                 axios.get(route)
@@ -646,10 +658,10 @@
 
                     this.isColumnLoading = true;
 
-                    let route = `/collection/${this.collection_id}/facets/${this.metadatum_id}${query}`;
+                    let route = `/collection/${this.collectionId}/facets/${this.metadatumId}${query}`;
 
-                    if(this.collection_id == 'default' || this.collection_id == 'filter_in_repository'){
-                        route = `/facets/${this.metadatum_id}${query}`
+                    if (this.collectionId == 'default'){
+                        route = `/facets/${this.metadatumId}${query}`
                     }
 
                     axios.get(route)
@@ -674,21 +686,21 @@
             applyFilter() {
                 this.$parent.close();
 
-                if(this.isTaxonomy && this.isFilter){
+                if (this.isTaxonomy && this.isFilter) {
                     this.$eventBusSearch.$emit('input', {
                         filter: 'checkbox',
                         taxonomy: this.taxonomy,
                         compare: 'IN',
-                        metadatum_id: this.metadatum_id,
-                        collection_id: this.collection_id,
+                        metadatum_id: this.metadatumId ? this.metadatumId : this.filter.metatadum_id,
+                        collection_id: this.collectionId ? this.collectionId : this.filter.collection_id,
                         terms: this.selected
                     });         
                 } else if(this.isFilter) {
                     this.$eventBusSearch.$emit('input', {
                         filter: 'checkbox',
                         compare: 'IN',
-                        metadatum_id: this.metadatum_id,
-                        collection_id: this.collection_id ? this.collection_id : this.filter.collection_id,
+                        metadatum_id: this.metadatumId ? this.metadatumId : this.filter.metatadum_id,
+                        collection_id: this.collectionId ? this.collectionId : this.filter.collection_id,
                         value: this.selected,
                     });
                 } else {
diff --git a/src/admin/components/other/collections-modal.vue b/src/admin/components/other/collections-modal.vue
index 20137a205..665de1135 100644
--- a/src/admin/components/other/collections-modal.vue
+++ b/src/admin/components/other/collections-modal.vue
@@ -1,5 +1,12 @@
 <template>
-    <form action="">
+    <form 
+            action=""
+            autofocus
+            role="dialog"
+            class="tainacan-modal-content"
+            tabindex="-1"
+            aria-modal
+            ref="collectionsModal">
         <div 
                 class="tainacan-modal-content" 
                 style="width: auto">
@@ -18,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">
@@ -74,6 +87,9 @@ export default {
                 this.$console.log(error);
                 this.isLoading = false;
             });
+
+        if (this.$refs.collectionsModal)
+            this.$refs.collectionsModal.focus();
     }
 }
 </script>
diff --git a/src/admin/components/other/custom-dialog.vue b/src/admin/components/other/custom-dialog.vue
index 6e81f69e0..6ac77a7d0 100644
--- a/src/admin/components/other/custom-dialog.vue
+++ b/src/admin/components/other/custom-dialog.vue
@@ -1,9 +1,11 @@
 <template>
     <div 
             aria-labelledby="alert-dialog-title"
-            aria-modal="true"
+            aria-modal
+            autofocus
             role="alertdialog"
-            class="tainacan-form dialog">
+            class="tainacan-form dialog"
+            ref="customDialog">
         <div    
                 class="modal-card" 
                 style="width: auto">
@@ -87,6 +89,10 @@
             changeNeverShowMessageAgain($event) {
                 this.$userPrefs.set('neverShow' + this.messageKeyForUserPrefs + 'Dialog', $event);
             }
+        },
+        mounted() {
+            if (this.$refs.customDialog)
+                this.$refs.customDialog.focus();
         }
     }
 </script>
diff --git a/src/admin/components/other/document-item.vue b/src/admin/components/other/document-item.vue
index 2c92a8c87..03d0acca0 100644
--- a/src/admin/components/other/document-item.vue
+++ b/src/admin/components/other/document-item.vue
@@ -11,7 +11,10 @@
         <!-- Preview Modal ----------------- -->
         <b-modal
                 :active.sync="isPreviewModalActive"
-                scroll="keep">
+                scroll="keep"
+                trap-focus
+                aria-modal
+                aria-role="dialog">
             <!-- <div class="tainacan-modal-content">
                 <div class="tainacan-modal-title">
                     <h2>{{ $i18n.get('label_document') }}</h2>
@@ -20,7 +23,11 @@
                             class="back-link">{{ $i18n.get('exit') }}</a>
                     <hr>
                 </div> -->
-                <div    
+                <div     
+                        autofocus
+                        role="dialog"
+                        tabindex="-1"
+                        aria-modal
                         class="is-flex rendered-content"
                         v-html="documentHtml" />
             <!-- </div> -->
@@ -32,9 +39,13 @@
 export default {
     name: 'DocumentItem',
     props: {
-        documentHtml: String,
-        isSelected: false,
-        isPreviewModalActive: false
+        documentHtml: String
+    },
+    data() {
+        return {
+            isSelected: false,
+            isPreviewModalActive: false
+        }
     }
 }
 </script>
diff --git a/src/admin/components/other/exposers-modal.vue b/src/admin/components/other/exposers-modal.vue
index 7b4c1318a..842c8f228 100644
--- a/src/admin/components/other/exposers-modal.vue
+++ b/src/admin/components/other/exposers-modal.vue
@@ -1,10 +1,13 @@
 <template>
     <div 
             aria-labelledby="exposers-modal-title"
+            autofocus
             role="dialog"
-            aria-modal="true"
+            tabindex="-1"
+            aria-modal
             class="tainacan-modal-content" 
-            style="width: auto">
+            style="width: auto"
+            ref="exposersModal">
         <header class="tainacan-modal-title">
             <h2 
                     id="exposers-modal-title"
@@ -469,6 +472,9 @@ export default {
 
         if (this.itemId)
             this.shouldRespectFetchOnly = false;
+
+        if (this.$refs.exposersModal)
+            this.$refs.exposersModal.focus()
     }
 }
 </script>
diff --git a/src/admin/components/other/file-item.vue b/src/admin/components/other/file-item.vue
index f54bd3505..abf40bb02 100644
--- a/src/admin/components/other/file-item.vue
+++ b/src/admin/components/other/file-item.vue
@@ -32,8 +32,16 @@
             <b-modal
                     :active.sync="isPreviewModalActive"
                     :width="1024"
-                    scroll="keep">
-                <div class="tainacan-modal-content">
+                    scroll="keep"
+                    trap-focus
+                    aria-modal
+                    aria-role="dialog">
+                <div 
+                        autofocus
+                        role="dialog"
+                        tabindex="-1"
+                        aria-modal
+                        class="tainacan-modal-content">
                     <div class="tainacan-modal-title">
                         <h2 v-if="file.title != undefined">{{ file.title.rendered }}</h2>
                     </div>
diff --git a/src/admin/components/other/help-button.vue b/src/admin/components/other/help-button.vue
index 8753e04b9..78b0c8b35 100644
--- a/src/admin/components/other/help-button.vue
+++ b/src/admin/components/other/help-button.vue
@@ -54,7 +54,7 @@ export default {
         display: block;
         border-radius: 5px;
         min-width: 250px;
-        min-width: 250px;
+        max-width: 100%;
         transition: margin-bottom 0.2s ease, opacity 0.3s ease;
         position: absolute;
         bottom: calc(100% - 6px);
@@ -76,6 +76,7 @@ export default {
             padding: 0.8em 1.0em 1.0em 1.0em;
             font-size: 11px;
             font-weight: normal;
+            white-space: normal;
         }
 
         &:before {
diff --git a/src/admin/components/other/item-copy-dialog.vue b/src/admin/components/other/item-copy-dialog.vue
index 5d276bc9b..86af52b14 100644
--- a/src/admin/components/other/item-copy-dialog.vue
+++ b/src/admin/components/other/item-copy-dialog.vue
@@ -1,9 +1,12 @@
 <template>
     <div 
             aria-labelledby="alert-dialog-title"
-            aria-modal="true"
+            autofocus
             role="alertdialog"
-            class="tainacan-form dialog">
+            tabindex="-1"
+            aria-modal
+            class="tainacan-form dialog"
+            ref="itemCopyDialog">
         <div    
                 class="modal-card" 
                 style="width: auto">
@@ -183,6 +186,10 @@
             this.isCreatingBulkEditGroup = false;
             this.isCreatingSequenceEditGroup = false;
             this.copyCount = 1;
+        },
+        mounted() {
+            if (this.$refs.itemCopyDialog)
+            this.$refs.itemCopyDialog.focus();
         }
     }
 </script>
diff --git a/src/admin/components/repository/collection-filter/collection-filter.vue b/src/admin/components/repository/collection-filter/collection-filter.vue
index a4c22d6c5..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"
@@ -26,11 +27,18 @@
                     <b-checkbox
                             v-model="collectionsIdsToFilter"
                             :native-value="collection.id"
-                            @input="apply_filter">
+                            @input="applyFilter">
                         {{ collection.name }}
                     </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>
@@ -60,7 +68,7 @@
                 Array.isArray(routeQueries.metaquery[0].value)){
                 this.collectionsIdsToFilter = routeQueries.metaquery[0].value;
 
-                this.apply_filter();
+                this.applyFilter();
             }
         },
         data(){
@@ -84,7 +92,7 @@
             ...mapGetters('collection', [
                 'getCollections',
             ]),
-            apply_filter(){
+            applyFilter(){
                 this.$eventBusSearch.$emit( 'input', {
                     filter: 'checkbox',
                     metadatum_id: 'collection_id',
diff --git a/src/admin/components/search/filters-tags-list.vue b/src/admin/components/search/filters-tags-list.vue
index c3cd5759a..a21fe2d40 100644
--- a/src/admin/components/search/filters-tags-list.vue
+++ b/src/admin/components/search/filters-tags-list.vue
@@ -1,25 +1,27 @@
 <template>
-    <div 
-            class="is-inline-flex"
-            v-if="filterTags != undefined && filterTags.length > 0">
-        <b-tag            
-                v-for="(filterTag, index) of filterTags"
-                :key="index"       
-                attached
-                closable
-                @close="removeMetaQuery(filterTag.filterId, filterTag.value, filterTag.singleValue)">
-            {{ filterTag.singleValue != undefined ? filterTag.singleValue : filterTag.value }}
-        </b-tag>
-        <button 
-                @click="clearAllFilters()"
-                id="button-clear-all"
-                class="button is-outlined">
-            {{ $i18n.get('label_clear_filters') }}
-        </button>
-    </div>
+    <transition name="filter-item">
+        <div 
+                class="is-inline-flex"
+                v-if="filterTags != undefined && filterTags.length > 0">
+            <b-tag            
+                    v-for="(filterTag, index) of filterTags"
+                    :key="index"       
+                    attached
+                    closable
+                    @close="removeMetaQuery(filterTag)">
+                {{ filterTag.singleLabel != undefined ? filterTag.singleLabel : filterTag.label }}
+            </b-tag>
+            <button 
+                    @click="clearAllFilters()"
+                    id="button-clear-all"
+                    class="button is-outlined">
+                {{ $i18n.get('label_clear_filters') }}
+            </button>
+        </div>
+    </transition>
 </template>
 <script>
-    import { mapGetters, mapActions } from 'vuex';
+    import { mapGetters } from 'vuex';
 
     export default {
         name: 'FiltersTagsList',
@@ -31,9 +33,9 @@
                 let tags = this.getFilterTags();
                 let flattenTags = [];
                 for (let tag of tags) {
-                    if (Array.isArray(tag.value)) {
-                        for (let valueTag of tag.value) 
-                            flattenTags.push({filterId: tag.filterId, value: tag, singleValue: valueTag}); 
+                    if (Array.isArray(tag.label)) {
+                        for (let i = 0; i < tag.label.length; i++) 
+                            flattenTags.push({filterId: tag.filterId, label: tag.label, singleLabel: tag.label[i], value: tag.value[i], taxonomy: tag.taxonomy, metadatumId: tag.metadatumId}); 
                     } else {
                         flattenTags.push(tag);
                     }
@@ -43,22 +45,22 @@
         },
         methods: {
             ...mapGetters('search',[
-                'getPostQuery',
                 'getFilterTags'
             ]),
-            ...mapActions('metadata',[
-                'fetchMetadatum'
-            ]),
-            removeMetaQuery(filterId, value, singleValue) {
-                if (singleValue != undefined)
-                    this.$eventBusSearch.removeMetaFromFilterTag({ filterId: filterId, singleValue: singleValue });
-                else
-                    this.$eventBusSearch.removeMetaFromFilterTag({ filterId: filterId, value: value });
+            removeMetaQuery({ filterId, value, singleLabel, label, taxonomy, metadatumId }) {
+                this.$eventBusSearch.removeMetaFromFilterTag({ 
+                    filterId: filterId,
+                    singleLabel: singleLabel,
+                    label: label,
+                    value: value, 
+                    taxonomy: taxonomy,
+                    metadatumId: metadatumId 
+                });
             },
             clearAllFilters() {
                 // this.$eventBusSearch.clearAllFilters();
                 for (let tag of this.filterTags) {
-                    this.removeMetaQuery(tag.filterId, tag.value, tag.singleValue);
+                    this.removeMetaQuery(tag);
                 }
             }
         }
diff --git a/src/admin/components/search/pagination.vue b/src/admin/components/search/pagination.vue
index 852de4200..339207b0c 100644
--- a/src/admin/components/search/pagination.vue
+++ b/src/admin/components/search/pagination.vue
@@ -69,7 +69,8 @@
                 <b-dropdown 
                         position="is-top-right"
                         @change="onPageChange"
-                        aria-role="list">
+                        aria-role="list"
+                        trap-focus>
                     <button
                             aria-labelledby="go-to-page-dropdown"
                             class="button is-white"
diff --git a/src/admin/components/search/skeleton-items-list.vue b/src/admin/components/search/skeleton-items-list.vue
deleted file mode 100644
index 3c644742b..000000000
--- a/src/admin/components/search/skeleton-items-list.vue
+++ /dev/null
@@ -1,254 +0,0 @@
-<template>
-<div class="table-container">
-    <div class="selection-control">
-        <div class="field select-all is-pulled-left">
-            <span>
-                <b-checkbox disabled>{{ $i18n.get('label_select_all_items_page') }}</b-checkbox>
-            </span>
-        </div>
-        <div class="field is-pulled-right">
-            <b-dropdown
-                    position="is-bottom-left"
-                    disabled>
-                <button
-                        class="button is-white"
-                        slot="trigger">
-                    <span>{{ $i18n.get('label_bulk_actions') }}</span>
-                    <span class="icon">
-                        <i class="tainacan-icon tainacan-icon-20px tainacan-icon-arrowdown"/>
-                    </span>
-                </button>
-            </b-dropdown>
-        </div>
-    </div>
-
-    <div class="table-wrapper">
-        <table 
-                v-if="viewMode == 'table'"
-                class="tainacan-table">
-            <thead>
-                <th class="skeleton column-default-width" />
-            </thead>
-            <tbody>
-                <tr     
-                        class="skeleton"
-                        :key="item"
-                        v-for="item in itemsPerPage">
-                    <td class="column-default-width"/>
-                </tr>
-            </tbody>
-        </table>
-        <div 
-                v-if="viewMode == 'cards' || viewMode == 'grid'"
-                :class="{
-                    'tainacan-cards-container': viewMode == 'cards',
-                    'tainacan-grid-container': viewMode == 'grid'
-                }">
-            <div 
-                    :key="item"
-                    v-for="item in itemsPerPage"
-                    class="skeleton" 
-                    :class="{
-                        'tainacan-card': viewMode == 'cards',
-                        'tainacan-grid-item': viewMode == 'grid'
-                    }"/>
-        </div>
-        <masonry
-                :cols="getMasonryColsSettings()"
-                :gutter="viewMode == 'masonry' ? 25 : 30"
-                v-if="viewMode == 'masonry' || viewMode == 'records'"
-                :class="{
-                    'tainacan-masonry-container': viewMode == 'masonry',
-                    'tainacan-records-container': viewMode == 'records'
-                }">
-            <div 
-                    :key="item"
-                    v-for="item in itemsPerPage"
-                    :style="{'min-height': randomHeightForMasonryItem() + 'px' }"
-                    class="skeleton" 
-                    :class="{
-                        'tainacan-masonry-item': viewMode == 'masonry',
-                        'tainacan-record': viewMode == 'records'
-                    }"/>
-        </masonry>
-    </div>
-</div>  
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-
-export default {
-    name: 'SkeletonItemsList',
-    computed: {
-        itemsPerPage(){
-            return this.getItemsPerPage();
-        },
-        viewMode() {
-            return this.getAdminViewMode();
-        },
-    },
-    methods: {
-        ...mapGetters('search', [
-            'getItemsPerPage',
-            'getAdminViewMode',
-        ]),
-        getMasonryColsSettings() {
-            if (this.viewMode == 'masonry')
-                return { default: 7, 1919: 6, 1407: 5, 1215: 4, 1023: 3, 767: 2, 343: 1 } 
-            else
-                return { default: 4, 1919: 3, 1407: 2, 1215: 2, 1023: 1, 767: 1, 343: 1 }
-
-        },
-        randomHeightForMasonryItem() {
-            let min = 255;
-            let max = 255;
-
-            if (this.viewMode == 'masonry') {
-                min = 140;
-                max = 420;
-            } else if (this.viewMode == 'records') {
-                min = 380;
-                max = 480;
-            }
-
-            return Math.floor(Math.random()*(max-min+1)+min);
-        }
-    }
-}
-
-</script>
-
-<style lang="scss" scoped>
-
-    @import '../../scss/_variables.scss';
-
-    // Selection Area
-    .selection-control {
-        
-        padding: 6px 0px 0px 12px;
-        background: white;
-        height: 40px;
-
-        .select-all {
-            color: $gray4;
-            font-size: 0.875rem;
-            &:hover {
-                color: $gray4;
-            }
-        }
-    }
-
-    // Cards View Mode
-    .tainacan-cards-container {
-        min-height: 50vh;
-        padding: 0;
-        display: -ms-grid;
-        display: grid;
-        grid-template-columns: repeat(auto-fill, 455px);
-        grid-gap: 0px;
-        justify-content: space-evenly;
-        animation-name: item-appear;
-        animation-duration: 0.5s;
-
-        @media screen and (max-width: 480px) {    
-            width: 91.666666667%;  
-            grid-template-columns: repeat(auto-fill, 100%);
-        }
-
-        .tainacan-card {
-            padding: 0px;
-            flex-basis: 0;
-            margin: 15px;
-            max-width: 425px;
-            min-width: 425px;
-            min-height: 210px;
-            max-height: 210px;
-
-            @media screen and (max-width: 480px) {
-                max-width: 100%;
-                min-width: 100%;
-                min-height: 171px;
-                max-height: 171px;
-
-                img {
-                    width: 130px !important;
-                    height: 130px !important;
-                }
-            }
-        }
-    }
-
-    // Thumbnails (Grid) View Mode
-    .tainacan-grid-container {
-        min-height: 50vh;
-        padding: 0;
-        display: -ms-grid;
-        display: grid;
-        grid-template-columns: repeat(auto-fill, 285px);
-        grid-gap: 0px;
-        justify-content: space-evenly;
-        animation-name: appear;
-        animation-duration: 0.5s;
-
-        .tainacan-grid-item {
-            max-width: 255px;
-            min-height: 300px;
-            flex-basis: 0;
-            margin: 15px;
-            text-align: center;
-        }
-    }
-
-    // Masonry View Mode
-    .tainacan-masonry-container {
-        min-height: 50vh;
-        padding: 0;
-        display: flex;
-        flex-wrap: wrap;
-        flex-grow: 1;
-        flex-shrink: 1;
-        justify-content: space-evenly;
-        animation-name: item-appear;   
-        animation-duration: 0.5s;
-
-        .tainacan-masonry-item {
-            display: block;
-            width: 100%;
-            flex-basis: 0;
-            margin-bottom: 25px;
-        }
-    }
-
-    // Records View Mode
-    .tainacan-records-container {
-        min-height: 50vh;
-        padding: 0;
-        display: flex;
-        flex-wrap: wrap;
-        flex-grow: 1;
-        flex-shrink: 1;
-        justify-content: space-evenly;
-        animation-name: item-appear;
-        animation-duration: 0.5s;
-
-        .tainacan-record {
-            background-color: #f6f6f6;
-            padding: 0px;
-            flex-basis: 0;
-            margin: 0 auto 30px auto;
-            width: 100%;
-            max-width: 425px;
-            min-height: 100px;
-            display: block;
-        }
-    }
-
-    // Table View Mode
-    table.tainacan-table {
-        border-spacing: 6px !important;
-        th { height: 38px; }
-        td { height: 52px; }
-    }
-
-</style>
\ No newline at end of file
diff --git a/src/admin/js/main.js b/src/admin/js/main.js
index 6a5de4576..6635fcbff 100644
--- a/src/admin/js/main.js
+++ b/src/admin/js/main.js
@@ -23,18 +23,20 @@ import FormRelationship from '../../classes/metadata-types/relationship/FormRela
 import FormTaxonomy from '../../classes/metadata-types/taxonomy/FormTaxonomy.vue';
 import FormSelectbox from '../../classes/metadata-types/selectbox/FormSelectbox.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';
 import FilterAutocomplete from '../../classes/filter-types/autocomplete/Autocomplete.vue';
 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 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 FormDate from '../../classes/filter-types/date/FormDate.vue';
 
 import TainacanFormItem from '../../classes/metadata-types/tainacan-form-item.vue';
@@ -50,9 +52,13 @@ 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);
@@ -80,7 +86,6 @@ 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);
@@ -89,8 +94,14 @@ Vue.component('tainacan-filter-checkbox', FilterCheckbox);
 Vue.component('tainacan-filter-taginput', FilterTaginput);
 Vue.component('tainacan-filter-taxonomy-checkbox', FilterTaxonomyCheckbox);
 Vue.component('tainacan-filter-taxonomy-taginput', FilterTaxonomyTaginput);
+Vue.component('tainacan-filter-numeric-interval', FilterNumericInterval);
+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-date', FormDate);
 
 /* Others */
@@ -115,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 9c96f120e..92841fa21 100644
--- a/src/admin/js/theme-main.js
+++ b/src/admin/js/theme-main.js
@@ -5,16 +5,16 @@ 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';
 import FilterAutocomplete from '../../classes/filter-types/autocomplete/Autocomplete.vue';
 import FilterCheckbox from '../../classes/filter-types/checkbox/Checkbox.vue';
 import FilterTaginput from '../../classes/filter-types/taginput/Taginput.vue';
-
 import FilterTaxonomyCheckbox from '../../classes/filter-types/taxonomy/Checkbox.vue';
 import FilterTaxonomyTaginput from '../../classes/filter-types/taxonomy/Taginput.vue';
+import FilterNumericInterval from '../../classes/filter-types/numeric-interval/NumericInterval.vue';
+import FilterNumericListInterval from '../../classes/filter-types/numeric-list-interval/NumericListInterval.vue';
 
 import TaincanFiltersList from '../../classes/filter-types/tainacan-filter-item.vue';
 import ItemsPage from '../pages/lists/items-page.vue';
@@ -33,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);
@@ -43,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);
@@ -56,6 +54,8 @@ Vue.component('tainacan-filter-checkbox', FilterCheckbox);
 Vue.component('tainacan-filter-taginput', FilterTaginput);
 Vue.component('tainacan-filter-taxonomy-checkbox', FilterTaxonomyCheckbox);
 Vue.component('tainacan-filter-taxonomy-taginput', FilterTaxonomyTaginput);
+Vue.component('tainacan-filter-numeric-interval', FilterNumericInterval);
+Vue.component('tainacan-filter-numeric-list-interval', FilterNumericListInterval);
 
 /* Others */
 Vue.component('items-page', ItemsPage);
@@ -76,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: '',
@@ -87,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
@@ -104,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/js/utilities.js b/src/admin/js/utilities.js
index 36782f43d..056594da6 100644
--- a/src/admin/js/utilities.js
+++ b/src/admin/js/utilities.js
@@ -227,9 +227,6 @@ RouterHelperPlugin.install = function (Vue, options = {}) {
         getFiltersPath(query) {
             return '/filters/?' + qs.stringify(query);
         },
-        getMetadataPath(query) {
-            return '/metadata/?' + qs.stringify(query);
-        },
         getActivitiesPath(query) {
             return '/activities/?' + qs.stringify(query);
         },
@@ -302,14 +299,23 @@ RouterHelperPlugin.install = function (Vue, options = {}) {
         getItemEditPath(collectionId, itemId) {
             return '/collections/' + collectionId + '/items/' + itemId + '/edit';
         },
-        getFilterEditPath(id) {
-            return '/filters/' + id + '/edit';
+        getMetadataEditPath(metadatumId) {
+            return '/metadata/?edit=' + metadatumId;
+        },
+        getFilterEditPath(filterId) {
+            return '/filters/?edit=' + filterId;
+        },
+        getCollectionMetadataEditPath(collectionId, metadatumId) {
+            return '/collections/' + collectionId + '/metadata/?edit=' + metadatumId;
+        },
+        getCollectionFilterEditPath(collectionId, filterId) {
+            return '/collections/' + collectionId + '/filters/?edit=' + filterId;
         },
         getTaxonomyEditPath(id, isRecent) {
             return isRecent != undefined ? '/taxonomies/' + id + '/edit?recent=true'  : '/taxonomies/' + id + '/edit';
         },
         getTermEditPath(taxonomyId, termId) {
-            return '/taxonomies/' + taxonomyId + '/terms/' + termId + '/edit';
+            return '/taxonomies/' + taxonomyId + '/edit?tab=terms';
         },
         getImporterEditionPath(importerType) {
             return '/importers/' + importerType;
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 f7faa2cfe..9dfcd8c48 100644
--- a/src/admin/pages/lists/activities-page.vue
+++ b/src/admin/pages/lists/activities-page.vue
@@ -5,7 +5,7 @@
                     'repository-level-page': isRepositoryLevel,
                     'page-container': isRepositoryLevel
                 }">
-            <tainacan-title 
+            <tainacan-title
                     v-if="!isItemLevel"
                     :bread-crumb-items="[{ path: '', label: this.$i18n.get('activities') }]"/>
             <div :class="{ 'above-subheader': isRepositoryLevel }">
@@ -14,20 +14,89 @@
                         v-if="isRepositoryLevel"
                         class="tabs">
                     <ul>
-                        <li 
+                        <li
                                 @click="onChangeTab('')"
                                 :class="{ 'is-active': tab == undefined || tab == ''}"><a>{{ $i18n.get('activities') }}</a></li>
-                        <li 
+                        <li
                                 @click="onChangeTab('processes')"
                                 :class="{ 'is-active': tab == 'processes'}"><a>{{ $i18n.get('processes') }}</a></li>
                     </ul>
                 </div>
 
-                <b-loading 
+                <b-loading
                         :is-full-page="false"
                         :active.sync="isLoading" 
                         :can-cancel="false"/>
 
+                <div 
+                        v-if="tab != 'processes'"
+                        class="sub-header">
+
+                    <b-field class="header-item">
+                        <b-datepicker
+                                ref="datepicker"
+                                :placeholder="$i18n.get('instruction_filter_activities_date')"
+                                v-model="searchDates"
+                                range
+                                @input="searchActivities()"
+                                :date-formatter="(date) => dateFormatter(date)"
+                                :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'),
+                                    $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')
+                                ]"
+                                :month-names="[
+                                    $i18n.get('datepicker_month_january'),
+                                    $i18n.get('datepicker_month_february'),
+                                    $i18n.get('datepicker_month_march'),
+                                    $i18n.get('datepicker_month_april'),
+                                    $i18n.get('datepicker_month_may'),
+                                    $i18n.get('datepicker_month_june'),
+                                    $i18n.get('datepicker_month_july'),
+                                    $i18n.get('datepicker_month_august'),
+                                    $i18n.get('datepicker_month_september'),
+                                    $i18n.get('datepicker_month_october'),
+                                    $i18n.get('datepicker_month_november'),
+                                    $i18n.get('datepicker_month_december')
+                                ]"/>
+                        <p
+                                class="control"
+                                v-if="searchDates && searchDates.length != 0">
+                            <button 
+                                    class="button"
+                                    @click="clearSearchDates()">
+                                <span class="icon"><i class="tainacan-icon tainacan-icon-close"/></span>
+                            </button>
+                        </p>
+                    </b-field>
+
+                    <b-field class="header-item">
+                        <div class="control has-icons-right  is-small is-clearfix">
+                            <input
+                                    class="input is-small"
+                                    :placeholder="$i18n.get('instruction_search')"
+                                    type="search"
+                                    :aria-label="$i18n.get('instruction_search') + ' ' + $i18n.get('activities')"
+                                    autocomplete="on"
+                                    v-model="searchQuery"
+                                    @keyup.enter="searchActivities()">
+                            <span
+                                    @click="searchActivities()"
+                                    class="icon is-right">
+                                <i class="tainacan-icon tainacan-icon-search" />
+                            </span>
+                        </div>
+                    </b-field>
+                </div>
+
                 <activities-list
                         v-if="tab != 'processes'"
                         :is-loading="isLoading"
@@ -149,11 +218,13 @@
 <script>
     import ActivitiesList from "../../components/lists/activities-list.vue";
     import ProcessesList from "../../components/lists/processes-list.vue";
+    import { dateInter } from "../../../admin/js/mixins";
     import { mapActions, mapGetters } from 'vuex';
     import moment from 'moment'
 
     export default {
         name: 'ActivitiesPage',
+        mixins: [ dateInter ],
         data(){
             return {
                 isLoading: false,
@@ -165,6 +236,8 @@
                 isRepositoryLevel: false,
                 tab: '',
                 isItemLevel: false,
+                searchQuery: '',
+                searchDates: []
             }
         },
         components: {
@@ -237,10 +310,15 @@
             loadActivities() {
                 this.isLoading = true;
 
+                let dataInit = this.searchDates && this.searchDates[0] ? moment(this.searchDates[0]).format('YYYY-MM-DD') : null; 
+                let dataEnd = this.searchDates && this.searchDates[1] ? moment(this.searchDates[1]).format('YYYY-MM-DD') : null; 
+
                 if(this.isRepositoryLevel) {
                     this.fetchActivities({
                         'page': this.activitiesPage,
-                        'activitiesPerPage': this.activitiesPerPage
+                        'activitiesPerPage': this.activitiesPerPage,
+                        'search': this.searchQuery,
+                        'searchDates': [dataInit, dataEnd]
                     })
                         .then((res) => {
                             this.isLoading = false;
@@ -253,7 +331,9 @@
                     this.fetchCollectionActivities({
                         'page': this.activitiesPage,
                         'activitiesPerPage': this.activitiesPerPage,
-                        'collectionId': this.$route.params.collectionId
+                        'collectionId': this.$route.params.collectionId,
+                        'search': this.searchQuery,
+                        'searchDates': [dataInit, dataEnd]
                     })
                         .then((res) => {
                             this.isLoading = false;
@@ -266,7 +346,9 @@
                     this.fetchItemActivities({
                         'page': this.activitiesPage,
                         'activitiesPerPage': this.activitiesPerPage,
-                        'itemId': this.$route.params.itemId
+                        'itemId': this.$route.params.itemId,
+                        'search': this.searchQuery,
+                        'searchDates': [dataInit, dataEnd]
                     })
                         .then((res) => {
                             this.isLoading = false;
@@ -300,6 +382,25 @@
             getLastProcessesNumber() {
                 let last = (Number(this.processesPerPage * (this.processesPage - 1)) + Number(this.processesPerPage));
                 return last > this.total ? this.total : last;
+            },
+            searchActivities() {
+                this.activitiesPage = 1;
+                this.loadActivities();
+            },
+            clearSearchDates() {
+                this.searchDates = null;
+                this.searchActivities();
+            },
+            dateFormatter(dateObject) {
+                if (dateObject == null || dateObject.length == 0 || dateObject[0] == null || dateObject[1] == null)
+                    return "";
+                return moment(dateObject[0], moment.ISO_8601).format(this.dateFormat) + " - " + moment(dateObject[1], moment.ISO_8601).format(this.dateFormat);
+            },
+            dateParser(dateString) { 
+                return [
+                    moment(dateString[0], this.dateFormat).toDate(),
+                    moment(dateString[1], this.dateFormat).toDate()
+                ];
             }
         },
         computed: {
@@ -357,15 +458,60 @@
     @import '../../scss/_variables.scss';
 
     .sub-header {
-        min-height: $header-height;
+        min-height: $subheader-height;
         height: $header-height;
         padding-left: 0;
         padding-right: 0;
         border-bottom: 1px solid #ddd;
+        display: inline-flex;
+        justify-content: space-between;
+        align-items: center;
+        width: 100%;
 
         .header-item {
-            display: inline-block;
-            padding-right: 8em;
+            margin-bottom: 0 !important;
+
+            &:not(:last-child) {
+                padding-right: 0.5em;
+            }
+
+            .label {
+                font-size: 0.875rem;
+                font-weight: normal;
+                margin-top: 3px;
+                margin-bottom: 2px;
+                cursor: default;
+            }
+
+            .button {
+                display: flex;
+                align-items: center;
+                border-radius: 0 !important;
+                height: 1.95rem !important;
+            }
+            
+            .field {
+                align-items: center;
+            }
+
+            .gray-icon, .gray-icon .icon {
+                color: $gray4 !important;
+                padding-right: 10px;
+            }
+            .gray-icon .icon i::before, 
+            .gray-icon i::before {
+                font-size: 1.3125rem !important;
+                max-width: 26px;
+            }
+
+            .icon {
+                pointer-events: all;
+                cursor: pointer;
+                color: $blue5;
+                height: 27px;
+                font-size: 18px !important;
+                height: 1.75rem !important;
+            }
         }
 
         @media screen and (max-width: 769px) {
@@ -373,8 +519,8 @@
             margin-top: -0.5em;
             padding-top: 0.9em;
 
-            .header-item {
-                padding-right: 0.5em;
+            .header-item:not(:last-child) {
+                padding-right: 0.2em;
             }
         }
     }
diff --git a/src/admin/pages/lists/collections-page.vue b/src/admin/pages/lists/collections-page.vue
index e4afbda4a..cbb1acca4 100644
--- a/src/admin/pages/lists/collections-page.vue
+++ b/src/admin/pages/lists/collections-page.vue
@@ -11,7 +11,8 @@
             <div class="header-item">
                 <b-dropdown 
                         aria-role="list"
-                        id="collection-creation-options-dropdown">
+                        id="collection-creation-options-dropdown"
+                        trap-focus>
                     <button
                             class="button is-secondary"
                             slot="trigger">
@@ -62,7 +63,8 @@
                         :mobile-modal="true"
                         :disabled="collections.length <= 0 || isLoading"
                         @input="onChangeOrder(order == 'asc' ? 'desc' : 'asc')"
-                        aria-role="list">
+                        aria-role="list"
+                        trap-focus>
                     <button
                             :aria-label="$i18n.get('label_sorting_direction')"
                             class="button is-white"
@@ -120,6 +122,25 @@
                     </option>
                 </b-select>
             </b-field>
+
+            <!-- Textual Search -------------->
+            <b-field class="header-item">
+                <div class="control has-icons-right is-small is-clearfix">
+                    <input
+                            class="input is-small"
+                            :placeholder="$i18n.get('instruction_search')"
+                            type="search"
+                            :aria-label="$i18n.get('instruction_search') + ' ' + $i18n.get('collections')"
+                            autocomplete="on"
+                            v-model="searchQuery"
+                            @keyup.enter="searchCollections()">
+                    <span
+                            @click="searchCollections()"
+                            class="icon is-right">
+                        <i class="tainacan-icon tainacan-icon-search" />
+                    </span>
+                </div>
+            </b-field>
         </div>
 
         <div class="above-subheader">
@@ -139,11 +160,11 @@
                         </a>
                     </li>
                     <li 
-                            v-for="(statusOption, index) of $statusHelper.getStatuses()"
+                            v-for="(statusOption, index) of $statusHelper.getStatuses().filter((status) => status.slug != 'draft')"
                             :key="index"
                             @click="onChangeTab(statusOption.slug)"
                             :class="{ 'is-active': status == statusOption.slug}"
-                            :style="{ marginRight: statusOption.slug == 'private' ? 'auto' : '', marginLeft: statusOption.slug == 'draft' ? 'auto' : '' }"
+                            :style="{ marginRight: statusOption.slug == 'private' ? 'auto' : '', marginLeft: statusOption.slug == 'trash' ? 'auto' : '' }"
                             v-tooltip="{
                                 content: $i18n.getWithVariables('info_%s_tab_' + statusOption.slug,[$i18n.get('collections')]),
                                 autoHide: true,
@@ -195,7 +216,8 @@
                                 <b-dropdown 
                                         :disabled="isLoadingMetadatumMappers"
                                         id="collection-creation-options-dropdown"
-                                        aria-role="list">
+                                        aria-role="list"
+                                        trap-focus>
                                     <button
                                             class="button is-secondary"
                                             slot="trigger">
@@ -307,6 +329,7 @@ export default {
             status: '',
             order: 'desc',
             ordeBy: 'date',
+            searchQuery: '',
             sortingOptions: [
                 { label: this.$i18n.get('label_title'), value: 'title' },
                 { label: this.$i18n.get('label_creation_date'), value: 'date' },
@@ -402,7 +425,8 @@ export default {
                 status: this.status,
                 contextEdit: true, 
                 order: this.order,
-                orderby: this.orderBy
+                orderby: this.orderBy,
+                search: this.searchQuery
             })
             .then((res) => {
                 this.isLoading = false;
@@ -421,9 +445,14 @@ export default {
             this.$buefy.modal.open({
                 parent: this,
                 component: AvailableImportersModal,
-                hasModalCard: true
+                hasModalCard: true,
+                trapFocus: true
             });
-        }
+        },
+        searchCollections() {
+            this.page = 1;
+            this.loadCollections();
+        },
     },
     created() {
         this.collectionsPerPage = this.$userPrefs.get('collections_per_page');
@@ -469,18 +498,23 @@ export default {
     @import '../../scss/_variables.scss';
 
     .sub-header {
-        min-height: $subheader-height;
-        height: $header-height;
+        min-height: $header-height;
+        height: auto;
         padding-left: 0;
         padding-right: 0;
         border-bottom: 1px solid #ddd;
         display: inline-flex;
         justify-content: space-between;
         align-items: center;
+        flex-wrap: wrap;
         width: 100%;
 
         .header-item {
+            margin-bottom: 0 !important;
 
+            &:first-child {
+                margin-right: auto;
+            }
             &:not(:last-child) {
                 padding-right: 0.5em;
             }
@@ -493,9 +527,13 @@ export default {
                 cursor: default;
             }
 
-            .button {
-                display: flex;
-                align-items: center;
+            &:not(:first-child) {
+                .button {
+                    display: flex;
+                    align-items: center;
+                    border-radius: 0 !important;
+                    height: 1.95rem !important;
+                }
             }
             
             .field {
@@ -511,14 +549,23 @@ export default {
                 font-size: 1.3125rem !important;
                 max-width: 26px;
             }
+
+            .icon {
+                pointer-events: all;
+                cursor: pointer;
+                color: $blue5;
+                height: 27px;
+                font-size: 18px !important;
+                height: 1.75rem !important;
+            }
         }
 
         @media screen and (max-width: 769px) {
-            height: 60px;
+            height: 120px;
             margin-top: -0.5em;
             padding-top: 0.9em;
-        
-            .header-item {
+
+            .header-item:not(:last-child) {
                 padding-right: 0.2em;
             }
         }
diff --git a/src/admin/pages/lists/items-page.vue b/src/admin/pages/lists/items-page.vue
index 61878f65e..0a0459615 100644
--- a/src/admin/pages/lists/items-page.vue
+++ b/src/admin/pages/lists/items-page.vue
@@ -232,7 +232,8 @@
                     <b-dropdown 
                             :mobile-modal="true"
                             id="item-creation-options-dropdown"
-                            aria-role="list">
+                            aria-role="list"
+                            trap-focus>
                         <button
                                 class="button is-secondary"
                                 slot="trigger">
@@ -306,7 +307,8 @@
                             :mobile-modal="true"
                             :disabled="totalItems <= 0 || adminViewMode == 'grid'|| adminViewMode == 'cards' || adminViewMode == 'masonry'"
                             class="show metadata-options-dropdown"
-                            aria-role="list">
+                            aria-role="list"
+                            trap-focus>
                         <button
                                 :aria-label="$i18n.get('label_displayed_metadata')"
                                 class="button is-white"
@@ -348,7 +350,8 @@
                         <b-dropdown
                                 :mobile-modal="true"
                                 @input="onChangeOrder()"
-                                aria-role="list">
+                                aria-role="list"
+                                trap-focus>
                             <button
                                     :aria-label="$i18n.get('label_sorting_direction')"
                                     class="button is-white"
@@ -395,7 +398,8 @@
                         <b-dropdown
                                 :mobile-modal="true"
                                 @input="onChangeOrderBy($event)"
-                                aria-role="list">
+                                aria-role="list"
+                                trap-focus>
                             <button
                                     :aria-label="$i18n.get('label_sorting')"
                                     class="button is-white"
@@ -431,7 +435,8 @@
                                 :mobile-modal="true"
                                 position="is-bottom-left"
                                 :aria-label="$i18n.get('label_view_mode')"
-                                aria-role="list">
+                                aria-role="list"
+                                trap-focus>
                             <button 
                                     :aria-label="registeredViewModes[viewMode] != undefined ? registeredViewModes[viewMode].label : $i18n.get('label_visualization')"
                                     class="button is-white" 
@@ -472,7 +477,8 @@
                                 :mobile-modal="true"
                                 position="is-bottom-left"
                                 :aria-label="$i18n.get('label_view_mode')"
-                                aria-role="list">
+                                aria-role="list"
+                                trap-focus>
                             <button
                                     :aria-label="$i18n.get('label_view_mode')"
                                     class="button is-white"
@@ -699,9 +705,6 @@
                     <div
                             v-if="(registeredViewModes[viewMode] != undefined && registeredViewModes[viewMode].skeleton_template != undefined)"
                             v-html="registeredViewModes[viewMode].skeleton_template"/>
-                            
-                    <!-- Admin view modes skeleton -->
-                    <!-- <skeleton-items-list v-if="!isOnTheme"/>          -->
                 </div>  
 
                <!-- Alert if custom metada is being used for sorting -->
@@ -788,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>
 
@@ -811,12 +821,20 @@
                 role="region"
                 aria-labelledby="filters-label-landmark-modal"
                 id="filters-mobile-modal"
-                ref="filters-mobile-modal"
                 class="tainacan-form is-hidden-tablet"                
                 :active.sync="isFilterModalActive"
                 :width="736"
-                animation="slide-menu">
-            <div class="modal-inner-content">
+                animation="slide-menu"
+                trap-focus
+                aria-modal
+                aria-role="dialog">
+            <div 
+                    ref="filters-mobile-modal"
+                    class="modal-inner-content"
+                    autofocus="true"
+                    tabindex="-1"
+                    aria-modal
+                    role="dialog">
                 <h3 
                         id="filters-label-landmark-modal"
                         class="has-text-weight-semibold">
@@ -881,7 +899,6 @@
     import FiltersTagsList from '../../components/search/filters-tags-list.vue';
     import FiltersItemsList from '../../components/search/filters-items-list.vue';
     import Pagination from '../../components/search/pagination.vue'
-    import SkeletonItemsList from '../../components/search/skeleton-items-list.vue'
     import AdvancedSearch from '../../components/advanced-search/advanced-search.vue';
     import AvailableImportersModal from '../../components/other/available-importers-modal.vue';
     import ExposersModal from '../../components/other/exposers-modal.vue';
@@ -1015,7 +1032,6 @@
             ItemsList,
             FiltersTagsList,
             FiltersItemsList,
-            SkeletonItemsList,
             Pagination,
             AdvancedSearch,
             ExposersModal
@@ -1035,6 +1051,14 @@
             orderByName() {
                 if (this.isSortingByCustomMetadata)
                     this.hasAnOpenAlert = true;
+            },
+            isFilterModalActive() {
+                if (this.isFilterModalActive) {
+                    setTimeout(() => {
+                        if (this.$refs['filters-mobile-modal'])
+                            this.$refs['filters-mobile-modal'].focus();
+                    }, 800);
+                }
             }
         },
         methods: {
@@ -1097,7 +1121,8 @@
                     props: { 
                         targetCollection: this.collectionId,
                         hideWhenManualCollection: true
-                    }
+                    },
+                    trapFocus: true
                 });
             },
             openExposersModal() {
@@ -1108,14 +1133,16 @@
                     props: { 
                         collectionId: this.collectionId,
                         totalItems: this.totalItems
-                    }
+                    },
+                    trapFocus: true
                 })
             },
             onOpenCollectionsModal() {
                 this.$buefy.modal.open({
                     parent: this,
                     component: CollectionsModal,
-                    hasModalCard: true
+                    hasModalCard: true,
+                    trapFocus: true
                 });
             },
             updateSearch() {
@@ -1489,7 +1516,8 @@
                             hideCancel: true,
                             showNeverShowAgainOption: offerCheckbox && tainacan_plugin.user_caps != undefined && tainacan_plugin.user_caps.length != undefined && tainacan_plugin.user_caps.length > 0,
                             messageKeyForUserPrefs: 'ItemsHiddenDueSorting'
-                        }
+                        },
+                        trapFocus: true
                     });
             },
             adjustSearchControlHeight: _.debounce( function() {
@@ -1974,7 +2002,7 @@
 
         .loading-container {
             position: relative;
-            min-height: 200px;
+            min-height: 50vh;
             height: auto;
         }
     }
@@ -2034,10 +2062,9 @@
     }
 
     .table-container {
-        padding-left: 4.166666667%;
-        padding-right: 4.166666667%;
+        padding-left: $page-side-padding;
+        padding-right: $page-side-padding;
         min-height: 50vh;
-        //height: calc(100% - 82px);
     }
 
     .pagination-area {
diff --git a/src/admin/pages/lists/taxonomies-page.vue b/src/admin/pages/lists/taxonomies-page.vue
index 4aa119c5d..fe08398dc 100644
--- a/src/admin/pages/lists/taxonomies-page.vue
+++ b/src/admin/pages/lists/taxonomies-page.vue
@@ -25,7 +25,8 @@
                             :mobile-modal="true"
                             :disabled="taxonomies.length <= 0 || isLoading"
                             @input="onChangeOrder(order == 'asc' ? 'desc' : 'asc')"
-                            aria-role="list">
+                            aria-role="list"
+                            trap-focus>
                         <button
                                 :aria-label="$i18n.get('label_sorting_direction')"
                                 class="button is-white"
@@ -83,6 +84,25 @@
                         </option>
                     </b-select>
                 </b-field>
+
+                <!-- Textual Search -------------->
+                <b-field class="header-item">
+                    <div class="control has-icons-right is-small is-clearfix">
+                        <input
+                                class="input is-small"
+                                :placeholder="$i18n.get('instruction_search')"
+                                type="search"
+                                :aria-label="$i18n.get('instruction_search') + ' ' + $i18n.get('taxonomies')"
+                                autocomplete="on"
+                                v-model="searchQuery"
+                                @keyup.enter="searchTaxonomies()">
+                        <span
+                                @click="searchTaxonomies()"
+                                class="icon is-right">
+                            <i class="tainacan-icon tainacan-icon-search" />
+                        </span>
+                    </div>
+                </b-field>
             </div>
 
             <div class="above-subheader">
@@ -230,6 +250,7 @@
                 status: '',
                 order: 'asc',
                 ordeBy: 'date',
+                searchQuery: '',
                 sortingOptions: [
                     { label: this.$i18n.get('label_title'), value: 'title' },
                     { label: this.$i18n.get('label_creation_date'), value: 'date' },
@@ -304,7 +325,8 @@
                     taxonomiesPerPage: this.taxonomiesPerPage, 
                     status: this.status, 
                     order: this.order,
-                    orderby: this.orderBy
+                    orderby: this.orderBy,
+                    search: this.searchQuery
                 })
                     .then((res) => {
                         this.isLoading = false;
@@ -317,6 +339,10 @@
             getLastTaxonomyNumber() {
                 let last = (Number(this.taxonomiesPerPage * (this.page - 1)) + Number(this.taxonomiesPerPage));
                 return last > this.total ? this.total : last;
+            },
+            searchTaxonomies() {
+                this.page = 1;
+                this.load();
             }
         },
         computed: {
@@ -370,10 +396,15 @@
         display: inline-flex;
         justify-content: space-between;
         align-items: center;
+        flex-wrap: wrap;
         width: 100%;
 
         .header-item {
+            margin-bottom: 0 !important;
 
+            &:first-child {
+                margin-right: auto;
+            }
             &:not(:last-child) {
                 padding-right: 0.5em;
             }
@@ -386,9 +417,13 @@
                 cursor: default;
             }
 
-            .button {
-                display: flex;
-                align-items: center;
+            &:not(:first-child) {
+                .button {
+                    display: flex;
+                    align-items: center;
+                    border-radius: 0 !important;
+                    height: 1.95rem !important;
+                }
             }
             
             .field {
@@ -404,10 +439,19 @@
                 font-size: 1.3125rem !important;
                 max-width: 26px;
             }
+
+            .icon {
+                pointer-events: all;
+                cursor: pointer;
+                color: $blue5;
+                height: 27px;
+                font-size: 18px !important;
+                height: 1.75rem !important;
+            }
         }
 
         @media screen and (max-width: 769px) {
-            height: 60px;
+            height: 160px;
             margin-top: -0.5em;
             padding-top: 0.9em;
 
diff --git a/src/admin/pages/lists/term-items-page.vue b/src/admin/pages/lists/term-items-page.vue
index f0e2f8503..79a109345 100644
--- a/src/admin/pages/lists/term-items-page.vue
+++ b/src/admin/pages/lists/term-items-page.vue
@@ -223,7 +223,8 @@
                     <b-dropdown 
                             :mobile-modal="true"
                             id="item-creation-options-dropdown"
-                            aria-role="list">
+                            aria-role="list"
+                            trap-focus>
                         <button
                                 class="button is-secondary"
                                 slot="trigger">
@@ -283,7 +284,8 @@
                             :mobile-modal="true"
                             :disabled="totalItems <= 0 || adminViewMode == 'grid'|| adminViewMode == 'cards' || adminViewMode == 'masonry'"
                             class="show metadata-options-dropdown"
-                            aria-role="list">
+                            aria-role="list"
+                            trap-focus>
                         <button
                                 :aria-label="$i18n.get('label_displayed_metadata')"
                                 class="button is-white"
@@ -325,7 +327,8 @@
                         <b-dropdown
                                 :mobile-modal="true"
                                 @input="onChangeOrder()"
-                                aria-role="list">
+                                aria-role="list"
+                                trap-focus>
                             <button
                                     :aria-label="$i18n.get('label_sorting_direction')"
                                     class="button is-white"
@@ -372,7 +375,8 @@
                         <b-dropdown
                                 :mobile-modal="true"
                                 @input="onChangeOrderBy($event)"
-                                aria-role="list">
+                                aria-role="list"
+                                trap-focus>
                             <button
                                     :aria-label="$i18n.get('label_sorting')"
                                     class="button is-white"
@@ -408,7 +412,8 @@
                                 :mobile-modal="true"
                                 position="is-bottom-left"
                                 :aria-label="$i18n.get('label_view_mode')"
-                                aria-role="list">
+                                aria-role="list"
+                                trap-focus>
                             <button 
                                     class="button is-white" 
                                     :aria-label="registeredViewModes[viewMode] != undefined ? registeredViewModes[viewMode].label : $i18n.get('label_visualization')"
@@ -449,7 +454,8 @@
                                 :mobile-modal="true"
                                 position="is-bottom-left"
                                 :aria-label="$i18n.get('label_view_mode')"
-                                aria-role="list">
+                                aria-role="list"
+                                trap-focus>
                             <button
                                     class="button is-white"
                                     :aria-label="$i18n.get('label_view_mode')"
@@ -675,9 +681,7 @@
                     <div
                             v-if="(registeredViewModes[viewMode] != undefined && registeredViewModes[viewMode].skeleton_template != undefined)"
                             v-html="registeredViewModes[viewMode].skeleton_template"/>
-                            
-                    <!-- Admin view modes skeleton -->
-                    <!-- <skeleton-items-list v-if="!isOnTheme"/>          -->
+
                 </div>  
                 
                <!-- Alert if custom metada is being used for sorting -->
@@ -791,8 +795,16 @@
                 class="tainacan-form is-hidden-tablet"                
                 :active.sync="isFilterModalActive"
                 :width="736"
-                animation="slide-menu">
-            <div class="modal-inner-content">
+                animation="slide-menu"
+                trap-focus
+                aria-modal
+                aria-role="dialog">
+            <div
+                    autofocus="true"
+                    tabindex="-1"
+                    role="dialog"
+                    aria-modal
+                    class="modal-inner-content">
                 <h3 
                         id="filters-label-landmark-modal"
                         class="has-text-weight-semibold">
@@ -989,6 +1001,14 @@
             orderByName() {
                 if (this.isSortingByCustomMetadata)
                     this.hasAnOpenAlert = true;
+            },
+            isFilterModalActive() {
+                if (this.isFilterModalActive) {
+                    setTimeout(() => {
+                        if (this.$refs['filters-mobile-modal'])
+                            this.$refs['filters-mobile-modal'].focus();
+                    }, 800);
+                }
             }
         },
         methods: {
@@ -1047,7 +1067,8 @@
                     props: { 
                         targetCollection: this.collectionId,
                         hideWhenManualCollection: true
-                    }
+                    },
+                    trapFocus: true
                 });
             },
             openExposersModal() {
@@ -1058,15 +1079,16 @@
                     props: { 
                         collectionId: this.collectionId,
                         totalItems: this.totalItems
-                    }
-                })
+                    },
+                    trapFocus: true
+                });
             },
             updateSearch() {
                 this.$eventBusSearch.setSearchQuery(this.futureSearchQuery);
             },  
             onChangeOrderBy(metadatum) {
                 this.$eventBusSearch.setOrderBy(metadatum);
-                this.showItemsHiddingDueSorting();
+                this.showItemsHiddingDueSortingDialog();
             },
             onChangeOrder() {
                 this.order == 'DESC' ? this.$eventBusSearch.setOrder('ASC') : this.$eventBusSearch.setOrder('DESC');
@@ -1419,7 +1441,8 @@
                             hideCancel: true,
                             showNeverShowAgainOption: offerCheckbox && tainacan_plugin.user_caps != undefined && tainacan_plugin.user_caps.length != undefined && tainacan_plugin.user_caps.length > 0,
                             messageKeyForUserPrefs: 'ItemsHiddenDueSorting'
-                        }
+                        },
+                        trapFocus: true
                     });
             },
             adjustSearchControlHeight: _.debounce( function() {
@@ -1535,7 +1558,7 @@
                 }
             }
 
-            this.showItemsHiddingDueSorting();
+            this.showItemsHiddingDueSortingDialog();
 
             // Watches window resize to adjust filter's top position and compression on mobile 
             this.adjustSearchControlHeight();
@@ -1895,7 +1918,7 @@
 
         .loading-container {
             position: relative;
-            min-height: 200px;
+            min-height: 50vh;
             height: auto;
         }
     }
@@ -1915,8 +1938,8 @@
     }
 
     .table-container {
-        padding-left: 4.166666667%;
-        padding-right: 4.166666667%;
+        padding-left: $page-side-padding;
+        padding-right: $page-side-padding;
         min-height: 50vh;
         //height: calc(100% - 82px);
     }
diff --git a/src/admin/pages/singles/item-page.vue b/src/admin/pages/singles/item-page.vue
index 7f59724d0..56c7c2e9e 100644
--- a/src/admin/pages/singles/item-page.vue
+++ b/src/admin/pages/singles/item-page.vue
@@ -384,8 +384,9 @@
                         itemId: this.itemId,
                         itemURL: this.item.url,
                         totalItems: 1,
-                    }
-                })
+                    },
+                    trapFocus: true
+                });
             }
         },
         created() {
diff --git a/src/admin/scss/_dropdown-and-autocomplete.scss b/src/admin/scss/_dropdown-and-autocomplete.scss
index 801f3bbe7..6e31ab2ac 100644
--- a/src/admin/scss/_dropdown-and-autocomplete.scss
+++ b/src/admin/scss/_dropdown-and-autocomplete.scss
@@ -68,7 +68,7 @@
         } 
     }
     &.is-mobile-modal {
-        @media screen and (max-width: 1088px) {
+        @media screen and (max-width: 768px) {
             .dropdown-content {
                 max-height: 100vh;
             }
@@ -182,4 +182,167 @@
             }
         }
     }
+}
+
+.datepicker {
+    width: 100%;
+
+    .datepicker-content {
+        height: auto;
+        
+        input {
+            height: 30px;
+        }
+    }
+
+    .dropdown-menu {
+        background: transparent;
+        border: none;
+        
+        .dropdown-item {
+            background-color: white !important;
+        }
+    }
+
+    .datepicker-header {
+        .pagination {
+            a>span>i:before {
+                display: inline-block;
+                font: normal normal normal 20px/1 "TainacanIcons";
+                font-size: inherit;
+                text-rendering: auto;
+                vertical-align: middle;
+                line-height: inherit;
+                -webkit-font-smoothing: antialiased;
+                -moz-osx-font-smoothing: grayscale;
+                color: $secondary;
+            }
+
+            .pagination-previous {
+                border: none;
+                flex-grow: 0;
+
+                &>span>i:before {
+                    content: 'previous';
+                    font-size: 20px;
+                }
+            }
+
+            .pagination-next {
+                border: none;
+                flex-grow: 0;
+
+                &>span>i:before {
+                    content: 'next';
+                    font-size: 20px;
+                }
+            }
+        }
+    }
+
+    .datepicker-table {
+        margin-bottom: 0px;
+        
+        .datepicker-cell {
+            border: none !important;
+            padding: 0.5rem 0.75rem;
+
+            &.is-selectable.is-first-hovered,
+            &.is-selectable.is-last-hovered {
+                color: $gray4 !important;
+                background-color: $gray3 !important;
+            }
+            &.is-today,
+            &.is-today:hover {
+                color: $gray4 !important;
+                background-color: $turquoise1;
+            }
+            &.is-selected,
+            &.is-selected:hover {
+                color: white !important;
+                background-color: $turquoise5 !important;
+            }
+        }
+
+        .datepicker-months {
+            width: auto;
+
+            .datepicker-cell {
+                height: 2rem;
+                width: 50%;
+                padding: 0.3rem 0.25rem !important;
+                text-overflow: ellipsis;
+                overflow: hidden;
+                display: block;
+            }
+        }
+    }
+
+    @media screen and (min-width: 768px) {
+
+        .datepicker-header {
+            margin-bottom: 0.5rem;
+            padding-top: 0.15rem;
+            padding-bottom: 0.5rem;
+            
+            .pagination {
+                flex-wrap: wrap;
+            
+                .pagination-list {
+                    margin-bottom: 0.5rem;
+
+                    .field.has-addons {
+                        width: 100% !important;
+
+                        .control {
+                            height: 24px !important;
+                        }
+                    }
+                }
+
+                .pagination-previous {
+                    margin: 0;
+                    height: 24px;
+                    padding: 0;
+                    font-size: 0.75rem; 
+                    order: 3;
+                }
+
+                .pagination-next {
+                    margin: 0;
+                    height: 24px;
+                    padding: 0;
+                    font-size: 0.75rem;
+                }
+            }
+        }
+
+        .dropdown-item {
+            padding: 0.8rem !important;
+        }
+
+        .dropdown-menu {
+            min-width: 100% !important;
+        }
+
+
+        .datepicker-table {
+            margin-bottom: 0px;
+        }
+        
+        .select {
+            select {
+                display: unset;
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+            }
+        }
+
+        .dropdown-content { 
+            border-radius: 2px !important;
+            padding: 0px;
+            max-height: inherit !important;
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/admin/scss/_selects.scss b/src/admin/scss/_selects.scss
index 7b9b75236..7435d52b2 100644
--- a/src/admin/scss/_selects.scss
+++ b/src/admin/scss/_selects.scss
@@ -22,7 +22,7 @@
             box-shadow: none !important;
             text-decoration: none !important;
         }
-        &[disabled] {
+        &[disabled=disabled] {
             background-color: white !important;
         }
     }
diff --git a/src/admin/scss/_tainacan-form.scss b/src/admin/scss/_tainacan-form.scss
index ba0397310..d111824ef 100644
--- a/src/admin/scss/_tainacan-form.scss
+++ b/src/admin/scss/_tainacan-form.scss
@@ -132,8 +132,14 @@
             &:focus>option:checked, &:focus>option:hover {
                 background-color: $turquoise1 !important;
             }
-        }   
+            &[disabled=disabled] {
+                border: 1px solid $gray1 !important;
+            }
+        } 
     }
+    .hidden-select-arrow .select::after {
+        color: transparent !important;
+    }   
     .dropdown {
         width: 100%;
         .dropdown-trigger { width: 100% }
@@ -177,13 +183,13 @@
 
         h4 {
             font-weight: 600;
-            color: #298596;
+            color: $turquoise5;
             margin-bottom: 6px;
         }
         hr {
             margin-top: 8px;
             height: 1px;
-            background-color: #298596;
+            background-color: $turquoise5;
         }
     }
 }
\ No newline at end of file
diff --git a/src/admin/scss/_variables.scss b/src/admin/scss/_variables.scss
index e9b15d4ac..dcce3f443 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;
diff --git a/src/admin/scss/tainacan-admin.scss b/src/admin/scss/tainacan-admin.scss
index adfee6487..a904f487a 100644
--- a/src/admin/scss/tainacan-admin.scss
+++ b/src/admin/scss/tainacan-admin.scss
@@ -78,12 +78,14 @@ body.tainacan-admin-page #adminmenumain, body.tainacan-admin-page #wpfooter, bod
     border: none;
     border-radius: 0;
     animation: none;
-    height: 50px;
-    width: 50px;
+    height: 46px;
+    width: 46px;
+    background-size: initial;
 }
 .loading-overlay.is-full-page .loading-icon::after {
-    height: 50px;
-    width: 50px;
+    height: 46px;
+    width: 46px;
+    background-size: initial;
     top: calc(50% - 25px);
     left: calc(50% - 25px);
 }
diff --git a/src/admin/tainacan-admin-i18n.php b/src/admin/tainacan-admin-i18n.php
index fe10d4f97..a63454c57 100644
--- a/src/admin/tainacan-admin-i18n.php
+++ b/src/admin/tainacan-admin-i18n.php
@@ -133,9 +133,11 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'title_exporter_page'                            => __( 'Exporter', 'tainacan'),
 
 	// Labels (used mainly on Aria Labels and Inputs)
+	'label'                                          => __( 'Label', 'tainacan' ),
 	'label_clean'                                    => __( 'Clear', 'tainacan' ),
+	'label_none'                                     => __( 'None', 'tainacan' ),
 	'label_clear_filters'                            => __( 'Clear filters', 'tainacan' ),
-	'label_and'                                    => __( 'and', 'tainacan' ),
+	'label_and'                                      => __( 'and', 'tainacan' ),
 	'label_selected'                                 => __( 'Selected', 'tainacan' ),
 	'label_relationship_new_search'                  => __( 'New Search', 'tainacan' ),
 	'label_relationship_items_found'                 => __( 'Items found', 'tainacan' ),
@@ -434,6 +436,7 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'label_day'								 		 => __( 'Day', 'tainacan' ),
 	'label_month'							 		 => __( 'Month', 'tainacan' ),
 	'label_year'							 		 => __( 'Year', 'tainacan' ),
+	'label_related_to'							 	 => __( 'Related to', 'tainacan' ),
 	
 	// Instructions. More complex sentences to guide user and placeholders
 	'instruction_delete_selected_collections'        => __( 'Delete selected collections', 'tainacan' ),
@@ -473,15 +476,18 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'instruction_select_an_exporter_type'            => __( 'Select an exporter from the options below:', 'tainacan'),
 	'instruction_select_a_collection'                => __( 'Select a collection', 'tainacan' ),
 	'instruction_hover_a_filter_type_to_preview'     => __( 'Hover a filter type to preview', 'tainacan' ),
-	'instruction_never_show_message_again'     		 => __( 'Never show me this message again', 'tainacan' ),
-	'instruction_click_or_drag_filter_create'	     => __( 'Click or drag and drop to create a new filter', 'tainacan' ),
+	'instruction_never_show_message_again'           => __( 'Never show me this message again', 'tainacan' ),
+	'instruction_click_or_drag_filter_create'	       => __( 'Click or drag and drop to create a new filter', 'tainacan' ),
 	'instruction_click_or_drag_metadatum_create'     => __( 'Click or drag and drop to create a new metadatum', 'tainacan' ),
-	'instruction_drag_and_drop_filter_sort'	     	 => __( 'Drag and drop to change filter order', 'tainacan' ),
+	'instruction_drag_and_drop_filter_sort'	     	   => __( 'Drag and drop to change filter order', 'tainacan' ),
 	'instruction_drag_and_drop_metadatum_sort'     	 => __( 'Drag and drop to change metadatum order', 'tainacan' ),
+	'instruction_filter_activities_date'             => __( 'Range of dates', 'tainacan'),
 	'instruction_select_a_date' 				     => __( 'Select a date', 'tainacan' ),
 	'instruction_select_a_month' 				     => __( 'Select a month', 'tainacan' ),
 	'instruction_type_value_year' 				     => __( 'Type year value', 'tainacan' ),
 	'instruction_select_the_amount_of_copies'		 => __( 'Select the amount of copies of the item that you want to create', 'tainacan'),
+	'instruction_select_a_interval'		 			 => __( 'Select an interval', 'tainacan'),
+	
 
 	// Info. Other feedback to user.
 	'info_items_tab_all'                			 => __( 'Every published item, including those visible only to editors.', 'tainacan' ),
@@ -527,7 +533,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' ),
@@ -577,7 +583,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' ),
@@ -605,11 +611,11 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'info_updated_at'                                => __( 'Updated at', 'tainacan' ),
 	'info_editing_metadata_values'                   => __( 'Editing metadata values...', 'tainacan' ),
 	'info_updating_metadata_values'                  => __( 'Updating metadata values...', 'tainacan' ),
-	'info_type_to_add_items'                         => __( 'Add items...', 'tainacan' ),
+	'info_type_to_add_items'                         => __( 'Add items to filter...', 'tainacan' ),
 	'info_type_to_search_items'                      => __( 'Search items...', 'tainacan' ),
-	'info_type_to_add_terms'                         => __( 'Add terms...', 'tainacan' ),
+	'info_type_to_add_terms'                         => __( 'Add terms to filter...', 'tainacan' ),
 	'info_type_to_search_metadata'                   => __( 'Search metadata...', 'tainacan' ),
-	'info_type_to_add_metadata'                      => __( 'Add metadata...', 'tainacan' ),
+	'info_type_to_add_metadata'                      => __( 'Add metadata to filter...', 'tainacan' ),
 	'info_visibility_helper'                         => __( 'How the item will be available to visualization.', 'tainacan' ),
 	'info_errors_in_form'                            => __( 'There are errors in the form', 'tainacan' ),
 	'info_no_document_to_item'                       => __( 'No document was uploaded to this item.', 'tainacan' ),
@@ -644,7 +650,7 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'info_process_status_cancelled' 				 => __('Cancelled', 'tainacan'),
 	'info_process_status_paused' 				 	 => __('Paused', 'tainacan'),
 	'info_process_status_running' 				 	 => __('Running', 'tainacan'),
-    'info_warning_process_cancelled'                 => __( 'Are you sure? This process will be cancelled', 'tainacan' ),
+  	'info_warning_process_cancelled'                 => __( 'Are you sure? This process will be cancelled', 'tainacan' ),
 	'info_empty'                                     => __( 'empty', 'tainacan' ),
 	'info_url_copied'	         	    	    	 => __( 'URL link copied', 'tainacan' ),
 	'info_other_options'				 			 => __( 'Other options: ', 'tainacan'),
@@ -657,28 +663,9 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'info_await_while_item_copy'  			 		 => __( 'Please wait while copy is being created...', 'tainacan'),
 	'info_await_while_item_copies'  			 	 => __( 'Please wait while copies are being created. This may take a while...', 'tainacan'),
 	'info_expose_only_displayed_metadata'			 => __( 'By checking this option, only metatada that are displayed on the current list will be exposed', 'tainacan' ),
-
-	// 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' ),
+	'info_initial_value'                             => __( 'Initial value', 'tainacan' ),
+	'info_final_value'                               => __( 'Final value', 'tainacan' ),
+	'info_show_interval_on_tag'                      => __( 'Show applied interval on tags', 'tainacan' ),
 
 	// Datepicker months
 	'datepicker_month_january'			=> __( 'January', 'tainacan' ),
diff --git a/src/admin/theme-items-list.vue b/src/admin/theme-items-list.vue
index 990762b26..76230a0b7 100644
--- a/src/admin/theme-items-list.vue
+++ b/src/admin/theme-items-list.vue
@@ -153,7 +153,37 @@ export default {
                 }
             }
         }
+        .metadata-alert {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin: 6px $page-side-padding;
+            border-radius: 3px;
+            padding: 4px 12px;
+            color: $yellow2;
+            background: $yellow1;
+            animation-name: appear;
+            animation-duration: 0.5s;
 
+            p {
+                margin: 0 auto;
+            }
+            
+            &>div {
+                display: flex;
+                
+                .button,
+                .button:hover,
+                .button:active,
+                .button:focus {
+                    background: none;
+                    color:$yellow2;
+                    font-weight: bold;
+                    border: none;
+                    cursor: pointer;
+                }
+            }
+        }
         .search-control {   
             justify-content: flex-start !important;
 
diff --git a/src/api/class-tainacan-rest-controller.php b/src/api/class-tainacan-rest-controller.php
index 6e24dab82..093065052 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',
@@ -92,7 +92,8 @@ class REST_Controller extends \WP_REST_Controller {
 			'metatype'     => 'meta_type',
 			'hierarchical' => 'hierarchical',
 			'exclude'      => 'exclude',
-			'excludetree'  => 'exclude_tree'
+			'excludetree'  => 'exclude_tree',
+			'include'      => 'include'
 		];
 
 		$meta_query = [
@@ -164,6 +165,7 @@ class REST_Controller extends \WP_REST_Controller {
 				$terms = get_terms([
 					'taxonomy' => $tax_query['taxonomy'],
 					'fields' => 'ids',
+					'hide_empty' => isset($args['hide_empty']) ? $args['hide_empty'] : true,
 					'search' => $tax_query['terms']
 				]);
 				
@@ -178,6 +180,7 @@ class REST_Controller extends \WP_REST_Controller {
 				$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) {
@@ -259,6 +262,23 @@ class REST_Controller extends \WP_REST_Controller {
 
 		return false;
 	}
+	
+	/**
+	 * Return the fetch_only param
+	 *
+	 * @param string $object_name
+	 *
+	 * @return array|void
+	 */
+	public function get_fetch_only_param(){
+		return [
+			'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?
+			)
+		];
+	}
 
 	/**
 	 * Return the common params
@@ -267,21 +287,32 @@ class REST_Controller extends \WP_REST_Controller {
 	 *
 	 * @return array|void
 	 */
-	public function get_collection_params($object_name = null){
+	public function get_wp_query_params(){
+
 		$query_params['id'] = array(
-			'description' => __("Limit result to $object_name with specific id."),
+			'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.' ),
+			'description'        => __( 'Limit results to those matching a string.', 'tainacan' ),
 			'type'               => 'string',
 			'sanitize_callback'  => 'sanitize_text_field',
 			'validate_callback'  => 'rest_validate_request_arg',
 		);
 
 		$query_params['authorid'] = array(
-			'description' => __("Limit result set to $object_name assigned to specific authors by id."),
+			'description' => __("Limit result set to objects assigned to specific authors by id.", 'tainacan'),
 			'type'        => 'array',
 			'items'       => array(
 				'type'    => 'integer',
@@ -289,12 +320,12 @@ class REST_Controller extends \WP_REST_Controller {
 		);
 
 		$query_params['authorname'] = array(
-			'description' => __("Limit result set to $object_name assigned to specific authors by name"),
+			'description' => __("Limit result set to objects assigned to specific authors by name", 'tainacan'),
 			'type'        => 'string',
 		);
 
 		$query_params['status'] = array(
-			'description' => __("Limit result set to $object_name assigned one or more statuses."),
+			'description' => __("Limit result set to objects assigned one or more statuses.", 'tainacan'),
 			'type'        => 'array',
 			'items'       => array(
 				'enum'    => array_merge(array_keys(get_post_stati()), array('any')),
@@ -303,19 +334,19 @@ class REST_Controller extends \WP_REST_Controller {
 		);
 
 		$query_params['offset'] = array(
-			'description'        => __( "Offset the result set by a specific number of $object_name." ),
+			'description'        => __( "Offset the result set by a specific number of objects.", 'tainacan' ),
 			'type'               => 'integer',
 		);
 
 		$query_params['order'] = array(
-			'description'        => __( 'Order sort attribute ascending or descending.' ),
+			'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(
-			'description'        => __( "Sort $object_name by object attribute." ),
+			'description'        => __( "Sort objects by object attribute.", 'tainacan' ),
 			'type'               => 'string/array',
 			'default'            => 'date',
 			'enum'               => array(
@@ -335,13 +366,13 @@ class REST_Controller extends \WP_REST_Controller {
 		);
 
 		$query_params['perpage'] = array(
-			'description'        => __( "Maximum number of $object_name to be returned in result set." ),
+			'description'        => __( "Maximum number of objects to be returned in result set.", 'tainacan' ),
 			'type'               => 'numeric',
 			'default'            => 10,
 		);
 
 		$query_params['paged'] = array(
-			'description' => __("Show the $object_name that would normally show up just on page X"),
+			'description' => __("The results page to be return.", 'tainacan'),
 			'type'        => 'integer',
 		);
 
@@ -369,8 +400,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'),
@@ -388,8 +437,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',
@@ -439,8 +504,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(
@@ -470,7 +551,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',
@@ -478,13 +566,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'
@@ -492,6 +591,54 @@ 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){
+			$schema[$mapped] = [
+				'description' => $value['description'],
+				'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'),
+				'type' => 'boolean',
+				'context' => 'edit'
+			],
+			'current_user_can_delete' => [
+				'description' => esc_html__('Whether current user can delete this object', 'tainacan'),
+				'type' => 'boolean',
+				'context' => 'edit'
+			]
+		];
+		
+	}
+	
+	function get_base_properties_schema() {
+		return [
+			
+			'id' => [
+				'description'  => esc_html__( 'Unique identifier for the object.', 'tainacan' ),
+				'type'         => 'integer',
+				'context'      => array( 'view', 'edit' ),
+				'readonly'     => true
+			]
+		];
+	}
+	
 }
 
 ?>
\ 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 381d2ac10..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_collection_params('item'));
 
 		$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 22dcc4977..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_collection_params(),
+	            'args'                => $this->get_endpoint_args_for_item_schema(\WP_REST_Server::READABLE),
             ),
 	        array(
 		        'methods'             => \WP_REST_Server::CREATABLE,
@@ -51,13 +51,15 @@ class REST_Collections_Controller extends REST_Controller {
 		        '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<collection_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),
+	            'args'                => $this->get_wp_query_params(),
+				
             ),
             array(
                 'methods'             => \WP_REST_Server::EDITABLE,
@@ -71,11 +73,12 @@ 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',
 		            ),
 	            )
             ),
+			'schema'                => [$this, 'get_schema'],
         ));
     }
 
@@ -474,16 +477,19 @@ class REST_Collections_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['name'] = array(
+    	    	'description' => __('Limits the result set to collections with a specific name'),
+    		    'type'        => 'string',
+    	    );
+            
+            $endpoint_args = array_merge(
+                $endpoint_args, 
+                parent::get_wp_query_params(),
+                parent::get_fetch_only_param(),
+                parent::get_meta_queries_params()
+            );
 
-			$endpoint_args['context'] = array(
-				'type'    => 'string',
-				'default' => 'view',
-				'items'   => array( 'view, edit' )
-			);
 		} elseif ($method === \WP_REST_Server::CREATABLE || $method === \WP_REST_Server::EDITABLE) {
 			$map = $this->collections_repository->get_map();
 
@@ -501,29 +507,30 @@ class REST_Collections_Controller extends REST_Controller {
 
 	    return $endpoint_args;
     }
-
-	/**
-	 *
-	 * Return the queries supported when getting a collection of objects
-	 *
-	 * @param null $object_name
-	 *
-	 * @return array
-	 */
-    public function get_collection_params($object_name = null) {
-    	$query_params['context']['default'] = 'view';
-
-	    $query_params = array_merge($query_params, parent::get_collection_params('collection'));
-
-	    $query_params['name'] = array(
-	    	'description' => __('Limits the result set to collections with a specific name'),
-		    'type'        => 'string',
-	    );
-
-	    $query_params = array_merge($query_params, parent::get_meta_queries_params());
-
-	    return $query_params;
-    }
+	
+	function get_schema() {
+		$schema = [
+			'$schema'  => 'http://json-schema.org/draft-04/schema#',
+			'title' => 'collection',
+			'type' => 'object'
+		];
+		
+		$main_schema = parent::get_repository_schema( $this->collections_repository );
+		$permissions_schema = parent::get_permissions_schema();
+		
+		// transformation done in $this->prepare_item_for_response()
+		$main_schema['moderators'] = $main_schema['moderators_ids'];
+		$main_schema['moderators']['contex'] = 'edit';
+		
+		$schema['properties'] = array_merge(
+			parent::get_base_properties_schema(),
+			$main_schema,
+			$permissions_schema
+		);
+		
+		return $schema;
+		
+	}
 }
 
 ?>
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 b28959e56..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_collection_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-exporters-controller.php b/src/api/endpoints/class-tainacan-rest-exporters-controller.php
index 51c4a4c57..47da5adea 100644
--- a/src/api/endpoints/class-tainacan-rest-exporters-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-exporters-controller.php
@@ -68,7 +68,7 @@ class REST_Exporters_Controller extends REST_Controller {
 					],
 					'options' => [
 						'type'        => 'array/object',
-						'description' => __( 'The importer options', 'tainacan' ),
+						'description' => __( 'The exporter options', 'tainacan' ),
 					]
 				],
 			),
@@ -121,6 +121,7 @@ class REST_Exporters_Controller extends REST_Controller {
 
 		if ($object = $Tainacan_Exporter_Handler->initialize_exporter($slug)) {
 			$response = $object->_to_Array();
+			$Tainacan_Exporter_Handler->save_exporter_instance($object);
 			return new \WP_REST_Response($response, 201);
 		} else {
 			return new \WP_REST_Response([
@@ -146,13 +147,14 @@ class REST_Exporters_Controller extends REST_Controller {
 			foreach ($body as $att => $value) {
 				$attributes[$att] = $value;
 			}
-
-			$importer = $_SESSION['tainacan_exporter'][$session_id];
-			if($importer) {
+			global $Tainacan_Exporter_Handler;
+			$exporter = $Tainacan_Exporter_Handler->get_exporter_instance_by_session_id($session_id);
+			
+			if($exporter) {
 				foreach ($body as $att => $value) {
 					if ($att == 'collection') {
 						if (is_array($value) && isset($value['id'])) {
-							$importer->add_collection($value);
+							$exporter->add_collection($value);
 							continue;
 						} else {
 							return new \WP_REST_Response([
@@ -162,17 +164,18 @@ class REST_Exporters_Controller extends REST_Controller {
 						}
 					}
 					$method = 'set_' . $att;
-					if (method_exists($importer, $method)) {
-						$importer->$method($value);
+					if (method_exists($exporter, $method)) {
+						$exporter->$method($value);
 					}
 				}
 
-				$response = $importer->_to_Array();
+				$response = $exporter->_to_Array();
+				$Tainacan_Exporter_Handler->save_exporter_instance($exporter);
 				return new \WP_REST_Response( $response, 200 );
 			}
 
 			return new \WP_REST_Response([
-				'error_message' => __('Importer Session not found', 'tainacan' ),
+				'error_message' => __('Exporter Session not found', 'tainacan' ),
 				'session_id' => $session_id
 			], 400);
 		}
@@ -192,7 +195,8 @@ class REST_Exporters_Controller extends REST_Controller {
 	 */
 	public function run($request) {
 		$session_id = $request['session_id'];
-		$exporter = $_SESSION['tainacan_exporter'][$session_id];
+		global $Tainacan_Exporter_Handler;
+		$exporter = $Tainacan_Exporter_Handler->get_exporter_instance_by_session_id($session_id);
 
 		if(!$exporter) {
 			return new \WP_REST_Response([
@@ -212,6 +216,7 @@ class REST_Exporters_Controller extends REST_Controller {
 		$response = [
 			'bg_process_id' => $process->ID
 		];
+		$Tainacan_Exporter_Handler->delete_exporter_instance($exporter);
 		return new \WP_REST_Response( $response, 200 );
 	}
 	
diff --git a/src/api/endpoints/class-tainacan-rest-filter-types-controller.php b/src/api/endpoints/class-tainacan-rest-filter-types-controller.php
index f43aaac02..65f2826ca 100644
--- a/src/api/endpoints/class-tainacan-rest-filter-types-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-filter-types-controller.php
@@ -28,6 +28,9 @@ class REST_Filter_Types_Controller extends REST_Controller {
 								'className'       => [
 									'type' => 'string'
 								],
+								'name'       => [
+									'type' => 'string'
+								],
 								'component'       => [
 									'type' => 'string'
 								],
@@ -56,7 +59,6 @@ class REST_Filter_Types_Controller extends REST_Controller {
 		$filter_type = new $name();
 
 		$filter_arr = $filter_type->_toArray();
-		$filter_arr['name'] = $item;
 
 		return $filter_arr;
 	}
diff --git a/src/api/endpoints/class-tainacan-rest-filters-controller.php b/src/api/endpoints/class-tainacan-rest-filters-controller.php
index fe0906f6e..17cfe0fc3 100644
--- a/src/api/endpoints/class-tainacan-rest-filters-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-filters-controller.php
@@ -44,34 +44,37 @@ class REST_Filters_Controller extends REST_Controller {
 				'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, '/collection/(?P<collection_id>[\d]+)/' . $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_collection_params()
+				'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, array(
 			array(
 				'methods'             => \WP_REST_Server::READABLE,
 				'callback'            => array($this, 'get_items'),
 				'permission_callback' => array($this, 'get_items_permissions_check'),
-				'args'                => $this->get_collection_params()
+				'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<filter_id>[\d]+)', array(
 			array(
@@ -80,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'
 		            ),
 	            )
 			),
@@ -96,7 +99,8 @@ class REST_Filters_Controller extends REST_Controller {
 				'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']
 		));
 	}
 
@@ -118,13 +122,11 @@ class REST_Filters_Controller extends REST_Controller {
 		if(empty($received_type)){
 			throw new \InvalidArgumentException('The type can\'t be empty');
 		} elseif(!strrchr($received_type, '_')){
-			$received_type = ucfirst(strtolower($received_type));
+			$type = ucfirst(strtolower($received_type));
 		} else {
-			$received_type = ucwords(strtolower($received_type), '_');
+			$type = ucwords(strtolower($received_type), '_\\');
 		}
 
-		$type = "Tainacan\Filter_Types\\$received_type";
-
 		$filter_type = new $type();
 
 		foreach ($filter as $attribute => $value){
@@ -148,7 +150,7 @@ class REST_Filters_Controller extends REST_Controller {
 
 			$filter_obj->set_metadatum_id($body['metadatum_id']);
 		} else {
-			$filter_obj->set_collection_id( 'filter_in_repository' );
+			$filter_obj->set_collection_id( 'default' );
 
 			if(!isset($body['metadatum_id'])){
 				throw new \InvalidArgumentException('You need provide a metadatum id');
@@ -375,7 +377,7 @@ class REST_Filters_Controller extends REST_Controller {
 		if(!isset($request['collection_id'])) {
 			$args['meta_query'][] = [
 				'key'     => 'collection_id',
-				'value'   => 'filter_in_repository',
+				'value'   => 'default',
 				'compare' => '='
 			];
 
@@ -467,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();
 
@@ -495,19 +496,45 @@ class REST_Filters_Controller extends REST_Controller {
 	 *
 	 * @return array|void
 	 */
-	public function get_collection_params( $object_name = null ) {
-		$query_params['context']['default'] = 'view';
-
-		$query_params = array_merge($query_params, parent::get_collection_params('filter'));
+	public function 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;
 	}
+
+	function get_schema() {
+		$schema = [
+			'$schema'  => 'http://json-schema.org/draft-04/schema#',
+			'title' => 'filter',
+			'type' => 'object'
+		];
+		
+		$main_schema = parent::get_repository_schema( $this->filter_repository );
+		$permissions_schema = parent::get_permissions_schema();
+			
+		// $collection_scheme = parent::get_repository_schema( $this->collection_repository );
+		// $metadatum_scheme = parent::get_repository_schema( $this->metadatum_repository );
+
+		$schema['properties'] = array_merge(
+			parent::get_base_properties_schema(),
+			$main_schema,
+			$permissions_schema
+			// $collection_scheme,
+			// $metadatum_scheme
+		);
+		
+		return $schema;
+		
+	}
 }
 ?>
\ No newline at end of file
diff --git a/src/api/endpoints/class-tainacan-rest-importers-controller.php b/src/api/endpoints/class-tainacan-rest-importers-controller.php
index db67a0e88..51dddbd92 100644
--- a/src/api/endpoints/class-tainacan-rest-importers-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-importers-controller.php
@@ -165,6 +165,7 @@ class REST_Importers_Controller extends REST_Controller {
 
         if ($object = $Tainacan_Importer_Handler->initialize_importer($slug)) {
             $response = $object->_to_Array();
+			$Tainacan_Importer_Handler->save_importer_instance($object);
             return new \WP_REST_Response($response, 201);
         } else {
             return new \WP_REST_Response([
@@ -192,9 +193,10 @@ class REST_Importers_Controller extends REST_Controller {
 	    	foreach ($body as $att => $value){
 	    		$attributes[$att] = $value;
 		    }
-
-		    $importer = $_SESSION['tainacan_importer'][$session_id];
-
+			
+			global $Tainacan_Importer_Handler;
+			$importer = $Tainacan_Importer_Handler->get_importer_instance_by_session_id($session_id);
+			
 	    	if($importer) {
                 
                 foreach ($body as $att => $value){
@@ -218,6 +220,7 @@ class REST_Importers_Controller extends REST_Controller {
                 }
 
                 $response = $importer->_to_Array();
+				$Tainacan_Importer_Handler->save_importer_instance($importer);
                 return new \WP_REST_Response( $response, 200 );
 
 		    }
@@ -237,7 +240,8 @@ class REST_Importers_Controller extends REST_Controller {
 
     public function source_info( $request ) {
         $session_id = $request['session_id'];
-        $importer = $_SESSION['tainacan_importer'][$session_id];
+		global $Tainacan_Importer_Handler;
+		$importer = $Tainacan_Importer_Handler->get_importer_instance_by_session_id($session_id);
 
         if(!$importer) {
             return new \WP_REST_Response([
@@ -263,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 );
 
     }
@@ -271,7 +275,8 @@ class REST_Importers_Controller extends REST_Controller {
     public function get_saved_mapping( $request ){
         $session_id = $request['session_id'];
         $collection_id = $request['collection_id'];
-        $importer = $_SESSION['tainacan_importer'][$session_id];
+		global $Tainacan_Importer_Handler;
+		$importer = $Tainacan_Importer_Handler->get_importer_instance_by_session_id($session_id);
         $response = false;
 
         if(!$importer) {
@@ -290,7 +295,8 @@ class REST_Importers_Controller extends REST_Controller {
 
     public function get_item( $request ) {
         $session_id = $request['session_id'];
-        $importer = $_SESSION['tainacan_importer'][$session_id];
+		global $Tainacan_Importer_Handler;
+		$importer = $Tainacan_Importer_Handler->get_importer_instance_by_session_id($session_id);
 
         if(!$importer) {
             return new \WP_REST_Response([
@@ -306,7 +312,8 @@ class REST_Importers_Controller extends REST_Controller {
 
     public function add_file( $request )  {
         $session_id = $request['session_id'];
-        $importer = $_SESSION['tainacan_importer'][$session_id];
+		global $Tainacan_Importer_Handler;
+		$importer = $Tainacan_Importer_Handler->get_importer_instance_by_session_id($session_id);
 
         if(!$importer) {
             return new \WP_REST_Response([
@@ -320,6 +327,7 @@ class REST_Importers_Controller extends REST_Controller {
 
         if ( isset($files['file']) && $importer->add_file($files['file']) ) {
             $response = $importer->_to_Array();
+			$Tainacan_Importer_Handler->save_importer_instance($importer);
             return new \WP_REST_Response( $response, 200 );
         } else {
             return new \WP_REST_Response([
@@ -335,7 +343,8 @@ class REST_Importers_Controller extends REST_Controller {
 
     public function run($request) {
         $session_id = $request['session_id'];
-        $importer = $_SESSION['tainacan_importer'][$session_id];
+		global $Tainacan_Importer_Handler;
+		$importer = $Tainacan_Importer_Handler->get_importer_instance_by_session_id($session_id);
 
         if(!$importer) {
             return new \WP_REST_Response([
@@ -358,6 +367,7 @@ class REST_Importers_Controller extends REST_Controller {
         $response = [
             'bg_process_id' => $process->ID
         ];
+		$Tainacan_Importer_Handler->delete_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 d54fe54e2..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_collection_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'       => [
@@ -289,8 +294,16 @@ class REST_Item_Metadata_Controller extends REST_Controller {
 	 *
 	 * @return array
 	 */
-	public function get_collection_params($object_name = null) {
-		$query_params['context']['default'] = 'view';
+	public function get_wp_query_params() {
+		$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 3d0c2cb8d..fb07f33ec 100644
--- a/src/api/endpoints/class-tainacan-rest-items-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-items-controller.php
@@ -49,7 +49,7 @@ class REST_Items_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_collection_params(),
+					'args'                => $this->get_wp_query_params(),
 				),
 				array(
 					'methods'             => \WP_REST_Server::CREATABLE,
@@ -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'
 						),
 					)
 				),
@@ -94,7 +94,7 @@ class REST_Items_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_collection_params(),
+					'args'                => $this->get_wp_query_params(),
 				),
 			)
 		);
@@ -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();
@@ -790,17 +793,17 @@ class REST_Items_Controller extends REST_Controller {
 	 *
 	 * @return array|void
 	 */
-	public function get_collection_params($object_name = null) {
-		$query_params['context']['default'] = 'view';
-
-		array_merge($query_params, parent::get_collection_params('item'));
-
+	public function 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 26379c0f6..c64aebcbb 100644
--- a/src/api/endpoints/class-tainacan-rest-logs-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-logs-controller.php
@@ -17,12 +17,7 @@ class REST_Logs_Controller extends REST_Controller {
 	public function __construct() {
 		$this->rest_base = 'logs';
 		parent::__construct();
-		add_action('init', array($this, 'init_objects'));
-	}
-
-	public function init_objects(){
 		$this->logs_repository = Repositories\Logs::get_instance();
-		$this->log = new Entities\Log();
 	}
 
 	public function register_routes() {
@@ -32,8 +27,9 @@ class REST_Logs_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_collection_params()
-				)
+					'args'                => $this->get_endpoint_args_for_item_schema(\WP_REST_Server::READABLE)
+				),
+				'schema'                  => [$this, 'get_schema']
 			)
 		);
 		register_rest_route($this->namespace, '/' . $this->rest_base . '/(?P<log_id>[\d]+)',
@@ -42,17 +38,19 @@ 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)
-				)
-			)
-		);
-		register_rest_route($this->namespace, '/' . $this->rest_base . '/(?P<log_id>[\d]+)/approve',
-			array(
-				array(
-					'methods'             => \WP_REST_Server::EDITABLE,
-					'callback'            => array($this, 'approve_item'),
-					'permission_callback' => array($this, 'approve_item_permissions_check'),
-				)
+					'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']
 			)
 		);
 		register_rest_route($this->namespace, '/collection/(?P<collection_id>[\d]+)/' . $this->rest_base,
@@ -62,7 +60,8 @@ class REST_Logs_Controller extends REST_Controller {
 					'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)
-				)
+				),
+				'schema'                  => [$this, 'get_schema']
 			)
 		);
 		register_rest_route($this->namespace, '/item/(?P<item_id>[\d]+)/' . $this->rest_base,
@@ -72,7 +71,52 @@ class REST_Logs_Controller extends REST_Controller {
 					'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)
-				)
+				),
+				'schema'                  => [$this, 'get_schema']
+			)
+		);
+		register_rest_route($this->namespace, '/filter/(?P<filter_id>[\d]+)/' . $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_endpoint_args_for_item_schema( \WP_REST_Server::READABLE)
+				),
+				'schema'                  => [$this, 'get_schema']
+			)
+		);
+		register_rest_route($this->namespace, '/metadatum/(?P<metadatum_id>[\d]+)/' . $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_endpoint_args_for_item_schema( \WP_REST_Server::READABLE)
+				),
+				'schema'                  => [$this, 'get_schema']
+			)
+		);
+		register_rest_route($this->namespace, '/taxonomy/(?P<taxonomy_id>[\d]+)/' . $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_endpoint_args_for_item_schema( \WP_REST_Server::READABLE)
+				),
+				'schema'                  => [$this, 'get_schema']
+			)
+		);
+		register_rest_route($this->namespace, '/term/(?P<term_id>[\d]+)/' . $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_endpoint_args_for_item_schema( \WP_REST_Server::READABLE)
+				),
+				'schema'                  => [$this, 'get_schema']
 			)
 		);
 	}
@@ -86,22 +130,127 @@ class REST_Logs_Controller extends REST_Controller {
 	public function prepare_item_for_response( $item, $request ) {
 		if(!empty($item)){
 
-			if(!isset($request['fetch_only'])) {
-				$item_array = $item->_toArray();
-
-				unset($item_array['value']);
-				unset($item_array['old_value']);
-
-				return $item_array;
+			// Hanle logs created before 1.0
+			if ( !empty( get_post_meta($item->get_id(), 'value', true) ) &&  !empty( get_post_meta($item->get_id(), 'log_diffs', true) ) ) {
+				return $this->prepare_legacy_item_for_response($item, $request);
 			}
+			
+			if ($request['log_id']) {
+				
+			
+				$item_array = $item->_toArray();
+				
+				$related_object = true;
+				
+				if ($item_array['item_id']) {
+					$item = Repositories\Items::get_instance()->fetch( (int) $item_array['item_id'] );
+					if ($item instanceof Entities\Item ) {
+						$item_array['item'] = $item->_toArray();
+					}
+				}
+				if ($item_array['collection_id']) {
+					$collection = Repositories\Collections::get_instance()->fetch( (int) $item_array['collection_id'] );
+					if ($collection instanceof Entities\Item ) {
+						$item_array['collection'] = $collection->_toArray();
+					}
+				}
+				
+				if ( $item_array['object_id'] ) {
+					
+					if ( $item_array['object_type'] == 'Tainacan\Entities\Term' ) {
+						$related_entity = Repositories\Terms::get_instance()->fetch( (int) $item_array['object_id'] );
+					} else {
+						$related_post = get_post($item_array['object_id']);
+						$related_entity = Repository::get_entity_by_post( $related_post );
+					}
+					
+					if ($related_entity instanceof Entities\Entity ) {
+						$item_array[ 'object' ] = $related_entity->_toArray();
+					}
+					
+				}
+				
+				if ( $item_array['action'] == 'new-attachment' ) {
+					if ( isset($item_array['new_value']['id']) ) {
+						$item_array['new_value']['url'] = wp_get_attachment_url($item_array['new_value']['id']);
+						$item_array['new_value']['thumb'] = wp_get_attachment_image_src($item_array['new_value']['id'], 'thumbnail');
+					}
+				} elseif ( $item_array['action'] == 'update-document' ) {
+					if ( isset( $item_array['new_value']['document'] ) && is_numeric( $item_array['new_value']['document'] ) ) { 
+						$item_array['new_value']['url'] = wp_get_attachment_url($item_array['new_value']['document']);
+						$item_array['new_value']['thumb'] = wp_get_attachment_image_src($item_array['new_value']['document'], 'thumbnail');
+					}
+					if ( isset( $item_array['old_value']['document'] ) && is_numeric( $item_array['old_value']['document'] ) ) { 
+						$item_array['old_value']['url'] = wp_get_attachment_url($item_array['old_value']['document']);
+						$item_array['old_value']['thumb'] = wp_get_attachment_image_src($item_array['old_value']['document'], 'thumbnail');
+					}
+				} elseif ( $item_array['action'] == 'update-thumbnail' ) {
+					if ( isset( $item_array['new_value']['_thumbnail_id'] ) ) { 
+						$item_array['new_value']['url'] = wp_get_attachment_url($item_array['new_value']['_thumbnail_id']);
+						$item_array['new_value']['thumb'] = wp_get_attachment_image_src($item_array['new_value']['_thumbnail_id'], 'thumbnail');
+					}
+					if ( isset( $item_array['old_value']['_thumbnail_id'] ) ) { 
+						$item_array['old_value']['url'] = wp_get_attachment_url($item_array['old_value']['_thumbnail_id']);
+						$item_array['old_value']['thumb'] = wp_get_attachment_image_src($item_array['old_value']['_thumbnail_id'], 'thumbnail');
+					}
+				}
+				
+				
+				// translate 
+				if (isset($related_entity) && $related_entity instanceof Entities\Entity ) {
+					
+					$map = $related_entity->get_repository()->get_map();
+					
+					foreach ( $map as $slug => $m ) {
+						
+						if ( isset($item_array['new_value'][$slug]) ) {
+							$item_array['new_value'][$m['title']] = $item_array['new_value'][$slug];
+							unset($item_array['new_value'][$slug]);
+						}
+						if ( isset($item_array['old_value'][$slug]) ) {
+							$item_array['old_value'][$m['title']] = $item_array['old_value'][$slug];
+							unset($item_array['old_value'][$slug]);
+						}
+						
+					}
+					
+				}
+				
+				return $item_array;
+				
+			} else {
+				
+				if(!isset($request['fetch_only'])) {
+					$item_array = $item->_toArray();
+					return $item_array;
+				}
 
-			$attributes_to_filter = $request['fetch_only'];
+				$attributes_to_filter = $request['fetch_only'];
+				
+			}
 
 			return $this->filter_object_by_attributes($item, $attributes_to_filter);
 		}
 
 		return $item;
 	}
+	
+	private function prepare_legacy_item_for_response($item, $request) {
+		if(!isset($request['fetch_only'])) {
+			$item_array = $item->_toArray();
+
+			unset($item_array['value']);
+			unset($item_array['old_value']);
+			
+			$item_array['legacy'] = true;
+
+			return $item_array;
+		}
+
+		$attributes_to_filter = $request['fetch_only'];
+
+		return $this->filter_object_by_attributes($item, $attributes_to_filter);
+	}
 
 	/**
 	 * @param \WP_REST_Request $request
@@ -114,91 +263,28 @@ class REST_Logs_Controller extends REST_Controller {
 		$args = $this->prepare_filters( $request );
 
 
-		if ($request['item_id']){
-			$item_id = $request['item_id'];
-
-			$item_repository = Repositories\Items::get_instance();
-
-			$item = $item_repository->fetch($item_id);
-
-			if(!$item){
-				return new \WP_REST_Response([
-					'error_message' => __('An item with this ID does not exist', 'tainacan'),
-					'item_id' => $item
-				], 400);
-			}
-
-			if($args &&
-			   array_key_exists('meta_query', $args) &&
-			   array_key_exists('relation', $args['meta_query'])){
-
-				$metaq = $args['meta_query'];
-
-				unset($args['meta_query']);
-
-				$args['meta_query'][] = $metaq;
-				$args['meta_query']['relation'] = 'AND';
-
-			} elseif($args &&
-			         array_key_exists('meta_query', $args)){
-				$args['meta_query']['relation'] = 'AND';
-			}
-
-			$args = array_merge_recursive(array(
-				'meta_query' => array(
-					'item_clause' => array(
-						'key'     => 'item_id',
-						'value'   => $item_id,
-						'compare' => '='
-					)
-				)
-			), $args);
+		if ($request['item_id']) {
+			$args['item_id'] = $request['item_id'];
+		} elseif ($request['collection_id']) {
+			$args['collection_id'] = $request['collection_id'];
+		} elseif ($request['filter_id']) {
+			$args['object_type'] = 'Tainacan\Entities\Filter';
+			$args['object_id'] = $request['filter_id'];
+		} elseif ($request['metadatum_id']) {
+			$args['object_type'] = 'Tainacan\Entities\Metadatum';
+			$args['object_id'] = $request['metadatum_id'];
+		} elseif ($request['taxonomy_id']) {
+			$args['object_type'] = 'Tainacan\Entities\Taxonomy';
+			$args['object_id'] = $request['taxonomy_id'];
+		} elseif ($request['term_id']) {
+			$args['object_type'] = 'Tainacan\Entities\Term';
+			$args['object_id'] = $request['term_id'];
 		}
 
-		if($request['collection_id']){
-			$collection_id = $request['collection_id'];
-
-			$collection_repository = Repositories\Collections::get_instance();
-
-			$collection = $collection_repository->fetch($collection_id);
-
-			if(!$collection){
-				return new \WP_REST_Response([
-					'error_message' => __('A collection with this ID does not exist', 'tainacan'),
-					'collection_id' => $collection_id
-				], 400);
-			}
-
-			if($args &&
-			   array_key_exists('meta_query', $args) &&
-			   array_key_exists('relation', $args['meta_query'])){
-
-				$metaq = $args['meta_query'];
-
-				unset($args['meta_query']);
-
-				$args['meta_query'][] = $metaq;
-				$args['meta_query']['relation'] = 'AND';
-
-			} elseif($args &&
-			         array_key_exists('meta_query', $args)){
-				$args['meta_query']['relation'] = 'AND';
-			}
-
-			$args = array_merge_recursive(array(
-				'meta_query' => array(
-					'collection_clause' => array(
-						'key'     => 'collection_id',
-						'value'   => $collection_id,
-						'compare' => '='
-					)
-				)
-			), $args);
-		}
-
-		$logs = $this->logs_repository->fetch($args);
-
+		$logs = Repositories\Logs::get_instance()->fetch($args);
+		
 		$response = [];
+		
 		if($logs->have_posts()){
 			while ($logs->have_posts()){
 				$logs->the_post();
@@ -228,6 +314,7 @@ class REST_Logs_Controller extends REST_Controller {
 	 * @return bool|\WP_Error
 	 */
 	public function get_items_permissions_check( $request ) {
+		return true;
 		return current_user_can('read');
 	}
 
@@ -239,7 +326,7 @@ class REST_Logs_Controller extends REST_Controller {
 	public function get_item( $request ) {
 		$log_id = $request['log_id'];
 
-		$log = $this->logs_repository->fetch($log_id);
+		$log = Repositories\Logs::get_instance()->fetch($log_id);
 
 		$prepared_log = $this->prepare_item_for_response( $log, $request );
 
@@ -252,7 +339,8 @@ class REST_Logs_Controller extends REST_Controller {
 	 * @return bool|\WP_Error
 	 */
 	public function get_item_permissions_check( $request ) {
-		$log = $this->logs_repository->fetch($request['log_id']);
+		return true;
+		$log = Repositories\Logs::get_instance()->fetch($request['log_id']);
 
 		if(($log instanceof Entities\Log)) {
 			if('edit' === $request['context'] && !$log->can_read()) {
@@ -264,52 +352,6 @@ class REST_Logs_Controller extends REST_Controller {
 
 		return false;
 	}
-	
-	/**
-	 * @param \WP_REST_Request $request
-	 *
-	 * @return bool|\WP_Error
-	 */
-	public function approve_item_permissions_check( $request ) {
-		$log = $this->logs_repository->fetch($request['log_id']);
-
-		if($log instanceof Entities\Log){
-			if($log->can_read()) {
-				$entity = $log->get_value();
-
-				if($entity instanceof Entities\Entity) {
-					if($entity instanceof Entities\Item_Metadata_Entity) {
-						$item = $entity->get_item();
-						return $item->can_edit();
-					} // TODO for other entities types
-					else {
-						return $entity->can_edit();
-					}
-				}
-
-				return new \WP_Error();
-			}
-		}
-
-		return false;
-	}
-	
-	/**
-	 * approve a logged modification
-	 * @param \WP_REST_Request $request
-	 *
-	 * @return \WP_Error|\WP_REST_Response
-	 */
-	public function approve_item($request) {
-		$log = $this->logs_repository->fetch($request['log_id']);
-
-		if($log instanceof Entities\Log){
-			$entity = $log->approve();
-			$prepared_entity = $this->prepare_item_for_response( $entity, $request );
-			
-			return new \WP_REST_Response($prepared_entity, 200);
-		}
-	}
 
 	/**
 	 * @param string $method
@@ -319,37 +361,32 @@ 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;
 	}
 
-	/**
-	 *
-	 * Return the queries supported when getting a collection of objects
-	 *
-	 * @param null $object_name
-	 *
-	 * @return array
-	 */
-	public function get_collection_params($object_name = null) {
-		$query_params['context']['default'] = 'view';
-
-		$query_params = array_merge($query_params, parent::get_collection_params('log'));
-
-		$query_params['title'] = array(
-			'description' => __('Limits the result set to a log with a specific title'),
-			'type'        => 'string',
+	function get_schema() {
+		$schema = [
+			'$schema'  => 'http://json-schema.org/draft-04/schema#',
+			'title' => 'log',
+			'type' => 'object'
+		];
+		
+		$main_schema = parent::get_repository_schema( $this->logs_repository );
+		$permissions_schema = parent::get_permissions_schema();
+			
+		$schema['properties'] = array_merge(
+			parent::get_base_properties_schema(),
+			$main_schema,
+			$permissions_schema
 		);
-
-		$query_params = array_merge($query_params, parent::get_meta_queries_params());
-
-		return $query_params;
+		
+		return $schema;
 	}
 }
 
diff --git a/src/api/endpoints/class-tainacan-rest-metadata-controller.php b/src/api/endpoints/class-tainacan-rest-metadata-controller.php
index 5dba080b7..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,34 @@ 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']
 			)
 		);
 		register_rest_route($this->namespace, '/collection/(?P<collection_id>[\d]+)/' . $this->rest_base,
@@ -70,7 +80,7 @@ class REST_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_collection_params(),
+					'args'                => $this->get_wp_query_params(),
 				),
 				array(
 					'methods'             => \WP_REST_Server::CREATABLE,
@@ -78,31 +88,43 @@ class REST_Metadata_Controller extends REST_Controller {
 					'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,
 			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(),
+				),
 				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_collection_params(),
-				)
+				'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,
@@ -111,11 +133,11 @@ 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'],
 			)
 		);
 	}
@@ -536,10 +558,10 @@ class REST_Metadata_Controller extends REST_Controller {
 	 *
 	 * @return array|void
 	 */
-	public function get_collection_params( $object_name = null ) {
+	public function get_wp_query_params() {
 		$query_params['context']['default'] = 'view';
 
-		$query_params = array_merge($query_params, parent::get_collection_params('metadatum'));
+		$query_params = array_merge($query_params, parent::get_wp_query_params());
 
 		$query_params['name'] = array(
 			'description' => __('Limits the result set to metadata with a specific name'),
@@ -560,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();
 
@@ -582,6 +603,32 @@ class REST_Metadata_Controller extends REST_Controller {
 
 		return $endpoint_args;
 	}
+
+	function get_schema() {
+		$schema = [
+			'$schema'  => 'http://json-schema.org/draft-04/schema#',
+			'title' => 'metadatum',
+			'type' => 'object'
+		];
+		
+		$main_schema = parent::get_repository_schema( $this->metadatum_repository );
+		$permissions_schema = parent::get_permissions_schema();
+		
+		// $item_metadata_scheme = parent::get_repository_schema( $this->item_metadata_repository );
+		// $item_scheme = parent::get_repository_schema( $this->item_repository );
+		// $collection_scheme = parent::get_repository_schema( $this->collection_repository );
+		
+		$schema['properties'] = array_merge(
+			parent::get_base_properties_schema(),
+			$main_schema,
+			$permissions_schema
+			// $item_metadata_scheme,
+			// $item_scheme,
+			// $collection_scheme
+		);
+		
+		return $schema;
+	}
 }
 
 ?>
\ No newline at end of file
diff --git a/src/api/endpoints/class-tainacan-rest-taxonomies-controller.php b/src/api/endpoints/class-tainacan-rest-taxonomies-controller.php
index 6d70ffff3..7004eb5da 100644
--- a/src/api/endpoints/class-tainacan-rest-taxonomies-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-taxonomies-controller.php
@@ -36,14 +36,15 @@ class REST_Taxonomies_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_collection_params()
+					'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(
@@ -53,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,
@@ -61,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',
 						),
 					)
 				),
@@ -71,7 +86,8 @@ class REST_Taxonomies_Controller extends REST_Controller {
 					'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)
-				)
+				),
+				'schema'                  => [$this, 'get_schema']
 			)
 		);
 		register_rest_route(
@@ -82,7 +98,8 @@ class REST_Taxonomies_Controller extends REST_Controller {
 					'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)
-				)
+				),
+				'schema'                  => [$this, 'get_schema']
 			)
 		);
 	}
@@ -449,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();
 
@@ -485,10 +497,10 @@ class REST_Taxonomies_Controller extends REST_Controller {
 	 *
 	 * @return array
 	 */
-	public function get_collection_params($object_name = null) {
+	public function get_wp_query_params() {
 		$query_params['context']['default'] = 'view';
 
-		$query_params = array_merge($query_params, parent::get_collection_params('tax'));
+		$query_params = array_merge($query_params, parent::get_wp_query_params());
 
 		$query_params['name'] = array(
 			'description' => __('Limits the result set to a taxonomy with a specific name.'),
@@ -499,6 +511,26 @@ class REST_Taxonomies_Controller extends REST_Controller {
 
 		return $query_params;
 	}
+
+	function get_schema() {
+		$schema = [
+			'$schema'  => 'http://json-schema.org/draft-04/schema#',
+			'title' => 'taxonomy',
+			'type' => 'object'
+		];
+		
+		$main_schema = parent::get_repository_schema( $this->taxonomy_repository );
+		$permissions_schema = parent::get_permissions_schema();
+		
+		$schema['properties'] = array_merge(
+			parent::get_base_properties_schema(),
+			$main_schema,
+			$permissions_schema
+		);
+		
+		return $schema;
+		
+	}
 }
 
 ?>
\ No newline at end of file
diff --git a/src/api/endpoints/class-tainacan-rest-terms-controller.php b/src/api/endpoints/class-tainacan-rest-terms-controller.php
index 16c35c483..e1debad91 100644
--- a/src/api/endpoints/class-tainacan-rest-terms-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-terms-controller.php
@@ -44,8 +44,9 @@ class REST_Terms_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_collection_params()
-				)
+					'args'                => $this->get_wp_query_params()
+				),
+				'schema'                  => [$this, 'get_schema']
 			)
 		);
 		register_rest_route($this->namespace,'/taxonomy/(?P<taxonomy_id>[\d]+)/'. $this->rest_base . '/(?P<term_id>[\d]+)' ,
@@ -55,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'
 						]
 					]
 				),
@@ -71,7 +73,8 @@ class REST_Terms_Controller extends REST_Controller {
 					'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']
 			)
 		);
 	}
@@ -418,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();
 
@@ -449,10 +451,10 @@ class REST_Terms_Controller extends REST_Controller {
 	 *
 	 * @return array
 	 */
-	public function get_collection_params($object_name = null) {
+	public function get_wp_query_params() {
 		$query_params['context']['default'] = 'view';
 
-		$query_params = array_merge($query_params, parent::get_collection_params('term'));
+		$query_params = array_merge($query_params, parent::get_wp_query_params());
 
 		$query_params['name'] = array(
 			'description' => __('Limits the result set to terms with a specific name'),
@@ -463,6 +465,28 @@ class REST_Terms_Controller extends REST_Controller {
 
 		return $query_params;
 	}
+
+	function get_schema() {
+		$schema = [
+			'$schema'  => 'http://json-schema.org/draft-04/schema#',
+			'title' => 'term',
+			'type' => 'object'
+		];
+		
+		$main_schema = parent::get_repository_schema( $this->terms_repository );
+		$permissions_schema = parent::get_permissions_schema();
+		
+		// $taxonomy_scheme = parent::get_repository_schema( $this->taxonomy_repository );
+		
+		$schema['properties'] = array_merge(
+			parent::get_base_properties_schema(),
+			$main_schema,
+			$permissions_schema
+			// $taxonomy_scheme
+		);
+		
+		return $schema;
+	}
 }
 
 ?>
\ No newline at end of file
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-terms-list.css b/src/assets/css/tainacan-gutenberg-block-carousel-terms-list.css
new file mode 100644
index 000000000..59f0778cc
--- /dev/null
+++ b/src/assets/css/tainacan-gutenberg-block-carousel-terms-list.css
@@ -0,0 +1,424 @@
+[data-align='full'] .block-control {
+  width: calc(100% + 14px); }
+
+.block-control {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  padding: 5px;
+  position: relative;
+  top: -14px;
+  left: -14px;
+  width: calc(100% + 28px);
+  background: #f2f2f2; }
+  .block-control p {
+    font-size: 0.875rem !important;
+    margin: 12px 1.5rem 16px 0;
+    fill: #555758; }
+    .block-control p svg {
+      top: 4px;
+      margin-right: 0.75rem;
+      position: relative;
+      fill: #555758; }
+
+.components-placeholder__fieldset p {
+  font-size: 0.875rem !important;
+  margin-top: -2px;
+  fill: #555758; }
+  .components-placeholder__fieldset p svg {
+    margin-right: 1rem;
+    top: 4px;
+    position: relative;
+    fill: #555758; }
+
+.wp-block-tainacan-modal {
+  width: 50%; }
+  @media only screen and (max-width: 1024px) {
+    .wp-block-tainacan-modal {
+      width: 75%; } }
+  @media only screen and (max-width: 768px) {
+    .wp-block-tainacan-modal {
+      width: 100%; } }
+  .wp-block-tainacan-modal.dynamic-modal {
+    width: 90%;
+    height: 90%;
+    width: 80vw;
+    height: 80vh; }
+    .wp-block-tainacan-modal.dynamic-modal iframe {
+      width: calc(100% + 32px);
+      height: calc(100% - 128px);
+      margin-left: -16px; }
+    .wp-block-tainacan-modal.dynamic-modal .modal-footer-area {
+      height: 68px;
+      width: calc(100% + 32px);
+      margin-left: -16px !important;
+      padding: 1.2rem 1.2rem !important;
+      border-top: 1px solid #cbcbcb; }
+  .wp-block-tainacan-modal .spinner-container {
+    min-height: 56px;
+    padding: 1rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: #555758; }
+    .wp-block-tainacan-modal .spinner-container .components-spineer {
+      margin: 8px; }
+  .wp-block-tainacan-modal .components-modal__header .components-icon-button {
+    padding-right: 0; }
+  .wp-block-tainacan-modal hr {
+    margin: 5px 0.75rem; }
+  .wp-block-tainacan-modal .modal-search-area {
+    display: flex;
+    justify-content: center;
+    margin-bottom: 14px; }
+    .wp-block-tainacan-modal .modal-search-area .components-base-control {
+      width: 60%; }
+      @media only screen and (max-width: 1024px) {
+        .wp-block-tainacan-modal .modal-search-area .components-base-control {
+          width: 95%; } }
+      .wp-block-tainacan-modal .modal-search-area .components-base-control:nth-child(2) {
+        flex-shrink: 2; }
+      .wp-block-tainacan-modal .modal-search-area .components-base-control .components-base-control__field {
+        flex-wrap: wrap; }
+      .wp-block-tainacan-modal .modal-search-area .components-base-control label.components-base-control__label {
+        font-weight: 500;
+        color: #454647;
+        font-size: 0.875rem;
+        text-align: center; }
+      .wp-block-tainacan-modal .modal-search-area .components-base-control input.components-text-control__input {
+        padding: 5px 8px;
+        height: 28px; }
+  .wp-block-tainacan-modal .modal-radio-area-label {
+    font-weight: 500;
+    margin-left: 1.75rem; }
+  .wp-block-tainacan-modal .modal-checkbox-list,
+  .wp-block-tainacan-modal .modal-radio-list .components-base-control__field {
+    padding: 0;
+    display: -ms-grid;
+    display: grid;
+    grid-template-columns: repeat(auto-fill, 250px);
+    grid-gap: 0px;
+    justify-content: space-evenly;
+    list-style-type: none;
+    margin: 12px;
+    max-height: 50vh;
+    overflow-y: auto;
+    overflow-x: hidden; }
+    .wp-block-tainacan-modal .modal-checkbox-list .components-base-control,
+    .wp-block-tainacan-modal .modal-radio-list .components-base-control__field .components-base-control {
+      overflow: hidden; }
+    .wp-block-tainacan-modal .modal-checkbox-list .modal-checkbox-list-item,
+    .wp-block-tainacan-modal .modal-checkbox-list .components-radio-control__option,
+    .wp-block-tainacan-modal .modal-radio-list .components-base-control__field .modal-checkbox-list-item,
+    .wp-block-tainacan-modal .modal-radio-list .components-base-control__field .components-radio-control__option {
+      display: flex;
+      justify-content: flex-start; }
+      .wp-block-tainacan-modal .modal-checkbox-list .modal-checkbox-list-item img,
+      .wp-block-tainacan-modal .modal-checkbox-list .components-radio-control__option img,
+      .wp-block-tainacan-modal .modal-radio-list .components-base-control__field .modal-checkbox-list-item img,
+      .wp-block-tainacan-modal .modal-radio-list .components-base-control__field .components-radio-control__option img {
+        width: 24px;
+        height: 24px;
+        margin-right: 10px; }
+      .wp-block-tainacan-modal .modal-checkbox-list .modal-checkbox-list-item label,
+      .wp-block-tainacan-modal .modal-checkbox-list .components-radio-control__option label,
+      .wp-block-tainacan-modal .modal-radio-list .components-base-control__field .modal-checkbox-list-item label,
+      .wp-block-tainacan-modal .modal-radio-list .components-base-control__field .components-radio-control__option label {
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        display: inline-block;
+        max-width: 85%; }
+        @media only screen and (max-width: 768px) {
+          .wp-block-tainacan-modal .modal-checkbox-list .modal-checkbox-list-item label,
+          .wp-block-tainacan-modal .modal-checkbox-list .components-radio-control__option label,
+          .wp-block-tainacan-modal .modal-radio-list .components-base-control__field .modal-checkbox-list-item label,
+          .wp-block-tainacan-modal .modal-radio-list .components-base-control__field .components-radio-control__option label {
+            max-width: 80%; } }
+  .wp-block-tainacan-modal .modal-loadmore-section {
+    display: flex;
+    align-items: baseline;
+    justify-content: center; }
+    .wp-block-tainacan-modal .modal-loadmore-section p {
+      color: #555758;
+      margin-right: 12px;
+      margin-top: 2px; }
+  .wp-block-tainacan-modal .modal-footer-area {
+    border-top: 1px solid #e2e4e7;
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
+    padding: 16px 16px 0 16px;
+    margin: 0 -16px; }
+    .wp-block-tainacan-modal .modal-footer-area p {
+      padding: 0 12px;
+      color: #454647; }
+
+.components-panel__body .term-carousel-view-modes {
+  display: flex;
+  margin: 12px 0 24px 0; }
+  .components-panel__body .term-carousel-view-modes button {
+    background: transparent;
+    border: 1px solid #cbcbcb;
+    border-radius: 5px;
+    padding: 2px;
+    margin: 0;
+    width: calc(50% - 6px);
+    flex-shrink: 0;
+    cursor: pointer;
+    transition: border ease 0.5s, opacity ease 0.5; }
+    .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 {
+        display: grid;
+        grid-template-columns: 33% 33% 33%;
+        grid-template-rows: 50% 50%;
+        grid-column-gap: 2px;
+        grid-row-gap: 2px;
+        width: 60px;
+        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;
+          width: 41px;
+          height: 42px; }
+        .components-panel__body .term-carousel-view-modes button.term-carousel-view-mode-grid div > div {
+          width: 20px;
+          height: 20px;
+          background: #555758;
+          transition: background-color ease 0.5s; }
+    .components-panel__body .term-carousel-view-modes button.term-carousel-view-mode-thumbnail {
+      margin-left: 6px; }
+      .components-panel__body .term-carousel-view-modes button.term-carousel-view-mode-thumbnail div {
+        display: block;
+        height: 40px;
+        width: 40px;
+        background: #555758;
+        margin: 4px auto 8px auto;
+        transition: background-color ease 0.5s; }
+    .components-panel__body .term-carousel-view-modes button label {
+      font-size: 0.75rem;
+      color: #555758; }
+    .components-panel__body .term-carousel-view-modes button.is-active {
+      border: 2px solid #298596; }
+      .components-panel__body .term-carousel-view-modes button.is-active.term-carousel-view-mode-thumbnail div, .components-panel__body .term-carousel-view-modes button.is-active.term-carousel-view-mode-grid div > div {
+        background-color: #298596; }
+    .components-panel__body .term-carousel-view-modes button:hover {
+      opacity: 0.9;
+      border-width: 2px; }
+      .components-panel__body .term-carousel-view-modes button:hover button {
+        background: #f2f2f2; }
+
+.wp-block-tainacan-carousel-terms-list {
+  margin: 2rem 0px; }
+  .wp-block-tainacan-carousel-terms-list .spinner-container {
+    min-height: 56px;
+    padding: 1rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: #555758; }
+@-webkit-keyframes skeleton-animation {
+  0% {
+    opacity: 1.0; }
+  50% {
+    opacity: 0.2; }
+  100% {
+    opacity: 1.0; } }
+@-moz-keyframes skeleton-animation {
+  0% {
+    opacity: 1.0; }
+  50% {
+    opacity: 0.2; }
+  100% {
+    opacity: 1.0; } }
+@-o-keyframes skeleton-animation {
+  0% {
+    opacity: 1.0; }
+  50% {
+    opacity: 0.2; }
+  100% {
+    opacity: 1.0; } }
+@keyframes skeleton-animation {
+  0% {
+    opacity: 1.0; }
+  50% {
+    opacity: 0.2; }
+  100% {
+    opacity: 1.0; } }
+  .wp-block-tainacan-carousel-terms-list .skeleton {
+    border-radius: 2px;
+    background: #f2f2f2;
+    -webkit-animation: skeleton-animation 1.8s ease infinite;
+    -moz-animation: skeleton-animation 1.8s ease infinite;
+    -o-animation: skeleton-animation 1.8s ease infinite;
+    animation: skeleton-animation 1.8s ease infinite; }
+  .wp-block-tainacan-carousel-terms-list .tainacan-carousel {
+    position: relative;
+    width: calc(100% + 40px);
+    left: -20px; }
+    .wp-block-tainacan-carousel-terms-list .tainacan-carousel .swiper-container {
+      margin: 0 50px; }
+      .wp-block-tainacan-carousel-terms-list .tainacan-carousel .swiper-container a > span,
+      .wp-block-tainacan-carousel-terms-list .tainacan-carousel .swiper-container a:hover > span {
+        color: black;
+        font-weight: bold;
+        text-decoration: none;
+        padding: 8px 16px;
+        display: block;
+        line-height: 1.2rem; }
+      .wp-block-tainacan-carousel-terms-list .tainacan-carousel .swiper-container a > img {
+        width: 100%;
+        height: auto; }
+      .wp-block-tainacan-carousel-terms-list .tainacan-carousel .swiper-container a:hover {
+        text-decoration: none; }
+      .wp-block-tainacan-carousel-terms-list .tainacan-carousel .swiper-container .swiper-slide.term-list-item-grid a {
+        width: 100%;
+        display: block; }
+      .wp-block-tainacan-carousel-terms-list .tainacan-carousel .swiper-container .swiper-slide.term-list-item-grid .term-items-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; }
+        .wp-block-tainacan-carousel-terms-list .tainacan-carousel .swiper-container .swiper-slide.term-list-item-grid .term-items-grid img {
+          width: 100%;
+          height: auto;
+          padding: 2px;
+          margin-bottom: 0px; }
+  .wp-block-tainacan-carousel-terms-list .preview-warning {
+    width: 100%;
+    font-size: 0.875rem;
+    font-style: italic;
+    color: #898d8f;
+    text-align: center;
+    margin: 4px auto; }
+  .wp-block-tainacan-carousel-terms-list .swiper-button-prev, .wp-block-tainacan-carousel-terms-list .swiper-button-next {
+    top: calc(50% - 42px);
+    bottom: initial;
+    background: none;
+    border: none;
+    width: 42px;
+    height: 42px;
+    padding: 0;
+    margin: 0 -4px; }
+    .wp-block-tainacan-carousel-terms-list .swiper-button-prev svg, .wp-block-tainacan-carousel-terms-list .swiper-button-next svg {
+      fill: #298596; }
+  .wp-block-tainacan-carousel-terms-list .terms-list-edit-container,
+  .wp-block-tainacan-carousel-terms-list .tainacan-carousel {
+    position: relative; }
+    .wp-block-tainacan-carousel-terms-list .terms-list-edit-container .skeleton,
+    .wp-block-tainacan-carousel-terms-list .tainacan-carousel .skeleton {
+      min-height: 150px;
+      max-height: 150px; }
+    .wp-block-tainacan-carousel-terms-list .terms-list-edit-container.has-arrows-none .swiper-button-prev, .wp-block-tainacan-carousel-terms-list .terms-list-edit-container.has-arrows-none .swiper-button-next,
+    .wp-block-tainacan-carousel-terms-list .tainacan-carousel.has-arrows-none .swiper-button-prev,
+    .wp-block-tainacan-carousel-terms-list .tainacan-carousel.has-arrows-none .swiper-button-next {
+      display: none; }
+    .wp-block-tainacan-carousel-terms-list .terms-list-edit-container.has-arrows-left .swiper-button-next,
+    .wp-block-tainacan-carousel-terms-list .tainacan-carousel.has-arrows-left .swiper-button-next {
+      left: 10px;
+      right: auto;
+      top: calc(50% + 12px) !important; }
+    .wp-block-tainacan-carousel-terms-list .terms-list-edit-container.has-arrows-right .swiper-button-prev,
+    .wp-block-tainacan-carousel-terms-list .tainacan-carousel.has-arrows-right .swiper-button-prev {
+      right: 10px;
+      left: auto; }
+    .wp-block-tainacan-carousel-terms-list .terms-list-edit-container.has-arrows-right .swiper-button-next,
+    .wp-block-tainacan-carousel-terms-list .tainacan-carousel.has-arrows-right .swiper-button-next {
+      top: calc(50% + 12px) !important; }
+  .wp-block-tainacan-carousel-terms-list ul.terms-list-edit {
+    display: flex;
+    align-items: flex-start;
+    overflow-x: scroll;
+    list-style: none;
+    margin: 0 36px; }
+    .wp-block-tainacan-carousel-terms-list ul.terms-list-edit li.term-list-item {
+      position: relative;
+      display: block;
+      margin: 16px 32px 16px 0px;
+      width: calc(16.666% - 32px);
+      min-width: calc(16.666% - 32px); }
+      .wp-block-tainacan-carousel-terms-list ul.terms-list-edit li.term-list-item.term-list-item-grid {
+        margin: 16px;
+        width: calc(25% - 16px);
+        min-width: calc(25% - 16px); }
+      .wp-block-tainacan-carousel-terms-list ul.terms-list-edit li.term-list-item a {
+        color: #454647;
+        font-weight: bold;
+        line-height: normal; }
+      .wp-block-tainacan-carousel-terms-list ul.terms-list-edit li.term-list-item img {
+        height: auto;
+        padding: 0px;
+        margin-bottom: 0.5rem; }
+      .wp-block-tainacan-carousel-terms-list ul.terms-list-edit li.term-list-item:hover a {
+        color: #454647;
+        text-decoration: none; }
+      .wp-block-tainacan-carousel-terms-list ul.terms-list-edit li.term-list-item button {
+        position: absolute !important;
+        background-color: rgba(255, 255, 255, 0.75);
+        color: #454647;
+        padding: 2px;
+        margin-left: 5px;
+        min-width: 14px;
+        visibility: hidden;
+        position: relative;
+        opacity: 0;
+        right: -14px;
+        top: 0px;
+        justify-content: center;
+        z-index: 999; }
+      .wp-block-tainacan-carousel-terms-list ul.terms-list-edit li.term-list-item:hover button {
+        visibility: visible;
+        background-color: white !important;
+        opacity: 1;
+        right: -8px;
+        top: -8px;
+        border: 1px solid #cbcbcb;
+        border-radius: 12px;
+        transition: opacity linear 0.15s, right linear 0.15s; }
+      .wp-block-tainacan-carousel-terms-list ul.terms-list-edit li.term-list-item:hover button:hover {
+        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 {
+        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; }
+        .wp-block-tainacan-carousel-terms-list ul.terms-list-edit li.term-list-item .term-items-grid img {
+          padding: 2px;
+          margin-bottom: 0px; }
+  @media only screen and (max-width: 1686px) {
+    .wp-block-tainacan-carousel-terms-list ul.terms-list-edit li.term-list-item {
+      width: calc(20% - 32px);
+      min-width: calc(20% - 32px); } }
+  @media only screen and (max-width: 1452px) {
+    .wp-block-tainacan-carousel-terms-list ul.terms-list-edit li.term-list-item {
+      width: calc(25% - 32px);
+      min-width: calc(25% - 32px); } }
+  @media only screen and (max-width: 1118px) {
+    .wp-block-tainacan-carousel-terms-list ul.terms-edit li.term-list-item {
+      width: calc(33.333% - 32px);
+      min-width: calc(33.333% - 32px); } }
+  @media only screen and (max-width: 854px) {
+    .wp-block-tainacan-carousel-terms-list ul.terms-list-edit li.term-list-item {
+      width: calc(50% - 32px);
+      min-width: calc(50% - 32px); } }
+  @media only screen and (max-width: 584px) {
+    .wp-block-tainacan-carousel-terms-list ul.terms-list-edit li.term-list-item {
+      width: calc(100% - 32px);
+      min-width: calc(100% - 32px); } }
+
+/*# sourceMappingURL=tainacan-gutenberg-block-carousel-terms-list.css.map */
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
new file mode 100644
index 000000000..1154d64f7
--- /dev/null
+++ b/src/assets/css/tainacan-gutenberg-block-carousel-terms-list.css.map
@@ -0,0 +1,7 @@
+{
+"version": 3,
+"mappings": "AAEA,kCAAmC;EAC/B,KAAK,EAAE,iBAAiB;;AAE5B,cAAe;EACX,OAAO,EAAE,IAAI;EACb,cAAc,EAAE,GAAG;EACnB,eAAe,EAAE,MAAM;EACvB,WAAW,EAAE,MAAM;EACnB,OAAO,EAAE,GAAG;EACZ,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,KAAK;EACV,IAAI,EAAE,KAAK;EACX,KAAK,EAAE,iBAAiB;EACxB,UAAU,EAAE,OAAO;EAEnB,gBAAE;IACE,SAAS,EAAE,mBAAmB;IAC9B,MAAM,EAAE,kBAAkB;IAC1B,IAAI,EAAE,OAAO;IAEb,oBAAI;MACA,GAAG,EAAE,GAAG;MACR,YAAY,EAAE,OAAO;MACrB,QAAQ,EAAE,QAAQ;MAClB,IAAI,EAAE,OAAO;;AAIzB,mCAAoC;EAChC,SAAS,EAAE,mBAAmB;EAC9B,UAAU,EAAE,IAAI;EAChB,IAAI,EAAE,OAAO;EAEb,uCAAI;IACA,YAAY,EAAE,IAAI;IAClB,GAAG,EAAE,GAAG;IACR,QAAQ,EAAE,QAAQ;IAClB,IAAI,EAAE,OAAO;;AAKrB,wBAAyB;EACrB,KAAK,EAAE,GAAG;EAEV,0CAA2C;IAH/C,wBAAyB;MAGyB,KAAK,EAAE,GAAG;EACxD,yCAA0C;IAJ9C,wBAAyB;MAIuB,KAAK,EAAE,IAAI;EAGvD,sCAAgB;IACZ,KAAK,EAAE,GAAG;IACV,MAAM,EAAE,GAAG;IACX,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI;IAEZ,6CAAO;MACH,KAAK,EAAE,iBAAiB;MACxB,MAAM,EAAE,kBAAkB;MAC1B,WAAW,EAAE,KAAK;IAGtB,yDAAmB;MACf,MAAM,EAAE,IAAI;MACZ,KAAK,EAAE,iBAAiB;MACxB,WAAW,EAAE,gBAAgB;MAC7B,OAAO,EAAE,wBAAwB;MACjC,UAAU,EAAE,iBAAiB;EAKrC,2CAAmB;IACf,UAAU,EAAE,IAAI;IAChB,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,MAAM;IACvB,WAAW,EAAE,MAAM;IACnB,KAAK,EAAE,OAAO;IACd,+DAAoB;MAAE,MAAM,EAAE,GAAG;EAGrC,0EAAkD;IAC9C,aAAa,EAAE,CAAC;EAGpB,2BAAG;IACC,MAAM,EAAE,WAAW;EAGvB,2CAAmB;IACf,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,MAAM;IACvB,aAAa,EAAE,IAAI;IAEnB,oEAAyB;MACrB,KAAK,EAAE,GAAG;MAEV,0CAA2C;QAH/C,oEAAyB;UAGyB,KAAK,EAAE,GAAG;MACxD,iFAAe;QACX,WAAW,EAAE,CAAC;MAElB,oGAAgC;QAC5B,SAAS,EAAE,IAAI;MAEnB,yGAAqC;QACjC,WAAW,EAAE,GAAG;QAChB,KAAK,EAAE,OAAO;QACd,SAAS,EAAE,QAAQ;QACnB,UAAU,EAAE,MAAM;MAEtB,yGAAqC;QACjC,OAAO,EAAE,OAAO;QAChB,MAAM,EAAE,IAAI;EAKxB,gDAAwB;IACpB,WAAW,EAAE,GAAG;IAChB,WAAW,EAAE,OAAO;EAGxB;4EACkD;IAC9C,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,IAAI;IACb,qBAAqB,EAAE,wBAAwB;IAC/C,QAAQ,EAAE,GAAG;IACb,eAAe,EAAE,YAAY;IAC7B,eAAe,EAAE,IAAI;IACrB,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,MAAM;IAElB;uGAAyB;MACrB,QAAQ,EAAE,MAAM;IAGpB;;;gHACkC;MAC9B,OAAO,EAAE,IAAI;MACb,eAAe,EAAE,UAAU;MAE3B;;;sHAAI;QACA,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,IAAI;QACZ,YAAY,EAAE,IAAI;MAEtB;;;wHAAM;QACF,WAAW,EAAE,MAAM;QACnB,aAAa,EAAE,QAAQ;QACvB,QAAQ,EAAE,MAAM;QAChB,OAAO,EAAE,YAAY;QACrB,SAAS,EAAE,GAAG;QAEd,yCAA0C;UAP9C;;;4HAAM;YAO0C,SAAS,EAAE,GAAG;EAItE,gDAAwB;IACpB,OAAO,EAAE,IAAI;IACb,WAAW,EAAE,QAAQ;IACrB,eAAe,EAAE,MAAM;IAEvB,kDAAE;MACE,KAAK,EAAE,OAAO;MACd,YAAY,EAAE,IAAI;MAClB,UAAU,EAAE,GAAG;EAGvB,2CAAmB;IACf,UAAU,EAAE,iBAAiB;IAC7B,OAAO,EAAE,IAAI;IACb,WAAW,EAAE,QAAQ;IACrB,eAAe,EAAE,aAAa;IAC9B,OAAO,EAAE,gBAAgB;IACzB,MAAM,EAAE,OAAO;IAEf,6CAAE;MACE,OAAO,EAAE,MAAM;MACf,KAAK,EAAE,OAAO;;ACtL1B,iDAAkD;EAC9C,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,aAAa;EAErB,wDAAO;IACH,UAAU,EAAE,WAAW;IACvB,MAAM,EAAE,iBAAiB;IACzB,aAAa,EAAE,GAAG;IAClB,OAAO,EAAE,GAAG;IACZ,MAAM,EAAE,CAAC;IACT,KAAK,EAAE,eAAe;IACtB,WAAW,EAAE,CAAC;IACd,MAAM,EAAE,OAAO;IACf,UAAU,EAAE,kCAAkC;IAE9C,qFAA+B;MAC3B,YAAY,EAAE,GAAG;MACjB,yFAAI;QACA,OAAO,EAAE,IAAI;QACb,qBAAqB,EAAE,WAAW;QAClC,kBAAkB,EAAE,OAAO;QAC3B,eAAe,EAAE,GAAG;QACpB,YAAY,EAAE,GAAG;QACjB,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,iBAAiB;QAEzB,6GAAoB;UAChB,iBAAiB,EAAE,CAAC;UACpB,eAAe,EAAE,MAAM;UACvB,cAAc,EAAE,CAAC;UACjB,YAAY,EAAE,MAAM;UACpB,KAAK,EAAE,IAAI;UACX,MAAM,EAAE,IAAI;QAGhB,+FAAM;UACF,KAAK,EAAE,IAAI;UACX,MAAM,EAAE,IAAI;UACZ,UAAU,EAAE,OAAO;UACnB,UAAU,EAAE,0BAA0B;IAIlD,0FAAoC;MAChC,WAAW,EAAE,GAAG;MAEhB,8FAAI;QACA,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,OAAO;QACnB,MAAM,EAAE,iBAAiB;QACzB,UAAU,EAAE,0BAA0B;IAI9C,8DAAM;MACF,SAAS,EAAE,OAAO;MAClB,KAAK,EAAE,OAAO;IAGlB,kEAAY;MACR,MAAM,EAAE,iBAAiB;MAEzB,mNACuC;QACnC,gBAAgB,EAAE,OAAO;IAGjC,8DAAQ;MACJ,OAAO,EAAE,GAAG;MACZ,YAAY,EAAE,GAAG;MACjB,qEAAO;QACH,UAAU,EAAE,OAAO;;AAOnC,sCAAuC;EACnC,MAAM,EAAE,QAAQ;EAGhB,yDAAmB;IACf,UAAU,EAAE,IAAI;IAChB,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,MAAM;IACvB,WAAW,EAAE,MAAM;IACnB,KAAK,EAAE,OAAO;AAIlB,qCAIC;EAHG,EAAE;IAAC,OAAO,EAAE,GAAG;EACf,GAAG;IAAC,OAAO,EAAE,GAAG;EAChB,IAAI;IAAC,OAAO,EAAE,GAAG;AAErB,kCAIC;EAHG,EAAE;IAAC,OAAO,EAAE,GAAG;EACf,GAAG;IAAC,OAAO,EAAE,GAAG;EAChB,IAAI;IAAC,OAAO,EAAE,GAAG;AAErB,gCAIC;EAHG,EAAE;IAAC,OAAO,EAAE,GAAG;EACf,GAAG;IAAC,OAAO,EAAE,GAAG;EAChB,IAAI;IAAC,OAAO,EAAE,GAAG;AAErB,6BAIC;EAHG,EAAE;IAAC,OAAO,EAAE,GAAG;EACf,GAAG;IAAC,OAAO,EAAE,GAAG;EAChB,IAAI;IAAC,OAAO,EAAE,GAAG;EAErB,gDAAU;IACN,aAAa,EAAE,GAAG;IAClB,UAAU,EAAE,OAAO;IAEnB,iBAAiB,EAAE,qCAAqC;IACxD,cAAc,EAAE,qCAAqC;IACrD,YAAY,EAAE,qCAAqC;IACnD,SAAS,EAAE,qCAAqC;EAIpD,yDAAmB;IACf,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,iBAAiB;IACxB,IAAI,EAAE,KAAK;IAEX,2EAAkB;MACd,MAAM,EAAE,MAAM;MAEd;gGACa;QACT,KAAK,EAAE,KAAK;QACZ,WAAW,EAAE,IAAI;QACjB,eAAe,EAAE,IAAI;QACrB,OAAO,EAAE,QAAQ;QACjB,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,MAAM;MAEvB,mFAAM;QACF,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,IAAI;MAEhB,mFAAQ;QACJ,eAAe,EAAE,IAAI;MAKrB,+GAAE;QACE,KAAK,EAAE,IAAI;QACX,OAAO,EAAE,KAAK;MAElB,8HAAiB;QACb,OAAO,EAAE,IAAI;QACb,qBAAqB,EAAE,WAAW;QAClC,kBAAkB,EAAE,OAAO;QAC3B,KAAK,EAAE,IAAI;QAEX,gJAAkB;UACd,iBAAiB,EAAE,CAAC;UACpB,eAAe,EAAE,MAAM;UACvB,cAAc,EAAE,CAAC;UACjB,YAAY,EAAE,MAAM;QAGxB,kIAAI;UACA,KAAK,EAAE,IAAI;UACX,MAAM,EAAE,IAAI;UACZ,OAAO,EAAE,GAAG;UACZ,aAAa,EAAE,GAAG;EAOtC,uDAAiB;IACb,KAAK,EAAE,IAAI;IACX,SAAS,EAAE,QAAQ;IACnB,UAAU,EAAE,MAAM;IAClB,KAAK,EAAE,OAAO;IACd,UAAU,EAAE,MAAM;IAClB,MAAM,EAAE,QAAQ;EAIpB,sHAAyC;IACrC,GAAG,EAAE,gBAAgB;IACrB,MAAM,EAAE,OAAO;IACf,UAAU,EAAE,IAAI;IAChB,MAAM,EAAE,IAAI;IACZ,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,CAAC;IACV,MAAM,EAAE,MAAM;IAEd,8HAAI;MACA,IAAI,EAAE,OAAO;EAKrB;2DACmB;IACf,QAAQ,EAAE,QAAQ;IAElB;uEAAY;MACR,UAAU,EAAE,KAAK;MACjB,UAAU,EAAE,KAAK;IAGrB;;iGACsC;MAClC,OAAO,EAAE,IAAI;IAEjB;iGAAsC;MAClC,IAAI,EAAE,IAAI;MACV,KAAK,EAAE,IAAI;MACX,GAAG,EAAE,2BAA4B;IAErC;kGAAuC;MACnC,KAAK,EAAE,IAAI;MACX,IAAI,EAAE,IAAI;IAEd;kGAAuC;MACnC,GAAG,EAAE,2BAA4B;EAGzC,yDAAmB;IACf,OAAO,EAAE,IAAI;IACb,WAAW,EAAE,UAAU;IACvB,UAAU,EAAE,MAAM;IAClB,UAAU,EAAE,IAAI;IAChB,MAAM,EAAE,MAAM;IAEd,2EAAkB;MACd,QAAQ,EAAE,QAAQ;MAClB,OAAO,EAAE,KAAK;MACd,MAAM,EAAE,kBAAkB;MAC1B,KAAK,EAAE,oBAAoB;MAC3B,SAAS,EAAE,oBAAoB;MAE/B,+FAAsB;QAClB,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,gBAAgB;QACvB,SAAS,EAAE,gBAAgB;MAG/B,6EAAE;QACE,KAAK,EAAE,OAAO;QACd,WAAW,EAAE,IAAI;QACjB,WAAW,EAAE,MAAM;MAGvB,+EAAI;QACA,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,GAAG;QACZ,aAAa,EAAE,MAAM;MAGzB,mFAAU;QACN,KAAK,EAAE,OAAO;QACd,eAAe,EAAE,IAAI;MAGzB,kFAAO;QACH,QAAQ,EAAE,mBAAmB;QAC7B,gBAAgB,EAAE,yBAAyB;QAC3C,KAAK,EAAE,OAAO;QACd,OAAO,EAAE,GAAG;QACZ,WAAW,EAAE,GAAG;QAChB,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,MAAM;QAClB,QAAQ,EAAE,QAAQ;QAClB,OAAO,EAAE,CAAC;QACV,KAAK,EAAE,KAAK;QACZ,GAAG,EAAE,GAAG;QACR,eAAe,EAAE,MAAM;QACvB,OAAO,EAAE,GAAG;MAGhB,wFAAe;QACX,UAAU,EAAE,OAAO;QACnB,gBAAgB,EAAE,gBAAiC;QACnD,OAAO,EAAE,CAAC;QACV,KAAK,EAAE,IAAI;QACX,GAAG,EAAE,IAAI;QACT,MAAM,EAAE,iBAAiB;QACzB,aAAa,EAAE,IAAI;QACnB,UAAU,EAAE,wCAAwC;MAExD,8FAAqB;QACjB,gBAAgB,EAAE,gBAAiC;QACnD,MAAM,EAAE,4BAA4B;MAIxC,4FAAiB;QACb,OAAO,EAAE,IAAI;QACb,qBAAqB,EAAE,WAAW;QAClC,kBAAkB,EAAE,OAAO;QAE3B,8GAAkB;UACd,iBAAiB,EAAE,CAAC;UACpB,eAAe,EAAE,MAAM;UACvB,cAAc,EAAE,CAAC;UACjB,YAAY,EAAE,MAAM;QAGxB,gGAAI;UACA,OAAO,EAAE,GAAG;UACZ,aAAa,EAAE,GAAG;EAKlC,0CAA2C;IAEvC,2EAAqC;MACjC,KAAK,EAAE,gBAAgB;MACvB,SAAS,EAAE,gBAAgB;EAGnC,0CAA2C;IAEvC,2EAAqC;MACjC,KAAK,EAAE,gBAAgB;MACvB,SAAS,EAAE,gBAAgB;EAGnC,0CAA2C;IAEvC,sEAAgC;MAC5B,KAAK,EAAE,oBAAoB;MAC3B,SAAS,EAAE,oBAAoB;EAGvC,yCAA0C;IAEtC,2EAAqC;MACjC,KAAK,EAAE,gBAAgB;MACvB,SAAS,EAAE,gBAAgB;EAGnC,yCAA0C;IAEtC,2EAAqC;MACjC,KAAK,EAAE,iBAAiB;MACxB,SAAS,EAAE,iBAAiB",
+"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/classes/class-tainacan-background-process.php b/src/classes/class-tainacan-background-process.php
index 4adf888c8..a6376d733 100644
--- a/src/classes/class-tainacan-background-process.php
+++ b/src/classes/class-tainacan-background-process.php
@@ -12,18 +12,10 @@ namespace Tainacan;
 
 defined( 'ABSPATH' ) || exit;
 
-if ( ! class_exists( 'WP_Async_Request', false ) ) {
-	include_once TAINACAN_CLASSES_DIR . '/lib/wp-async-request.php';
-}
-
-if ( ! class_exists( 'WP_Background_Process', false ) ) {
-	include_once TAINACAN_CLASSES_DIR . '/lib/wp-background-process.php';
-}
-
 /**
  * Tainacan_Background_Process class.
  */
-abstract class Background_Process extends \WP_Background_Process {
+abstract class Background_Process extends \Tainacan_WP_Background_Process {
 
 	/**
 	 * Table name where the queue is stored
diff --git a/src/classes/class-tainacan-elastic-press.php b/src/classes/class-tainacan-elastic-press.php
index 10104c2f9..235dcf8d5 100644
--- a/src/classes/class-tainacan-elastic-press.php
+++ b/src/classes/class-tainacan-elastic-press.php
@@ -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-private-files.php b/src/classes/class-tainacan-private-files.php
index 6afd86f05..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'], 10, 3);
-		
+
+		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,141 +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, $diffs, $is_update) {
-		
-		// updating collection or item
-		if ( $is_update ) {
-			
-			$folder = DIRECTORY_SEPARATOR;
-			$check_folder = DIRECTORY_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;
-				
-				$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;
-				
-				if (\file_exists($full_path_check)) {
-					rename($full_path_check, $full_path);
-					do_action('tainacan-upload-folder-renamed', $full_path_check, $full_path);
-				}
-				
-			}
-			
+	function update_item_and_collection($obj) {
+
+		$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() . $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 . $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-entity.php b/src/classes/entities/class-tainacan-entity.php
index 9940d8be7..d21c5dce0 100644
--- a/src/classes/entities/class-tainacan-entity.php
+++ b/src/classes/entities/class-tainacan-entity.php
@@ -366,7 +366,7 @@ class Entity {
 
 	    $attributes = [];
 	    foreach($map as $prop => $content) {
-		    $attributes[$prop] = $this->get_mapped_property($prop);
+		    $attributes[$prop] = $this->get($prop);
 	    }
 		
 		$hook_prefix = self::get_post_type();
diff --git a/src/classes/entities/class-tainacan-filter.php b/src/classes/entities/class-tainacan-filter.php
index f34a4bdc2..f1e84e2d1 100644
--- a/src/classes/entities/class-tainacan-filter.php
+++ b/src/classes/entities/class-tainacan-filter.php
@@ -152,7 +152,7 @@ class Filter extends Entity {
 		}
 
         $object_type = new $class_name();
-        $object_type->set_options(  $this->get_filter_type_options() );
+        $object_type->set_options(  $this->get_mapped_property('filter_type_options') );
         return $object_type;
     }
 
@@ -171,6 +171,10 @@ class Filter extends Entity {
      * @return array Configurations for the filter type object
      */
     function get_filter_type_options(){
+        $object = $this->get_filter_type_object();
+        if ($object) {
+            return $object->get_options(); // merge with dedault filter type options
+        }
         return $this->get_mapped_property('filter_type_options');
     }
 
@@ -275,6 +279,21 @@ class Filter extends Entity {
         if (false === $is_valid)
             return false;
 
+
+        $status = $this->get_status();
+        $status_obj = get_post_status_object($status);
+        
+        if ($status_obj->public) {
+            $metadatum = $this->get_metadatum();
+            if ($metadatum) {
+                $metadatum_status_obj = get_post_status_object($metadatum->get_status());
+                if ( ! $metadatum_status_obj->public ) {
+                    $this->add_error('status', __('Filter can not be public because the related metadatum is private', 'tainacan'));
+                    return false;
+                }
+            }
+        }
+
         $fto = $this->get_filter_type_object();
         if (is_object($fto)) {
             $is_valid = $fto->validate_options( $this );
diff --git a/src/classes/entities/class-tainacan-item-metadata-entity.php b/src/classes/entities/class-tainacan-item-metadata-entity.php
index 25b58923f..603452b16 100644
--- a/src/classes/entities/class-tainacan-item-metadata-entity.php
+++ b/src/classes/entities/class-tainacan-item-metadata-entity.php
@@ -444,25 +444,29 @@ class Item_Metadata_Entity extends Entity {
                 }
                 
                 if ($this->is_required() && !$one_filled) {
-                    $this->add_error('required', $metadatum->get_name() . ' is required');
+                    // translators: %s = metadatum name. ex: Title is required
+                    $this->add_error( 'required', sprintf( __('%s is required', 'tainacan'), $metadatum->get_name() ) );
                     return false;
                 }
                 
                 if (!$valid) {
-                    $this->add_error('invalid', $metadatum->get_name() . ' is invalid');
+                    // translators: %s = metadatum name. ex: Title is invalid
+                    $this->add_error( 'invalid', sprintf( __('%s is invalid', 'tainacan'), $metadatum->get_name() ) );
                     return false;
                 }
                 
                 $this->set_as_valid();
                 return true;   
             } else {
-                $this->add_error('invalid', $metadatum->get_name() . ' is invalid');
+                // translators: %s = metadatum name. ex: Title is invalid
+                $this->add_error( 'invalid', sprintf( __('%s is invalid', 'tainacan'), $metadatum->get_name() ) );
                 return false;
             }
         } else {
 
             if( is_array($value) ){
-				$this->add_error('not_multiple', $metadatum->get_name() . ' do not accept array as value');
+                // translators: %s = metadatum name. ex: Title accepts only one single value and not a list of values
+                $this->add_error( 'not_multiple', sprintf( __('%s accepts only one single value and not a list of values', 'tainacan'), $metadatum->get_name() ) );
                 return false;
             }
             
@@ -476,11 +480,12 @@ class Item_Metadata_Entity extends Entity {
                             'value' => $value
                         ],
                     ],
-					'post__not_in' => [$item->get_id()]
+                	'post__not_in' => [$item->get_id()]
                 ], $item->get_collection());
 
                 if ($test->have_posts()) {
-                    $this->add_error('key_exists', $metadatum->get_name() . ' is a collection key and there is another item with the same value');
+                    // translators: %s = metadatum name. ex: Register ID is a collection key and there is another item with the same value
+	                $this->add_error( 'key_exists', sprintf( __('%s is a collection key and there is another item with the same value', 'tainacan'), $metadatum->get_name() ) );
                     return false;
                 }
             }
diff --git a/src/classes/entities/class-tainacan-item.php b/src/classes/entities/class-tainacan-item.php
index 6e8f6405b..c944214d6 100644
--- a/src/classes/entities/class-tainacan-item.php
+++ b/src/classes/entities/class-tainacan-item.php
@@ -93,10 +93,10 @@ class Item extends Entity {
 		}
 
 		$attachments_query = [
-			'post_type'     => 'attachment',
-			'post_per_page' => -1,
-			'post_parent'   => $item_id,
-			'exclude'       => $to_exclude,
+			'post_type'     	=> 'attachment',
+			'posts_per_page' 	=> -1,
+			'post_parent'   	=> $item_id,
+			'exclude'       	=> $to_exclude,
 		];
 
 		$attachments = get_posts( $attachments_query );
diff --git a/src/classes/entities/class-tainacan-log.php b/src/classes/entities/class-tainacan-log.php
index 850365f2a..263a4d8fe 100644
--- a/src/classes/entities/class-tainacan-log.php
+++ b/src/classes/entities/class-tainacan-log.php
@@ -12,14 +12,17 @@ class Log extends Entity {
 	protected
 		$title,
 		$order,
-		$parent,
 		$description,
 		$blog_id,
 		$user_id,
-		$log_date,
+		$date,
 		$user_name,
 		$collection_id,
-		$item_id;
+		$item_id,
+		$object_type,
+		$object_id,
+		$old_value,
+		$new_value;
 
 	static $post_type = 'tainacan-log';
 	/**
@@ -34,7 +37,6 @@ class Log extends Entity {
 
 		if ( is_int( $which ) && $which == 0 ) {
 			$this->set_user_id();
-			$this->set_blog_id();
 		}
 	}
 
@@ -89,27 +91,19 @@ class Log extends Entity {
 	 *
 	 * @return mixed|null
 	 */
-	function get_log_date() {
-		return $this->get_mapped_property( 'log_date' );
+	function get_date() {
+		return $this->get_mapped_property( 'date' );
 	}
 
 	/**
-	 * Return the log order type
+	 * Return the log slug
 	 *
-	 * @return string
+	 * @return mixed|null
 	 */
-	function get_order() {
-		return $this->get_mapped_property( 'order' );
+	function get_slug() {
+		return $this->get_mapped_property( 'slug' );
 	}
 
-	/**
-	 * Retun the parent ID
-	 *
-	 * @return integer
-	 */
-	function get_parent() {
-		return $this->get_mapped_property( 'parent' );
-	}
 
 	/**
 	 * Return the Log description
@@ -120,15 +114,6 @@ class Log extends Entity {
 		return $this->get_mapped_property( 'description' );
 	}
 
-	/**
-	 * Return the ID of blog
-	 *
-	 * @return integer
-	 */
-	function get_blog_id() {
-		return $this->get_mapped_property( 'blog_id' );
-	}
-
 	/**
 	 * Return User Id of who make the action
 	 *
@@ -138,27 +123,28 @@ class Log extends Entity {
 		return $this->get_mapped_property( 'user_id' );
 	}
 
+
 	/**
-	 * Get value of log entry
+	 * Get old value of log entry object
 	 *
 	 * @param mixed $value
 	 *
 	 * @return void
 	 */
-	public function get_value() {
-		return maybe_unserialize( base64_decode( $this->get_mapped_property( 'value' ) ) );
+	public function get_old_value() {
+		return $this->get_mapped_property( 'old_value' );
 	}
 
-//	/**
-//	 * Get old value of log entry object
-//	 *
-//	 * @param mixed $value
-//	 *
-//	 * @return void
-//	 */
-//	public function get_old_value() {
-//		return maybe_unserialize( base64_decode( $this->get_mapped_property( 'old_value' ) ) );
-//	}
+	/**
+	 * Get new value of log entry object
+	 *
+	 * @param mixed $value
+	 *
+	 * @return void
+	 */
+	public function get_new_value() {
+		return $this->get_mapped_property( 'new_value' );
+	}
 
 	/**
 	 * Set log tittle
@@ -167,30 +153,8 @@ class Log extends Entity {
 	 *
 	 * @return void
 	 */
-	function set_title( $value ) {
-		$this->set_mapped_property( 'title', $value );
-	}
-
-	/**
-	 * Define the order type
-	 *
-	 * @param [string] $value
-	 *
-	 * @return void
-	 */
-	function set_order( $value ) {
-		$this->set_mapped_property( 'order', $value );
-	}
-
-	/**
-	 * Define the parent ID
-	 *
-	 * @param [integer] $value
-	 *
-	 * @return void
-	 */
-	function set_parent( $value ) {
-		$this->set_mapped_property( 'parent', $value );
+	public function set_title( $value ) {
+		$this->set_mapped_property( 'title', apply_filters('tainacan-log-set-title', $value) );
 	}
 
 	/**
@@ -200,7 +164,7 @@ class Log extends Entity {
 	 *
 	 * @return void
 	 */
-	function set_description( $value ) {
+	public function set_description( $value ) {
 		$this->set_mapped_property( 'description', $value );
 	}
 
@@ -211,7 +175,7 @@ class Log extends Entity {
 	 *
 	 * @return void
 	 */
-	protected function set_user_id( $value = 0 ) {
+	public function set_user_id( $value = 0 ) {
 		if ( 0 == $value ) {
 			$value = get_current_user_id();
 		}
@@ -219,46 +183,25 @@ class Log extends Entity {
 	}
 
 	/**
-	 * Define the blog ID of log entry
-	 *
-	 * @param [integer] $value
-	 *
-	 * @return void
-	 */
-	protected function set_blog_id( $value = 0 ) {
-		if ( 0 == $value ) {
-			$value = get_current_blog_id();
-		}
-		$this->set_mapped_property( 'blog_id', $value );
-	}
-
-	/**
-	 * Define the value of log entry
+	 * Set old value of log entry
 	 *
 	 * @param [mixed] $value
 	 *
 	 * @return void
 	 */
-	protected function set_value( $value = null ) {
-		$this->set_mapped_property( 'value', base64_encode( maybe_serialize( $value ) ) );
+	public function set_old_value( $value ) {
+		$this->set_mapped_property( 'old_value', $value );
 	}
 
-//	/**
-//	 * Set old value of log entry
-//	 *
-//	 * @param [mixed] $value
-//	 *
-//	 * @return void
-//	 */
-//	protected function set_old_value( $value = null ) {
-//		$this->set_mapped_property( 'old_value', base64_encode( maybe_serialize( $value ) ) );
-//	}
-
 	/**
-	 * @param $diffs
+	 * Set new value of log entry
+	 *
+	 * @param [mixed] $value
+	 *
+	 * @return void
 	 */
-	public function set_log_diffs($diffs){
-		$this->set_mapped_property( 'log_diffs', $diffs );
+	public function set_new_value( $value ) {
+		$this->set_mapped_property( 'new_value', $value );
 	}
 
 	/**
@@ -268,55 +211,20 @@ class Log extends Entity {
 		return $this->get_mapped_property('log_diffs');
 	}
 
-	/**
-	 *
-	 * @param bool $message
-	 * @param string $desc
-	 * @param null $value
-	 * @param array $diffs
-	 * @param string $status 'publish', 'private', 'pending', 'processing' or 'error'
-	 * @param int $parent
-	 *
-	 * @return \Tainacan\Entities\Log | bool
-	 * @throws \Exception
-	 */
-	public static function create( $message = false, $desc = '', $value = null, $diffs = [], $status = 'publish', $parent = 0 ) {
+	public function get_object_type() {
+		return $this->get_mapped_property('object_type');
+	}
 
-		$log = new Log();
+	public function set_object_type($value) {
+		$this->set_mapped_property('object_type', $value);
+	}
 
-		$log->set_title( $message );
-		$log->set_description( $desc );
-		$log->set_status( $status );
-		$log->set_log_diffs( $diffs );
+	public function get_object_id() {
+		return $this->get_mapped_property('object_id');
+	}
 
-		if($parent > 0) {
-			$log->set_parent($parent);
-		}
-
-		if(is_object($value) || is_string($value)) {
-			if(array_search( 'Tainacan\Traits\Entity_Collection_Relation', class_uses($value))) {
-				$log->set_collection_id( $value->get_collection_id() );
-			} elseif($value instanceof Collection){
-				$log->set_collection_id( $value->get_id());
-			} elseif($value instanceof Item_Metadata_Entity){
-				$log->set_item_id($value->get_item()->get_id());
-				$log->set_collection_id($value->get_item()->get_collection_id());
-			}
-		}
-
-		if ( ! is_null( $value ) ) {
-			$log->set_value( $value );
-		} elseif ( $message === false ) {
-			throw new \Exception( 'Message or value is needed to log' );
-		}
-
-		$Tainacan_Logs = \Tainacan\Repositories\Logs::get_instance();
-
-		if ( $log->validate() ) {
-			return $Tainacan_Logs->insert( $log );
-		} else {
-			throw new \Exception( 'Invalid log' );
-		}
+	public function set_object_id($value) {
+		$this->set_mapped_property('object_id', $value);
 	}
 
 	/**
@@ -333,6 +241,14 @@ class Log extends Entity {
 		return $this->get_mapped_property('item_id');
 	}
 
+	public function get_action() {
+		return $this->get_mapped_property('action');
+	}
+
+	public function set_action($value) {
+		$this->set_mapped_property('action', $value);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 * @see \Tainacan\Repositories\Logs::approve
@@ -342,4 +258,4 @@ class Log extends Entity {
 
 		return $repository->approve( $this );
 	}
-}
\ No newline at end of file
+}
diff --git a/src/classes/entities/class-tainacan-metadatum.php b/src/classes/entities/class-tainacan-metadatum.php
index 70e965372..5a57dc165 100644
--- a/src/classes/entities/class-tainacan-metadatum.php
+++ b/src/classes/entities/class-tainacan-metadatum.php
@@ -178,7 +178,7 @@ class Metadatum extends Entity {
         }
         
         $object_type = new $class_name();
-        $object_type->set_options(  $this->get_metadata_type_options() );
+        $object_type->set_options( $this->get_mapped_property('metadata_type_options') );
     	return $object_type;
     }
 
@@ -197,7 +197,11 @@ class Metadatum extends Entity {
      * @return array Configurations for the metadatum type object
      */
     function get_metadata_type_options(){
-        return $this->get_mapped_property('metadata_type_options');
+		$object = $this->get_metadata_type_object();
+        if ($object) {
+            return $object->get_options(); // merge with dedault metadata type options
+        }
+		return $this->get_mapped_property('metadata_type_options');
     }
 
     /**
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/entities/class-tainacan-term.php b/src/classes/entities/class-tainacan-term.php
index 13c245e1a..972885ff6 100644
--- a/src/classes/entities/class-tainacan-term.php
+++ b/src/classes/entities/class-tainacan-term.php
@@ -145,6 +145,16 @@ class Term extends Entity {
 		return wp_get_attachment_url( $this->get_header_image_id() );
 	}
 
+	/**
+	 * @return false|string
+	 */
+	function get_url(){
+		$url = get_term_link( $this->get_id() );
+		if (is_wp_error($url))
+			return "";
+		return $url;
+	}
+
     // Setters
 
 	/**
diff --git a/src/classes/filter-types/autocomplete/Autocomplete.vue b/src/classes/filter-types/autocomplete/Autocomplete.vue
index 2f17a2df4..11d99df6f 100644
--- a/src/classes/filter-types/autocomplete/Autocomplete.vue
+++ b/src/classes/filter-types/autocomplete/Autocomplete.vue
@@ -3,15 +3,15 @@
         <b-autocomplete
                 icon="magnify"
                 size="is-small"
-                :aria-labelledby="labelId"
+                :aria-labelledby="'filter-label-id-' + filter.id"
                 v-model="selected"
                 :data="options"
                 expanded
                 :loading="isLoadingOptions"
                 @input="search"
                 field="label"
-                @select="option => setResults(option) "
-                :placeholder="(type == 'Tainacan\\Metadata_Types\\Relationship') ? $i18n.get('info_type_to_search_items') : $i18n.get('info_type_to_search_metadata')">
+                @select="onSelect"
+                :placeholder="(metadatumType === 'Tainacan\\Metadata_Types\\Relationship') ? $i18n.get('info_type_to_search_items') : $i18n.get('info_type_to_search_metadata')">
             <template slot-scope="props">
                 <div class="media">
                     <div
@@ -41,83 +41,54 @@
 
 <script>
     import { tainacan as axios, isCancel } from '../../../js/axios/axios'
-    import { filter_type_mixin } from '../filter-types-mixin'
-    // import qs from 'qs';
+    import { filterTypeMixin, dynamicFilterTypeMixin } from '../filter-types-mixin';
 
     export default {
-        created(){
-            this.collection = ( this.collection_id ) ? this.collection_id : this.filter.collection_id;
-            this.metadatum = ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum.metadatum_id;
-            const vm = this;
-
-            let in_route = '/collection/' + this.collection + '/metadata/' +  this.metadatum;
-
-            if(this.isRepositoryLevel || this.collection == 'filter_in_repository'){
-                in_route = '/metadata/'+ this.metadatum;
-            }
-
-            axios.get(in_route)
-                .then( res => {
-                    let result = res.data;
-                    if( result && result.metadata_type ){
-                        vm.metadatum_object = result;
-                        vm.type = result.metadata_type;
-                        vm.selectedValues();
-                    }
-                })
-                .catch(error => {
-                    this.$console.log(error);
-                });
-
-            this.$eventBusSearch.$on('removeFromFilterTag', this.cleanSearchFromTags);
-        },
+        mixins: [filterTypeMixin, dynamicFilterTypeMixin],
         data(){
             return {
-                results:'',
                 selected:'',
                 options: [],
-                type: '',
-                collection: '',
-                metadatum: '',
-                metadatum_object: {},
                 label: ''
             }
         },
-        props: {
-            isRepositoryLevel: Boolean,
-            labelId: String
+        watch: {
+            'query.metaquery'() {
+                this.updateSelectedValues();
+            },
+        },
+        mounted() {
+            this.updateSelectedValues();
         },
-        mixins: [filter_type_mixin],
         methods: {
-            setResults(option){
+            onSelect(option){
+                
                 if(!option)
                     return;
-                this.results = option.value;
+                this.selected = option.value;
                 this.label = option.label;
-                this.onSelect()
-            },
-            onSelect(){
+
                 this.$emit('input', {
                     filter: 'autocomplete',
-                    metadatum_id: this.metadatum,
-                    collection_id: this.collection,
-                    value: this.results
+                    metadatum_id: this.metadatumId,
+                    collection_id: this.collectionId,
+                    value: this.selected
                 });
-                this.selectedValues();
+                this.updateSelectedValues();
             },
             search: _.debounce( function(query) {
+
                 if (query != '') {
                     let promise = null;
                     this.options = [];
-
                     // Cancels previous Request
                     if (this.getOptionsValuesCancel != undefined)
                         this.getOptionsValuesCancel.cancel('Facet search Canceled.');
 
-                    if ( this.type === 'Tainacan\\Metadata_Types\\Relationship' )
+                    if ( this.metadatumType === 'Tainacan\\Metadata_Types\\Relationship' )
                         promise = this.getValuesRelationship( query, this.isRepositoryLevel );
                     else
-                        promise = this.getValuesPlainText( this.metadatum, query, this.isRepositoryLevel );
+                        promise = this.getValuesPlainText( this.metadatumId, query, this.isRepositoryLevel );
                     
                     promise.request.catch( error => {
                         if (isCancel(error))
@@ -130,71 +101,51 @@
                     this.getOptionsValuesCancel = promise.source;
                 
                 } else {
-                    this.cleanSearch();
+                    this.label = '';
+                    this.selected = '';
+                    this.$emit('input', {
+                        filter: 'autocomplete',
+                        metadatum_id: this.metadatumId,
+                        collection_id: this.collectionId,
+                        value: this.selected
+                    });
                 }
             }, 500),
-            selectedValues(){
-                const instance = this;
-                if ( !this.query || !this.query.metaquery || !Array.isArray( this.query.metaquery ) )
+            updateSelectedValues(){
+
+                if (!this.query || !this.query.metaquery || !Array.isArray( this.query.metaquery ))
                     return false;
 
-                let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key === this.metadatum );
-                if ( index >= 0){
+                let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key == this.metadatumId);
+                if (index >= 0) {
                     let metadata = this.query.metaquery[ index ];
-                    // let collectionTarget = ( this.metadatum_object && this.metadatum_object.metadata_type_options.collection_id ) ?
-                        // this.metadatum_object.metadata_type_options.collection_id : this.collection_id;
 
-                    if ( this.type === 'Tainacan\\Metadata_Types\\Relationship' ) {
-                        // let query = qs.stringify({ postin: metadata.value  });
-                        
-                        axios.get('/items/' + metadata.value)
+                    if (this.metadatumType === 'Tainacan\\Metadata_Types\\Relationship') {
+
+                        let endpoint = '/items/' + metadata.value + '?fetch_only=title,thumbnail';
+
+                        axios.get(endpoint)
                             .then( res => {
-      
+
                                 let item = res.data;
-                                instance.results = item.title;
-                                instance.label = item.title;
-                                instance.selected = item.title;
+                                this.label = item.title;
+                                this.selected = item.title;
          
-                                this.$eventBusSearch.$emit( 'sendValuesToTags', {
-                                    filterId: instance.filter.id,
-                                    value: instance.label
-                                });
+                                this.$emit( 'sendValuesToTags', { label: this.label, value: this.selected });
                             })
                             .catch(error => {
                                 this.$console.log(error);
                             });
                     } else {
-                        instance.results = metadata.value;
-                        instance.label = metadata.value;
-                        instance.selected = metadata.value;
-
-                        this.$eventBusSearch.$emit( 'sendValuesToTags', {
-                            filterId: instance.filter.id,
-                            value: metadata.value
-                        });
+                        this.label = metadata.value;
+                        this.selected = metadata.value;
+                        this.$emit( 'sendValuesToTags', { label: this.label, value: this.selected });
                     }
                 } else {
-                    return false;
+                    this.label = '';
+                    this.selected = '';
                 }
-            },
-            cleanSearchFromTags(filterTag) {
-                if (filterTag.filterId == this.filter.id)
-                    this.cleanSearch();
-            },
-            cleanSearch(){
-                this.results = '';
-                this.label = '';
-                this.selected = '';
-                this.$emit('input', {
-                    filter: 'autocomplete',
-                    metadatum_id: this.metadatum,
-                    collection_id: ( this.collection_id ) ? this.collection_id : this.filter.collection_id,
-                    value: ''
-                });
-            },
-        },
-        beforeDestroy() {
-            this.$eventBusSearch.$off('removeFromFilterTag', this.cleanSearchFromTags);
+            }
         }
     }
 </script>
diff --git a/src/classes/filter-types/autocomplete/class-tainacan-autocomplete.php b/src/classes/filter-types/autocomplete/class-tainacan-autocomplete.php
index a0d75df4d..13db2a442 100644
--- a/src/classes/filter-types/autocomplete/class-tainacan-autocomplete.php
+++ b/src/classes/filter-types/autocomplete/class-tainacan-autocomplete.php
@@ -9,6 +9,7 @@ defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 class Autocomplete extends Filter_Type {
 
     function __construct(){
+        $this->set_name( __('Autocomplete', 'tainacan') );
         $this->set_supported_types(['string','long_string','item']);
         $this->set_component('tainacan-filter-autocomplete');
         $this->set_use_max_options(false);
diff --git a/src/classes/filter-types/checkbox/Checkbox.vue b/src/classes/filter-types/checkbox/Checkbox.vue
index be40b103c..64b2c6583 100644
--- a/src/classes/filter-types/checkbox/Checkbox.vue
+++ b/src/classes/filter-types/checkbox/Checkbox.vue
@@ -3,12 +3,6 @@
             :style="{ 'height': isLoadingOptions ? (Number(filter.max_options)*28) + 'px' : 'auto' }"
             :class="{ 'skeleton': isLoadingOptions }"
             class="block">
-        <!-- <span 
-                v-if="isLoadingOptions"
-                style="width: 100%; position: absolute;"
-                class="icon has-text-centered loading-icon">
-            <div class="control has-icons-right is-loading is-clearfix" />
-        </span> -->
         <div
                 v-for="(option, index) in options.slice(0, filter.max_options)"
                 v-if="!isLoadingOptions"
@@ -29,15 +23,6 @@
                                 class="has-text-gray">&nbsp;{{ "(" + option.total_items + ")" }}</span>
                     </span>
             </label>
-            <!-- <b-checkbox
-                    v-if="index <= filter.max_options - 1"
-                    v-model="selected"
-                    :native-value="option.value">
-                <span class="checkbox-label-text">{{ option.label }}</span> 
-                <span 
-                        v-if="option.total_items != undefined"
-                        class="has-text-gray">{{ "(" + option.total_items + ")" }}</span>
-            </b-checkbox> -->
             <button
                     class="view-all-button link-style"
                     v-if="option.showViewAllButton && index == options.slice(0, filter.max_options).length - 1"
@@ -54,96 +39,61 @@
 </template>
 
 <script>
-    import { tainacan as axios, isCancel } from '../../../js/axios/axios';
-    import { filter_type_mixin } from '../filter-types-mixin';
+    import { isCancel } from '../../../js/axios/axios';
+    import { filterTypeMixin, dynamicFilterTypeMixin } from '../filter-types-mixin';
     import CheckboxRadioModal from '../../../admin/components/other/checkbox-radio-modal.vue';
 
     export default {
-        created(){
-            this.collection = ( this.collection_id ) ? this.collection_id : this.filter.collection_id;
-            this.metadatum = ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum.metadatum_id;
-
-            let route = '/collection/' + this.collection + '/metadata/' +  this.metadatum +'?nopaging=1';
-
-            if (this.isRepositoryLevel || this.collection == 'filter_in_repository')
-                route = '/metadata?nopaging=1';
-
-            axios.get(route)
-                .then( res => {
-                    let result = res.data;
-                    if ( result && result.metadata_type ){
-                        this.metadatum_object = result;
-                        this.type = result.metadata_type;
-                    
-                        if (!this.isUsingElasticSearch)
-                            this.loadOptions();
-
-                    }
-                })
-                .catch(error => {
-                    this.$console.log(error);
-                });
-
-            this.$eventBusSearch.$on('removeFromFilterTag', this.cleanSearchFromTags);
-
-            if (this.isUsingElasticSearch) {
-                this.isLoadingOptions = false;
-                this.$eventBusSearch.$on('isLoadingItems', this.updatesIsLoading);
-            }
-        },
-        props: {
-            isRepositoryLevel: Boolean,
-        },
+        mixins: [filterTypeMixin, dynamicFilterTypeMixin],
         data(){
             return {
                 options: [],
-                type: '',
-                collection: '',
-                metadatum: '',
-                selected: [],
-                metadatum_object: {}
+                selected: []
             }
         },
-        mixins: [filter_type_mixin],
         watch: {
-            selected: function(){
-                //this.selected = val;
-                this.onSelect();
+            selected(newVal, oldVal) {
+                const isEqual = (newVal.length == oldVal.length) && newVal.every((element, index) => {
+                    return element === oldVal[index]; 
+                });
+
+                if (!isEqual)
+                    this.onSelect();
+            },
+            'query.metaquery'() {
+                if (!this.isUsingElasticSearch)
+                    this.loadOptions();
             }
         },
+        mounted() {
+            if (!this.isUsingElasticSearch)
+                this.loadOptions();
+        },
         methods: {
-            loadOptions(skipSelected) {
+            loadOptions() {
                 let promise = null;
                 
                 // Cancels previous Request
                 if (this.getOptionsValuesCancel != undefined)
                     this.getOptionsValuesCancel.cancel('Facet search Canceled.');
 
-                if ( this.type === 'Tainacan\\Metadata_Types\\Relationship' )
+                if ( this.metadatumType === 'Tainacan\\Metadata_Types\\Relationship' )
                     promise = this.getValuesRelationship( null, this.isRepositoryLevel, [], 0, this.filter.max_options, false, '1');
                 else
-                    promise = this.getValuesPlainText( this.metadatum, null, this.isRepositoryLevel, [], 0, this.filter.max_options, false, '1' );
+                    promise = this.getValuesPlainText( this.metadatumId, null, this.isRepositoryLevel, [], 0, this.filter.max_options, false, '1' );
+     
+                promise.request
+                    .then(() => {
+                        this.updateSelectedValues();
+                    })
+                    .catch( (error) => {
+                        if (isCancel(error)) {
+                            this.$console.log('Request canceled: ' + error.message);
+                            this.updateSelectedValues();
+                        } else
+                            this.$console.error( error );
+                    });
                 
-                if (skipSelected != undefined && skipSelected == true) {
-                    promise.request
-                        .then(() => {
-                            if (this.options.length > this.filter.max_options)
-                                this.options.splice(this.filter.max_options);
-                        }).catch((error) => {
-                            this.$console.error(error);
-                        });
-                } else {
-                    promise.request
-                        .then(() => {
-                            this.selectedValues();
-                        })
-                        .catch( (error) => {
-                            if (isCancel(error)) {
-                                this.$console.log('Request canceled: ' + error.message);
-                            }else
-                                this.$console.error( error );
-                        });
-                }
                 // Search Request Token for cancelling
                 this.getOptionsValuesCancel = promise.source;  
             },
@@ -151,41 +101,36 @@
                 this.$emit('input', {
                     filter: 'checkbox',
                     compare: 'IN',
-                    metadatum_id: this.metadatum,
-                    collection_id: ( this.collection_id ) ? this.collection_id : this.filter.collection_id,
+                    metadatum_id: this.metadatumId,
+                    collection_id: this.collectionId,
                     value: this.selected
                 });
+            },
+            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 query = this.query.metaquery.slice();
+                    this.selected = query[ index ].value;
+                } else {
+                    this.selected = [];
+                }
 
                 let onlyLabels = [];
-
-                if(!isNaN(this.selected[0])){
+                if (!isNaN(this.selected[0])){
                     for (let aSelected of this.selected) {
                         let valueIndex = this.options.findIndex(option => option.value == aSelected);
-                        
+
                         if (valueIndex >= 0) {
                             onlyLabels.push(this.options[valueIndex].label);
                         }
                     }
                 }
 
-                this.$eventBusSearch.$emit( 'sendValuesToTags', {
-                    filterId: this.filter.id,
-                    value: onlyLabels.length ? onlyLabels : this.selected,
-                });
-            },
-            selectedValues() {
-                if ( !this.query || !this.query.metaquery || !Array.isArray( this.query.metaquery ) )
-                    return false;
-
-                let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key === this.metadatum );
-                if ( index >= 0){
-                    let query = this.query.metaquery.slice();
-                    this.selected = query[ index ].value;
-
-                } else {
-                    this.selected = [];
-                    return false;
-                }
+                this.$emit( 'sendValuesToTags', { label: onlyLabels.length ? onlyLabels : this.selected, value: this.selected });
             },
             openCheckboxModal() {
                 this.$buefy.modal.open({
@@ -196,11 +141,10 @@
                         filter: this.filter,
                         //taxonomy_id: this.taxonomy_id,
                         selected: this.selected,
-                        metadatum_id: this.metadatum,
+                        metadatumId: this.metadatumId,
                         //taxonomy: this.taxonomy,
-                        collection_id: this.collection,
-                        metadatum_type: this.type,
-                        metadatum_object: this.metadatum_object,
+                        collectionId: this.collectionId,
+                        metadatum_type: this.metadatumType,
                         isRepositoryLevel: this.isRepositoryLevel,
                         query: this.query
                     },
@@ -208,50 +152,13 @@
                         appliedCheckBoxModal: () => {
                             this.loadOptions();
                         } 
-                    }
+                    },
+                    trapFocus: true
                 });
             },
-            cleanSearchFromTags(filterTag) {
-                if (filterTag.filterId == this.filter.id) {
-
-                    let selectedIndex = this.selected.findIndex(option => option == filterTag.singleValue);
-                    let optionIndex = this.options.findIndex(option => option.label == filterTag.singleValue);
-                    let alternativeIndex;
-
-                    if (optionIndex >= 0) {
-                        alternativeIndex = this.selected.findIndex(option => this.options[optionIndex].value == option);
-                    }
-
-                    if (selectedIndex >= 0 || alternativeIndex >= 0) {
-
-                        selectedIndex >= 0 ? this.selected.splice(selectedIndex, 1) : this.selected.splice(alternativeIndex, 1); 
-
-                        this.$emit('input', {
-                            filter: 'checkbox',
-                            compare: 'IN',
-                            metadatum_id: this.metadatum,
-                            collection_id: ( this.collection_id ) ? this.collection_id : this.filter.collection_id,
-                            value: this.selected
-                        });
-
-                        this.$eventBusSearch.$emit( 'sendValuesToTags', {
-                            filterId: this.filter.id,
-                            value: this.selected
-                        });
-
-                        this.selectedValues();
-                    }
-                }
-            },
-            updatesIsLoading(isLoading) {
-                this.isLoadingOptions = isLoading;
+            updatesIsLoading(isLoadingOptions) {
+                this.isLoadingOptions = isLoadingOptions;
             }
-        },
-        beforeDestroy() {
-            this.$eventBusSearch.$off('removeFromFilterTag', this.cleanSearchFromTags);
-            
-            if (this.isUsingElasticSearch)
-                this.$eventBusSearch.$off('isLoadingItems', this.updatesIsLoading);
         }
     }
 </script>
diff --git a/src/classes/filter-types/checkbox/class-tainacan-checkbox.php b/src/classes/filter-types/checkbox/class-tainacan-checkbox.php
index 1354eff94..ebad4f1d4 100644
--- a/src/classes/filter-types/checkbox/class-tainacan-checkbox.php
+++ b/src/classes/filter-types/checkbox/class-tainacan-checkbox.php
@@ -9,6 +9,7 @@ defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 class Checkbox extends Filter_Type {
 
     function __construct(){
+        $this->set_name( __('Checkbox List', 'tainacan') );
         $this->set_supported_types(['string','long_string','item']);
         $this->set_component('tainacan-filter-checkbox');
         $this->set_preview_template('
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 055264ead..000000000
--- a/src/classes/filter-types/custom-interval/CustomInterval.vue
+++ /dev/null
@@ -1,330 +0,0 @@
-<template>
-    <div>
-        <!-- Date -->
-        <div v-if="type === 'date'">
-            <b-datepicker
-                    :aria-labelledby="labelId"
-                    :placeholder="$i18n.get('label_selectbox_init')"
-                    v-model="date_init"
-                    size="is-small"
-                    @focus="isTouched = true"
-                    @input="validate_values()"
-                    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="labelId"
-                    :placeholder="$i18n.get('label_selectbox_init')"
-                    v-model="date_end"
-                    size="is-small"
-                    @input="validate_values()"
-                    @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-numberinput
-                    :aria-labelledby="labelId"
-                    size="is-small"
-                    step="any"
-                    @input="validate_values()"
-                    v-model="value_init"/>
-            <p class="is-size-7 has-text-centered is-marginless">{{ $i18n.get('label_until') }}</p>
-            <b-numberinput
-                    :aria-labelledby="labelId"
-                    size="is-small"
-                    step="any"
-                    @input="validate_values()"
-                    @focus="isTouched = true"
-                    v-model="value_end"/>
-        </div>
-    </div>
-</template>
-
-<script>
-    import { tainacan as axios } from '../../../js/axios/axios';
-    import { wpAjax, dateInter } from "../../../admin/js/mixins";
-    import moment from 'moment';
-
-    export default {
-        mixins: [ wpAjax, dateInter ],
-        created() {
-            this.collection = ( this.collection_id ) ? this.collection_id : this.filter.collection_id;
-            this.metadatum = ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum.metadatum_id;
-
-            let in_route = '/collection/' + this.collection + '/metadata/' +  this.metadatum;
-
-            if(this.isRepositoryLevel || this.collection == 'filter_in_repository'){
-                in_route = '/metadata/'+ this.metadatum;
-            }
-
-            axios.get(in_route)
-                .then( res => {
-                    let result = res.data;
-                    if( result && result.metadata_type ){
-                        this.metadatum_object = result;
-                        this.type = ( result.metadata_type === 'Tainacan\\Metadata_Types\\Date') ? 'date' : 'numeric';
-                        this.selectedValues();
-                    }
-                })
-                .catch(error => {
-                    this.$console.log(error);
-                });
-
-            this.$eventBusSearch.$on('removeFromFilterTag', this.cleanSearchFromTags);
-        },
-        data(){
-            return {
-                value_init: null,
-                value_end: null,
-                date_init: undefined,
-                date_end: undefined,
-                isTouched: false,
-                isValid: false,
-                clear: false,
-                type: 'numeric',
-                collection: '',
-                metadatum: '',
-                metadatum_object: {}
-            }
-        },
-        props: {
-            filter: {
-                type: Object // concentrate all attributes metadatum id and type
-            },
-            metadatum_id: [Number], // not required, but overrides the filter metadatum id if is set
-            collection_id: [Number], // not required, but overrides the filter metadatum id if is set
-            labelId: '',
-            query: Object,
-            isRepositoryLevel: Boolean,
-        },
-        watch: {
-            isTouched( val ){
-              if ( val && this.date_init === null)
-                  this.date_init = new Date();
-
-              if ( val && this.date_end === null)
-                  this.date_end =  new Date();
-
-              this.isTouched = val;
-            }
-        },
-        methods: {
-            // only validate if the first value is higher than first
-            validate_values: _.debounce( function (){
-                if( this.type === 'date' ){
-                    if (this.date_init ===  undefined)
-                        this.date_init = new Date();
-
-                    if (this.date_end === undefined)
-                        this.date_end =  new Date();
-
-                    if ( this.date_init > this.date_end ) {
-                        let result = this.date_init;
-                        result.setDate(result.getDate() + 1);
-                        this.date_end = result;
-
-                        result.setDate(result.getDate() - 1);
-                        this.date_init = result;
-                        //this.error_message();
-                    }
-
-                } else {
-                    if ( parseFloat( this.value_init ) > parseFloat( this.value_end )) {
-                        //this.value_end = parseFloat( this.value_init ) + 1;
-                        //this.error_message();
-                        return;
-                    }
-                }
-                this.emit();
-            }, 1000),
-            // message for error
-            error_message(){
-                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(); 
-            },
-            selectedValues(){
-                if ( !this.query || !this.query.metaquery || !Array.isArray( this.query.metaquery ) )
-                    return false;
-
-                let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key === this.metadatum );
-                if ( index >= 0){
-                    let metadata = this.query.metaquery[ index ];
-                    if( metadata.value && metadata.value.length > 0 && this.type === 'numeric'){
-                        this.value_init = metadata.value[0];
-                        this.value_end = metadata.value[1];
-                        this.isValid = true;
-                    } else if( metadata.value && metadata.value.length > 0 ){
-                        this.date_init = new Date( metadata.value[0] );
-                        this.date_end = new Date( metadata.value[1] );
-
-                        this.isValid = true;
-                    }
-
-                    if (metadata.value[0] != undefined && metadata.value[1] != undefined) {
-                        this.$eventBusSearch.$emit( 'sendValuesToTags', {
-                            filterId: this.filter.id,
-                            value: this.parseDateToNavigatorLanguage(metadata.value[0]) + ' - ' + this.parseDateToNavigatorLanguage(metadata.value[1])
-                        });
-                    }
-
-                } else {
-                    return false;
-                }
-            },
-            showSearch(){
-                if( this.type === 'date' ){
-
-                    if( this.date_init === null || this.date_end === null ){
-                        this.clear = true;
-                        return '';
-                    }
-
-                    return this.date_init.toLocaleString().split(' ')[0] + ' - ' + this.date_end.toLocaleString().split(' ')[0];
-                }
-                // else {
-                //     return this.value_init + ' - ' +this.value_end;
-                // }
-            },
-            cleanSearchFromTags(filterTag) {
-                if (filterTag.filterId == this.filter.id)
-                    this.clearSearch();
-            },
-            clearSearch(){
-
-                this.clear = true;
-
-                this.$emit('input', {
-                    filter: 'range',
-                    compare: 'BETWEEN',
-                    metadatum_id: this.metadatum,
-                    collection_id: ( this.collection_id ) ? this.collection_id : this.filter.collection_id,
-                    value: ''
-                });
-
-                if( this.type === 'date' ){
-                    this.date_init =  null;
-                    this.date_end = null;
-                    this.isTouched = false;
-                } else {
-                    this.value_end = null;
-                    this.value_init = null;
-                    this.isTouched = false;
-                }
-            },
-            // emit the operation for listeners
-            emit() {
-                let values = [];
-                let type = '';
-
-                if( this.type === 'date' ){
-
-                    if( this.date_init === null && this.date_end === null ){
-                      values = [];
-                      type = 'DATE';
-                      this.isValid = false;
-                      this.clear = true;
-                    } else {
-                      let date_init = this.date_init.getUTCFullYear() + '-' +
-                          ('00' + (this.date_init.getUTCMonth() + 1)).slice(-2) + '-' +
-                          ('00' + this.date_init.getUTCDate()).slice(-2);
-                      let date_end = this.date_end.getUTCFullYear() + '-' +
-                          ('00' + (this.date_end.getUTCMonth() + 1)).slice(-2) + '-' +
-                          ('00' + this.date_end.getUTCDate()).slice(-2);
-                      values = [ date_init, date_end ];
-                      type = 'DATE';
-                      this.isValid = true;
-                      this.clear = false;
-                    }
-                } else {
-                    if( this.value_init === null || this.value_end === null
-                      || this.value_init === '' || this.value_end === ''){
-                        return;
-                    } else {
-                        values =  [ this.value_init, this.value_end ];
-
-                        if(this.value_init !== this.value_end && (this.value_init % 1 !== 0 && this.value_end % 1 == 0)) {
-                            type = 'DECIMAL';
-                        } else if(this.value_init !== this.value_end &&
-                            this.value_init % 1 !== 0 &&
-                            this.value_end % 1 !== 0) {
-
-                            type = '';
-                        } else if(this.value_init !== this.value_end &&
-                            !(this.value_init % 1 == 0 && this.value_end % 1 !== 0)){
-                            type = 'DECIMAL';
-                        } else {
-                            type = '';
-                        }
-                        //this.isValid = true;
-                        //this.clear = false;
-                    }
-                }
-
-                this.$emit('input', {
-                    filter: 'range',
-                    type: type,
-                    compare: 'BETWEEN',
-                    metadatum_id: this.metadatum,
-                    collection_id: ( this.collection_id ) ? this.collection_id : this.filter.collection_id,
-                    value: values
-                });
-
-                if (values[0] != undefined && values[1] != undefined) {
-                    this.$eventBusSearch.$emit( 'sendValuesToTags', {
-                        filterId: this.filter.id,
-                        value: this.parseDateToNavigatorLanguage(values[0]) + ' - ' + this.parseDateToNavigatorLanguage(values[1])
-                    });
-                }
-            }
-        },
-        beforeDestroy() {
-            this.$eventBusSearch.$off('removeFromFilterTag', this.cleanSearchFromTags);
-        }
-    }
-</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/date-interval/DateInterval.vue b/src/classes/filter-types/date-interval/DateInterval.vue
new file mode 100644
index 000000000..d6fa88c37
--- /dev/null
+++ b/src/classes/filter-types/date-interval/DateInterval.vue
@@ -0,0 +1,181 @@
+<template>
+    <div>
+        <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"
+                :years-range="[-200, 100]"
+                :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"
+                :years-range="[-200, 50]"
+                :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>
+</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
+        ],
+        data(){
+            return {
+                dateInit: undefined,
+                dateEnd: undefined,
+                isTouched: false
+            }
+        },
+        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();
+            }
+        },
+        mounted() {
+            this.updateSelectedValues();
+        },
+        methods: {
+            // only validate if the first value is higher than first
+            validadeValues: _.debounce( function (){
+               
+                if (this.dateInit === undefined)
+                    this.dateInit = new Date();
+
+                if (this.dateEnd === undefined)
+                    this.dateEnd = new Date();
+
+                if (this.dateInit > this.dateEnd) {
+                    this.showErrorMessage();
+                    return
+                }
+               
+                this.emit();
+            }, 800),
+            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.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.parseDateToNavigatorLanguage(metadata.value[0]) + ' - ' + this.parseDateToNavigatorLanguage(metadata.value[1]),
+                            value: [metadata.value[0], metadata.value[1]]
+                        });
+                } else {
+                    this.dateInit = null;
+                    this.dateEnd = null; 
+                }
+            },
+            // emit the operation for listeners
+            emit() {
+                let values = [];
+
+                if (this.dateInit === null && this.dateEnd === null) {
+                    values = [];
+                } 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.$emit('input', {
+                    filter: 'range',
+                    type: 'DATE',
+                    compare: 'BETWEEN',
+                    metadatum_id: this.metadatumId,
+                    collection_id: this.collectionId,
+                    value: values
+                });
+
+                if (values[0] != undefined && values[1] != undefined)
+                    this.$emit( 'sendValuesToTags', { 
+                        label: 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/date-interval/class-tainacan-date-interval.php b/src/classes/filter-types/date-interval/class-tainacan-date-interval.php
new file mode 100644
index 000000000..d9d8716ca
--- /dev/null
+++ b/src/classes/filter-types/date-interval/class-tainacan-date-interval.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Tainacan\Filter_Types;
+
+defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
+
+/**
+ * Class TainacanMetadatumType
+ */
+class Date_Interval extends Filter_Type {
+
+    function __construct(){
+        $this->set_name( __('Date Interval', 'tainacan') );
+        $this->set_supported_types(['date']);
+        $this->set_component('tainacan-filter-date-interval');
+        $this->set_use_max_options(false);
+        $this->set_preview_template('
+            <div>
+                <div class="datepicker control is-small">
+                    <div class="dropdown is-bottom-left is-mobile-modal">
+                        <div role="button" class="dropdown-trigger">
+                            <div class="control has-icons-left is-small is-clearfix">
+                                <input type="text" autocomplete="off" placeholder=" '. __('Select a date', 'tainacan') .'" class="input is-small">
+                                <span class="icon is-left is-small"><i class="mdi mdi-calendar-today"></i></span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <p class="is-size-7 has-text-centered is-marginless">until</p> 
+                <div class="datepicker control is-small">
+                    <div class="dropdown is-bottom-left is-mobile-modal">
+                        <div role="button" class="dropdown-trigger">
+                            <div class="control has-icons-left is-small is-clearfix">
+                                <input type="text" autocomplete="off" placeholder=" '. __('Select a date', 'tainacan') .'" class="input is-small">
+                                <span class="icon is-left is-small"><i class="mdi mdi-calendar-today"></i></span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        ');
+    }
+
+    /**
+     * @param $filter
+     * @return string
+     * @internal param $metadatum
+     */
+    public function render( $filter ){
+         return '<tainacan-filter-date-interval 
+                                        name="'.$filter->get_name().'"
+                                        collection_id="'.$filter->get_collection_id().'"
+                                        metadatum_id="'.$filter->get_metadatum()->get_id().'"></tainacan-filter-date-interval>';
+    }
+}
\ No newline at end of file
diff --git a/src/classes/filter-types/date/Date.vue b/src/classes/filter-types/date/Date.vue
index 3c49dea58..464c08029 100644
--- a/src/classes/filter-types/date/Date.vue
+++ b/src/classes/filter-types/date/Date.vue
@@ -3,7 +3,8 @@
          <b-dropdown
                 :mobile-modal="true"
                 @input="onChangeComparator($event)"
-                aria-role="list">
+                aria-role="list"
+                trap-focus>
             <button
                     :aria-label="$i18n.get('label_comparator')"
                     class="button is-white"
@@ -59,16 +60,16 @@
             </b-dropdown-item>
         </b-dropdown>
         <!-- <b-numberinput 
-                v-if="options.type == 'year'"
+                v-if="filterTypeOptions.type == 'year'"
                 :placeholder="$i18n.get('instruction_type_value_year')"
-                :aria-labelledby="labelId"
+                :aria-labelledby="'filter-label-id-' + filter.id"
                 size="is-small"
                 step="1"
                 @input="emitOnlyYear($event)"
                 v-model="yearsOnlyValue"/> -->
         <b-datepicker
                 position="is-bottom-left"
-                :aria-labelledby="labelId"
+                :aria-labelledby="'filter-label-id-' + filter.id"
                 :placeholder="$i18n.get('instruction_select_a_date')"
                 v-model="value"
                 @input="emit()"
@@ -77,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'),
@@ -100,67 +102,38 @@
                     $i18n.get('datepicker_month_november'),
                     $i18n.get('datepicker_month_december')
                 ]"/>
-                <!-- OPTIONS FOR TYPE 
+                <!-- filterTypeOptions FOR TYPE 
                     v-else
-                    :type="options.type == 'month' ? 'month' : null" 
-                    :placeholder="options.type == 'month' ? $i18n.get('instruction_select_a_date') : $i18n.get('instruction_select_a_month')"
+                    :type="filterTypeOptions.type == 'month' ? 'month' : null" 
+                    :placeholder="filterTypeOptions.type == 'month' ? $i18n.get('instruction_select_a_date') : $i18n.get('instruction_select_a_month')"
                 --> 
     </div>
 </template>
 
 <script>
-    import { tainacan as axios } from '../../../js/axios/axios';
     import { wpAjax, dateInter } from "../../../admin/js/mixins";
+    import { filterTypeMixin } from '../filter-types-mixin';
     import moment from 'moment';
 
     export default {
-        mixins: [ wpAjax, dateInter ],
-        created() {
-            this.collection = ( this.collection_id ) ? this.collection_id : this.filter.collection_id;
-            this.metadatum = ( this.metadatum_id ) ? this.metadatum_id : (typeof this.filter.metadatum.metadatum_id == 'object' ? this.filter.metadatum.metadatum_id.metadatum_id : this.filter.metadatum.metadatum_id);
-            this.options = this.filter.filter_type_options;
-
-            let in_route = '/collection/' + this.collection + '/metadata/' +  this.metadatum;
-
-            if (this.isRepositoryLevel || this.collection == 'filter_in_repository')
-                in_route = '/metadata/'+ this.metadatum;
-        
-            axios.get(in_route)
-                .then( res => {
-                    let result = res.data;
-                    if ( result && result.metadata_type ){
-                        this.metadatum_object = result;
-                        this.selectedValues();
-                    }
-                })
-                .catch(error => {
-                    this.$console.log(error);
-                });
-            this.$eventBusSearch.$on('removeFromFilterTag', this.cleanSearchFromTags);
-        },
+        mixins: [
+            wpAjax,
+            dateInter,
+            filterTypeMixin
+        ],
         mounted() {
-            this.selectedValues();
+            this.updateSelectedValues();
         },
         data(){
             return {
                 value: null,
-                clear: false,
-                options: [],
-                collection: '',
-                metadatum: '',
-                metadatum_object: {},
                 comparator: '=', // =, !=, >, >=, <, <=
             }
         },
-        props: {
-            filter: {
-                type: Object // concentrate all attributes metadatum id and type
-            },
-            metadatum_id: [Number], // not required, but overrides the filter metadatum id if is set
-            collection_id: [Number], // not required, but overrides the filter metadatum id if is set
-            labelId: '',
-            query: Object,
-            isRepositoryLevel: Boolean,
+        watch: {
+            'query.metaquery'() {
+                this.updateSelectedValues();
+            }
         },
         computed: {
             yearsOnlyValue() {
@@ -179,12 +152,12 @@
             }
         },
         methods: {
-            selectedValues(){
+            updateSelectedValues(){
                 if ( !this.query || !this.query.metaquery || !Array.isArray( this.query.metaquery ) )
                     return false;
 
-                let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key === this.metadatum );
-                
+                let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key == this.metadatumId );
+
                 if ( index >= 0){
                     let metadata = this.query.metaquery[ index ];
                     
@@ -199,35 +172,15 @@
                         
                         this.value = new Date(textValue);
 
-                        this.$eventBusSearch.$emit( 'sendValuesToTags', {
-                            filterId: this.filter.id,
-                            value: this.comparator + ' ' + moment(this.value, moment.ISO_8601).format(this.dateFormat)
+                        this.$emit('sendValuesToTags', { 
+                            label: this.comparator + ' ' + moment(this.value, moment.ISO_8601).format(this.dateFormat), 
+                            value: textValue
                         });
                     }
 
                 } else {
-                    return false;
+                    this.value = null;
                 }
-
-            },
-            cleanSearchFromTags(filterTag) {
-                if (filterTag.filterId == this.filter.id)
-                    this.clearSearch();
-            },
-            clearSearch(){
-
-                this.clear = true;
-
-                this.$emit('input', {
-                    filter: 'date',
-                    type: 'DATE',
-                    compare: this.comparator,
-                    metadatum_id: this.metadatum,
-                    collection_id: ( this.collection_id ) ? this.collection_id : this.filter.collection_id,
-                    value: ''
-                });
-
-                this.value = null;
             },
             dateFormatter(dateObject) { 
                 return moment(dateObject, moment.ISO_8601).format(this.dateFormat);
@@ -260,13 +213,13 @@
                     filter: 'date',
                     type: 'DATE',
                     compare: this.comparator,
-                    metadatum_id: this.metadatum,
-                    collection_id: ( this.collection_id ) ? this.collection_id : this.filter.collection_id,
+                    metadatum_id: this.metadatumId,
+                    collection_id: this.collectionId,
                     value: valueQuery
                 });
-                this.$eventBusSearch.$emit( 'sendValuesToTags', {
-                    filterId: this.filter.id,
-                    value: this.comparator + ' ' + moment(this.value, moment.ISO_8601).format(this.dateFormat)
+                this.$emit('sendValuesToTags', { 
+                    label: this.comparator + ' ' + moment(this.value, moment.ISO_8601).format(this.dateFormat), 
+                    value: valueQuery
                 });
                 
             },
@@ -274,9 +227,6 @@
                 this.comparator = newComparator;
                 this.emit();
             }
-        },
-        beforeDestroy() {
-            this.$eventBusSearch.$off('removeFromFilterTag', this.cleanSearchFromTags);
         }
     }
 </script>
diff --git a/src/classes/filter-types/date/FormDate.vue b/src/classes/filter-types/date/FormDate.vue
index 53903c8f2..4410edf99 100644
--- a/src/classes/filter-types/date/FormDate.vue
+++ b/src/classes/filter-types/date/FormDate.vue
@@ -27,7 +27,6 @@
                 type: Object
             },
             value: [String, Number, Array],
-            id: '',
             disabled: false,
         },
         data() {
@@ -39,9 +38,6 @@
             onUpdateType(type) {
                 this.$emit('input', { type: type });
             },
-        },
-        created() {
-            this.type = this.type && this.value.type ? this.value.type : 'day';
         }
     }
 </script>
\ No newline at end of file
diff --git a/src/classes/filter-types/date/class-tainacan-date.php b/src/classes/filter-types/date/class-tainacan-date.php
index 858c4cf4a..eec010199 100644
--- a/src/classes/filter-types/date/class-tainacan-date.php
+++ b/src/classes/filter-types/date/class-tainacan-date.php
@@ -10,6 +10,7 @@ defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 class Date extends Filter_Type {
 
     function __construct(){
+        $this->set_name( __('Date', 'tainacan') );
         $this->set_supported_types(['date']);
         $this->set_component('tainacan-filter-date');
         // $this->set_form_component('tainacan-filter-form-date');
diff --git a/src/classes/filter-types/filter-type/class-tainacan-filter-type.php b/src/classes/filter-types/filter-type/class-tainacan-filter-type.php
index c9eef012e..b4a5b48a4 100644
--- a/src/classes/filter-types/filter-type/class-tainacan-filter-type.php
+++ b/src/classes/filter-types/filter-type/class-tainacan-filter-type.php
@@ -24,6 +24,12 @@ abstract class Filter_Type {
      */
     private $default_options = [];
 
+    /**
+     * The name of the filter type that will be rendered on labels
+     * @var string
+     */
+    private $name;
+
     /**
      * The name of the web component used by this filter type
      * @var string
@@ -56,6 +62,20 @@ abstract class Filter_Type {
 
     }
 
+    /**
+     * @param string $name for the filter type
+     */
+    public function set_name($name){
+        $this->name = $name;
+    }
+
+    /**
+     * @return string
+     */
+    public function get_name() {
+        return $this->name;
+    }
+
     /**
      * @return array Supported types by the filter
      */
@@ -103,6 +123,7 @@ abstract class Filter_Type {
         $attributes = [];
 
         $attributes['className']        = get_class($this);
+        $attributes['name']             = $this->get_name();
         $attributes['component']        = $this->get_component();
         $attributes['options']          = $this->get_options();
         $attributes['supported_types']  = $this->get_supported_types();
@@ -207,4 +228,8 @@ abstract class Filter_Type {
     public function set_form_component($form_component){
     	$this->form_component = $form_component;
     }
+
+    public function get_filter_type() {
+        return str_replace( 'Tainacan\Filter_Types\\', '', get_class($this) );
+    }
 }
\ No newline at end of file
diff --git a/src/classes/filter-types/filter-types-mixin.js b/src/classes/filter-types/filter-types-mixin.js
index 8093cec3d..a452caf21 100644
--- a/src/classes/filter-types/filter-types-mixin.js
+++ b/src/classes/filter-types/filter-types-mixin.js
@@ -2,34 +2,48 @@ import qs from 'qs';
 import axios from '../../js/axios/axios';
 import { mapGetters } from 'vuex';
 
-export const filter_type_mixin = {
+export const filterTypeMixin = {
+    data () {
+        return {
+            collectionId: '',
+            metadatumId: '',
+            metadatumType: '',
+            filterTypeOptions: [],
+        }
+    },
+    props: {
+        filter: Object,
+        query: Object,
+        isRepositoryLevel: Boolean,
+        isUsingElasticSearch: Boolean,
+        isLoadingItems: Boolean
+    },
+    created() {
+        this.collectionId = this.filter.collection_id ? this.filter.collection_id : this.collectionId;
+        this.metadatumId = this.filter.metadatum.metadatum_id ? this.filter.metadatum.metadatum_id : this.metadatumId;
+        this.filterTypeOptions = this.filter.filter_type_options ? this.filter.filter_type_options : this.filterTypeOptions;
+        this.metadatumType = this.filter.metadatum.metadata_type_object && this.filter.metadatum.metadata_type_object.className ? this.filter.metadatum.metadata_type_object.className : this.metadatumType;
+    }
+};
+
+export const dynamicFilterTypeMixin = {
     data () {
         return {
             thumbPlaceholderPath: tainacan_plugin.base_url + '/admin/images/placeholder_square.png',
             getOptionsValuesCancel: undefined,
-            isUsingElasticSearch: tainacan_plugin.wp_elasticpress == "1" ? true : false,
-            isLoadingOptions: false
+            isLoadingOptions: false,
         }
     },
-    props: {
-        filter: {
-            type: Object // concentrate all attributes metadatum id and type
-        },
-        metadatum_id: [Number], // not required, but overrides the filter metadatum id if is set
-        collection_id: [Number], // not required, but overrides the filter metadatum id if is set
-        id: '',
-        query: {}
-    },
-    created() {
-        // We listen to event, but reload event if hasFiltered is negative, as 
-        // an empty query also demands filters reloading.
-        this.$eventBusSearch.$on('hasFiltered', this.reloadOptionsDueToFiltering);
-    },
     computed: {
         facetsFromItemSearch() {
             return this.getFacets();
         }
     },
+    watch: {
+        isLoadingItems() {
+            this.isLoadingOptions = this.isLoadingItems;
+        }
+    },
     methods: {
         ...mapGetters('search', [
             'getFacets'
@@ -39,7 +53,7 @@ export const filter_type_mixin = {
             if (isInCheckboxModal || search || !this.isUsingElasticSearch) {
 
                 const source = axios.CancelToken.source();
-
+ 
                 let currentQuery  = JSON.parse(JSON.stringify(this.query));
                 if (currentQuery.fetch_only != undefined) {
                     delete currentQuery.fetch_only;
@@ -51,10 +65,10 @@ export const filter_type_mixin = {
                 let query_items = { 'current_query': currentQuery };
 
                 let url = '';
-                if (isRepositoryLevel  || this.filter.collection_id == 'filter_in_repository')
+                if (isRepositoryLevel  || this.filter.collection_id == 'default')
                     url = `/facets/${metadatumId}?getSelected=${getSelected}&`;
                 else
-                    url = `/collection/${this.collection}/facets/${metadatumId}?getSelected=${getSelected}&`;
+                    url = `/collection/${this.filter.collection_id}/facets/${metadatumId}?getSelected=${getSelected}&`;
 
                 if (offset != undefined && number != undefined) {
                     if (!this.isUsingElasticSearch)
@@ -130,7 +144,7 @@ export const filter_type_mixin = {
                 let query_items = { 'current_query': currentQuery };
 
                 let url = '';
-                if (isRepositoryLevel  || this.filter.collection_id == 'filter_in_repository')
+                if (isRepositoryLevel  || this.filter.collection_id == 'default')
                     url =  '/facets/' + this.filter.metadatum.metadatum_id + `?getSelected=${getSelected}&`; 
                 else
                     url =  '/collection/' + this.filter.collection_id + '/facets/' + this.filter.metadatum.metadatum_id + `?getSelected=${getSelected}&`;
@@ -300,7 +314,7 @@ export const filter_type_mixin = {
                 this.noMorePage = 1;
             
 
-            if(this.options.length < this.maxNumOptionsCheckboxList)
+            if (this.options.length < this.maxNumOptionsCheckboxList)
                 this.noMorePage = 1;
             
             if (this.filter.max_options && this.options.length >= this.filter.max_options) {
@@ -313,16 +327,10 @@ export const filter_type_mixin = {
                 }
             }
         },
-        reloadOptionsDueToFiltering() {
-            if (typeof this.loadOptions == "function")
-                this.loadOptions(true);
-        }
     },
     beforeDestroy() {
         // Cancels previous Request
         if (this.getOptionsValuesCancel != undefined)
             this.getOptionsValuesCancel.cancel('Facet search Canceled.');
-    
-        this.$eventBusSearch.$off('hasFiltered', this.reloadOptionsDueToFiltering);
     },
 };
\ No newline at end of file
diff --git a/src/classes/filter-types/numeric-interval/FormNumericInterval.vue b/src/classes/filter-types/numeric-interval/FormNumericInterval.vue
new file mode 100644
index 000000000..bb048392c
--- /dev/null
+++ b/src/classes/filter-types/numeric-interval/FormNumericInterval.vue
@@ -0,0 +1,102 @@
+<template>
+    <div>
+        <b-field :addons="false">
+            <label class="label is-inline">
+                {{ $i18n.getHelperTitle('tainacan-filter-numeric-interval', 'step') }}<span>&nbsp;*&nbsp;</span>
+                <help-button
+                        :title="$i18n.getHelperTitle('tainacan-filter-numeric-interval', 'step')"
+                        :message="$i18n.getHelperMessage('tainacan-filter-numeric-interval', 'step')"/>
+            </label>
+            <div
+                    v-if="!showEditStepOptions"
+                    class="is-flex">
+                <b-select
+                        name="step_options"
+                        v-model="step"
+                        @input="onUpdate">
+                    <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="onUpdate"
+                        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>
+        
+    </div>
+</template>
+
+<script>
+
+    export default {
+        props: {
+            filter: {
+                type: Object
+            },
+            value: [String, Number, Array],
+            disabled: false,
+        },
+        data() {
+            return {
+                step: [Number, String],
+                showEditStepOptions: false
+            }
+        },
+        methods: {
+            onUpdate() {
+                this.$emit('input', { 
+                    step: this.step
+                });
+            },
+            
+        },
+        created() {
+            this.step = this.value && this.value.step ? this.value.step : 1;
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/classes/filter-types/numeric-interval/NumericInterval.vue b/src/classes/filter-types/numeric-interval/NumericInterval.vue
new file mode 100644
index 000000000..96721f059
--- /dev/null
+++ b/src/classes/filter-types/numeric-interval/NumericInterval.vue
@@ -0,0 +1,120 @@
+<template>
+    <div>
+        <b-numberinput
+                :aria-labelledby="'filter-label-id-' + filter.id"
+                size="is-small"
+                @input="validadeValues()"
+                :step="filterTypeOptions.step"
+                v-model="valueInit"
+                />
+        <p class="is-size-7 has-text-centered is-marginless">{{ $i18n.get('label_until') }}</p>
+        <b-numberinput
+                :aria-labelledby="'filter-label-id-' + filter.id"
+                size="is-small"
+                @input="validadeValues()"
+                :step="filterTypeOptions.step"
+                v-model="valueEnd"/>
+        
+    </div>
+</template>
+
+<script>
+    import { filterTypeMixin } from '../filter-types-mixin';
+    export default {
+        mixins: [ filterTypeMixin ],
+        data(){
+            return {
+                valueInit: null,
+                valueEnd: null
+            }
+        },
+        mounted() {
+            this.updateSelectedValues();
+        },
+        watch: {
+            'query.metaquery'() {
+                this.updateSelectedValues();
+            }
+        },
+        methods: {
+            // only validate if the first value is higher than first
+            validadeValues: _.debounce( function () {
+                if (this.valueInit == null || this.valueEnd == null)
+                    return
+
+                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();
+            }, 600),
+            // message for error
+            showErrorMessage(){
+                this.$buefy.toast.open({
+                    duration: 3000,
+                    message: this.$i18n.get('info_error_first_value_greater'),
+                    position: 'is-bottom',
+                    type: 'is-danger'
+                })
+            },
+            // emit the operation for listeners
+            emit() {
+                let values =  [ this.valueInit, this.valueEnd ];
+                let type = ! Number.isInteger( this.valueInit ) || ! Number.isInteger( this.valueEnd ) ? 'DECIMAL(20,3)' : 'NUMERIC';
+
+                this.$emit('input', {
+                    type: type,
+                    compare: 'BETWEEN',
+                    metadatum_id: this.metadatumId,
+                    collection_id: this.collectionId,
+                    value: values
+                });
+
+                if (values[0] != undefined && values[1] != undefined)
+                    this.$emit('sendValuesToTags', { label: values[0] + ' - ' + values[1], value: values });
+            },
+            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 metaquery = this.query.metaquery[ index ];
+                    if ( metaquery.value && metaquery.value.length > 1 ) {
+                        this.valueInit = new Number(metaquery.value[0]);
+                        this.valueEnd = new Number(metaquery.value[1]);
+                    }
+
+                    if (metaquery.value[0] != undefined && metaquery.value[1] != undefined)
+                        this.$emit('sendValuesToTags', { label: this.valueInit + ' - ' + this.valueEnd, value: metaquery.value });
+
+                } else {
+                    this.valueInit = null;
+                    this.valueEnd = null;
+                }
+            },
+        }
+    }
+</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/numeric-interval/class-tainacan-numeric-interval.php
similarity index 73%
rename from src/classes/filter-types/custom-interval/class-tainacan-custom-interval.php
rename to src/classes/filter-types/numeric-interval/class-tainacan-numeric-interval.php
index ac7d82869..ff17a4c9e 100644
--- a/src/classes/filter-types/custom-interval/class-tainacan-custom-interval.php
+++ b/src/classes/filter-types/numeric-interval/class-tainacan-numeric-interval.php
@@ -7,12 +7,17 @@ defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 /**
  * Class TainacanMetadatumType
  */
-class Custom_Interval extends Filter_Type {
+class Numeric_Interval extends Filter_Type {
 
     function __construct(){
-        $this->set_supported_types(['float','date']);
-        $this->set_component('tainacan-filter-custom-interval');
+        $this->set_name( __('Numeric Interval', 'tainacan') );
+        $this->set_supported_types(['float']);
+        $this->set_component('tainacan-filter-numeric-interval');
+        $this->set_form_component('tainacan-filter-form-numeric-interval');
         $this->set_use_max_options(false);
+        $this->set_default_options([
+            'step' => 1
+        ]);
         $this->set_preview_template('
             <div>
                 <div class="b-numberinput field is-grouped">
@@ -57,6 +62,16 @@ class Custom_Interval extends Filter_Type {
             </div>
         ');
     }
+    
+    public function get_form_labels(){
+        return [
+            'step' => [
+                'title' => __( 'Step', 'tainacan' ),
+                'description' => __( 'The amount to be increased or decreased when clicking on filter control buttons. This alo defines whether the input accepts decimal numbers.', 'tainacan' ),
+            ],
+            'custom' => ['title' => __('Custom interval','tainacan')],
+        ];
+    }
 
     /**
      * @param $filter
@@ -64,10 +79,9 @@ class Custom_Interval extends Filter_Type {
      * @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 
+         return '<tainacan-filter-numeric-interval 
                                         name="'.$filter->get_name().'"
                                         collection_id="'.$filter->get_collection_id().'"
-                                        metadatum_id="'.$filter->get_metadatum()->get_id().'"></tainacan-filter-custom-interval>';
+                                        metadatum_id="'.$filter->get_metadatum()->get_id().'"></tainacan-filter-numeric-interval>';
     }
 }
\ No newline at end of file
diff --git a/src/classes/filter-types/numeric-list-interval/FormNumericListInterval.vue b/src/classes/filter-types/numeric-list-interval/FormNumericListInterval.vue
new file mode 100644
index 000000000..1cc6bb8bf
--- /dev/null
+++ b/src/classes/filter-types/numeric-list-interval/FormNumericListInterval.vue
@@ -0,0 +1,195 @@
+<template>
+    <div>
+        <b-field :addons="false">
+            <label class="label is-inline">
+                {{ $i18n.getHelperTitle('tainacan-filter-numeric-list-interval', 'showIntervalOnTag') }}<span>&nbsp;</span>
+                <help-button
+                        :title="$i18n.getHelperTitle('tainacan-filter-numeric-list-interval', 'showIntervalOnTag')"
+                        :message="$i18n.getHelperMessage('tainacan-filter-numeric-list-interval', 'showIntervalOnTag')"/>
+            </label>
+            <div>
+                <b-field>
+                    <b-checkbox
+                            v-model="showIntervalOnTag"
+                            @input="onUpdateShowIntervalOnTag()">
+                        {{ $i18n.get('info_show_interval_on_tag') }}
+                    </b-checkbox>
+                </b-field>
+            </div>
+        </b-field>
+        <b-field :addons="false">
+            <label class="label is-inline">
+                {{ $i18n.getHelperTitle('tainacan-filter-numeric-list-interval', 'intervals') }}<span>&nbsp;</span>
+                <help-button
+                        :title="$i18n.getHelperTitle('tainacan-filter-numeric-list-interval', 'intervals')"
+                        :message="$i18n.getHelperMessage('tainacan-filter-numeric-list-interval', 'intervals')"/>
+            </label>
+            <transition-group name="filter-item">
+                <div
+                        class="options-input"
+                        v-for="(interval, index) of intervals"
+                        :key="index">
+                    <b-field>
+                        <b-input
+                                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')"
+                                @input="onUpdate(interval, true)"
+                                v-model="interval.to" />
+                    </b-field>
+                    <p class="control">
+                        <a
+                                role="button"
+                                @click="addInterval(index)"
+                                class="is-inline add-link"
+                                :title="$i18n.get('add_value')">
+                            <span class="icon is-small">
+                                <i class="tainacan-icon has-text-secondary tainacan-icon-add"/>
+                            </span>
+                                &nbsp;{{ $i18n.get('add_value') }}
+                        </a>
+                    </p>
+                    <p 
+                        v-if="intervals.length > 1"
+                        class="control">
+                        <a
+                                role="button"
+                                @click="removeInterval(index)"
+                                class="is-inline add-link"
+                                :title="$i18n.get('remove_value')">
+                            <span class="icon is-small">
+                                <i class="tainacan-icon has-text-secondary tainacan-icon-repprovedcircle"/>
+                            </span>
+                            &nbsp;{{ $i18n.get('remove_value') }}
+                        </a>
+                    </p>
+                </div>
+            </transition-group>
+        </b-field>
+    </div>
+</template>
+
+<script>
+
+    export default {
+        props: {
+            filter: Object,
+            value: [String, Number, Array],
+            id: '',
+            disabled: false,
+        },
+        data() {
+            return {
+                showIntervalOnTag: true,
+                intervals: [],
+                isValid: true,
+            }
+        },
+        methods: {
+            onUpdate: _.debounce( function(interval, validade) {
+                if (validade != undefined && validade == true && 
+                    (interval.to == null || interval.from == null ||
+                     interval.to == "" || interval.from == "" ||
+                     Number(interval.to) < Number(interval.from))
+                ) {
+                    this.isValid = false;
+                    
+                    if (interval.to != '' && interval.from != '' && interval.to != null && interval.from != null)
+                        this.showErrorMessage()
+                } else {
+                    this.isValid = true;
+                    this.$emit('input', {
+                        intervals: this.intervals,
+                        showIntervalOnTag: this.showIntervalOnTag
+                    });
+                }
+            }, 600),
+            onUpdateShowIntervalOnTag() {
+                if (this.isValid) {
+                    this.$emit('input', {
+                        intervals: this.intervals,
+                        showIntervalOnTag: this.showIntervalOnTag
+                    });
+                }
+            },
+            showErrorMessage() {
+                this.$buefy.toast.open({
+                    duration: 3000,
+                    message: this.$i18n.get('info_error_first_value_greater'),
+                    position: 'is-bottom',
+                    type: 'is-danger'
+                })
+            },
+            removeInterval(index) {
+                this.intervals.splice(index, 1);
+            },
+            addInterval(index) {
+                if (index != undefined) {
+                    this.intervals.splice(index + 1, 0, {
+                        label: '',
+                        to: null,
+                        from: null
+                    })
+                } else {
+                    this.intervals.push({
+                        label: '',
+                        to: null,
+                        from: null
+                    });
+                }
+            }
+        },
+        created() {
+            this.intervals = 
+                this.value && this.value.intervals && this.value.intervals.length > 0 ? 
+                    this.value.intervals : 
+                    [{
+                        label: '',
+                        to: null,
+                        from: null
+                    }];
+            this.showIntervalOnTag = this.value && this.value.showIntervalOnTag != undefined ? this.value.showIntervalOnTag : true;
+        }
+    }
+</script>
+
+<style scoped lang="scss">
+    @import '../../scss/_variables.scss';
+
+    .options-input {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+
+        .field:first-child {
+            width: 100%;
+            margin-top: 1rem;
+            margin-bottom: -1px;
+        }
+        .field.has-addons {
+            margin-bottom: 0.125rem;
+            width: 100%;
+            display: flex;
+            flex-wrap: wrap;
+            &>.control {
+                flex-basis: 50%;
+            }
+        }
+    }
+
+</style>
diff --git a/src/classes/filter-types/numeric-list-interval/NumericListInterval.vue b/src/classes/filter-types/numeric-list-interval/NumericListInterval.vue
new file mode 100644
index 000000000..cbc14c647
--- /dev/null
+++ b/src/classes/filter-types/numeric-list-interval/NumericListInterval.vue
@@ -0,0 +1,119 @@
+<template>
+    <div>
+        <b-select
+                expanded
+                :placeholder="$i18n.get('instruction_select_a_interval')"
+                @input="changeInterval"
+                v-model="selectedInterval">
+            <option value="">
+                {{ $i18n.get('label_selectbox_init') }}...
+            </option>
+            <option
+                    v-for="(interval, index) in filterTypeOptions.intervals"
+                    :value="index"
+                    :key="index">
+                {{ interval.label }}
+            </option>
+        </b-select>
+    </div>
+</template>
+
+<script>
+    import { filterTypeMixin } from '../filter-types-mixin';
+    export default {
+        mixins: [ filterTypeMixin ],
+        data() {
+            return {
+                valueInit: 0,
+                valueEnd: 10,
+                selectedInterval: ''
+            }
+        },
+        mounted() {
+            this.updateSelectedValues();
+        },
+        watch: {
+            'query.metaquery'() {
+                this.updateSelectedValues();
+            }
+        },
+        methods: {
+            changeInterval() {
+                if (this.selectedInterval !== '') {
+                    this.valueInit = this.filterTypeOptions.intervals[this.selectedInterval].from;
+                    this.valueEnd = this.filterTypeOptions.intervals[this.selectedInterval].to;
+                    this.emit();
+                } else {
+                    this.$emit('input', {
+                        type: 'DECIMAL',
+                        compare: 'BETWEEN',
+                        metadatum_id: this.metadatumId,
+                        collection_id: this.collectionId,
+                        value: [null, null]
+                    });
+                    this.valueEnd = null;
+                    this.valueInit = null;
+                    this.$emit('sendValuesToTags', { label: '', value: null });
+                }
+            },
+            // emit the operation for listeners
+            emit() {
+                let values =  [ this.valueInit, this.valueEnd ];
+                let type = ! Number.isInteger( this.valueInit ) || ! Number.isInteger( this.valueEnd ) ? 'DECIMAL' : 'NUMERIC';
+                this.$emit('input', {
+                    type: type,
+                    compare: 'BETWEEN',
+                    metadatum_id: this.metadatumId,
+                    collection_id: this.collectionId,
+                    value: values
+                });
+
+                if (values[0] != undefined && values[1] != undefined && this.selectedInterval !== '') {
+                    let labelValue = this.filterTypeOptions.intervals[this.selectedInterval].label + (this.filterTypeOptions.showIntervalOnTag ? ` (${values[0]}-${values[1]})` : '');
+                    this.$emit('sendValuesToTags', { label: labelValue, value: values });
+                }
+            },
+            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 metaquery = this.query.metaquery[ index ];
+
+                    if ( !metaquery.value || 
+                         !metaquery.value.length > 1 ||
+                         metaquery.value[0] == undefined ||
+                         metaquery.value[1] == undefined )
+                         return false
+
+                    this.valueInit = metaquery.value[0];
+                    this.valueEnd = metaquery.value[1];
+
+                    this.selectedInterval = this.filterTypeOptions.intervals.findIndex(
+                        anInterval => anInterval.from == this.valueInit && anInterval.to == this.valueEnd
+                    );
+                    this.selectedInterval = this.selectedInterval >= 0 ? this.selectedInterval : '';
+
+                    if (this.selectedInterval !== '') {
+                        let labelValue = this.filterTypeOptions.intervals[this.selectedInterval].label + (this.filterTypeOptions.showIntervalOnTag ? ` (${this.valueInit}-${this.valueEnd})` : '');
+                        this.$emit('sendValuesToTags', { label: labelValue, value: [ this.valueInit, this.valueEnd ] });
+                    }
+                } else {
+                    this.valueInit = null;
+                    this.valueEnd = null;
+                    this.selectedInterval = '';
+                }
+            },
+        }
+    }
+</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/numeric-list-interval/class-tainacan-numeric-list-interval.php b/src/classes/filter-types/numeric-list-interval/class-tainacan-numeric-list-interval.php
new file mode 100644
index 000000000..c4ee5943c
--- /dev/null
+++ b/src/classes/filter-types/numeric-list-interval/class-tainacan-numeric-list-interval.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Tainacan\Filter_Types;
+
+defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
+
+/**
+ * Class TainacanMetadatumType
+ */
+class Numeric_List_Interval extends Filter_Type {
+
+    function __construct(){
+        $this->set_name( __('Numeric Interval List', 'tainacan') );
+        $this->set_supported_types(['float']);
+        $this->set_component('tainacan-filter-numeric-list-interval');
+        $this->set_form_component('tainacan-filter-form-numeric-list-interval');
+        $this->set_use_max_options(false);
+        $this->set_default_options([
+            'intervals' => [],
+            'showIntervalOnTag' => false
+        ]);
+        $this->set_preview_template('
+            <div class="collapse show">
+                <div class="dropdown is-active">
+                    <div role="button" class="dropdown-trigger">
+                        <button class="button is-white">
+                            List
+                            <span class="icon">
+                                <i class="tainacan-icon tainacan-icon-20px tainacan-icon-arrowdown"></i>
+                            </span>
+                        </button>
+                    </div>
+                    <div class="background"></div>
+                    <div class="dropdown-menu">
+                        <div role="list" class="dropdown-content">
+                            <a class="dropdown-item is-active">Top 10</a>
+                            <a class="dropdown-item">Top 20</a>
+                            <a class="dropdown-item">Top 30</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        ');
+    }
+    
+    public function get_form_labels() {
+        return [
+            'intervals' => [
+                'title' => __('Predefined intervals','tainacan'),
+                'description' => __('A list of predefined intervals that the filter will offer on a select box.','tainacan')
+            ],
+            'showIntervalOnTag' => [
+                'title' => __('Interval on tags', 'tainacan'),
+                'description' => __('Whether the applyed interval values should appear on filter tags.')
+            ]
+        ];
+    }
+
+    /**
+     * @param $filter
+     * @return string
+     * @internal param $metadatum
+     */
+    public function render( $filter ) {
+         return '<tainacan-filter-numeric-list-interval 
+                                        name="'.$filter->get_name().'"
+                                        collection_id="'.$filter->get_collection_id().'"
+                                        metadatum_id="'.$filter->get_metadatum()->get_id().'"></tainacan-filter-form-numeric-list-interval>';
+    }
+}
\ No newline at end of file
diff --git a/src/classes/filter-types/numeric/FormNumeric.vue b/src/classes/filter-types/numeric/FormNumeric.vue
index 8c7a992fc..06e4f84c6 100644
--- a/src/classes/filter-types/numeric/FormNumeric.vue
+++ b/src/classes/filter-types/numeric/FormNumeric.vue
@@ -74,11 +74,8 @@
 
     export default {
         props: {
-            filter: {
-                type: Object
-            },
+            filter: Object,
             value: [String, Number, Array],
-            id: '',
             disabled: false,
         },
         data() {
diff --git a/src/classes/filter-types/numeric/Numeric.vue b/src/classes/filter-types/numeric/Numeric.vue
index f8930712d..020df30db 100644
--- a/src/classes/filter-types/numeric/Numeric.vue
+++ b/src/classes/filter-types/numeric/Numeric.vue
@@ -3,7 +3,8 @@
          <b-dropdown
                 :mobile-modal="true"
                 @input="onChangeComparator($event)"
-                aria-role="list">
+                aria-role="list"
+                trap-focus>
             <button
                     :aria-label="$i18n.get('label_comparator')"
                     class="button is-white"
@@ -60,67 +61,33 @@
         </b-dropdown>
 
         <b-numberinput
-                :aria-labelledby="labelId"
+                :aria-labelledby="'filter-label-id-' + filter.id"
                 size="is-small"
-                :step="Number(options.step)"
+                :step="Number(filterTypeOptions.step)"
                 @input="emit()"
                 v-model="value"/>
     </div>
 </template>
 
 <script>
-    import { tainacan as axios } from '../../../js/axios/axios';
-    import { wpAjax } from "../../../admin/js/mixins";
+    import { wpAjax } from '../../../admin/js/mixins';
+    import { filterTypeMixin } from '../filter-types-mixin';
 
     export default {
-        mixins: [ wpAjax ],
-        created() {
-            this.collection = ( this.collection_id ) ? this.collection_id : this.filter.collection_id;
-            this.metadatum = ( this.metadatum_id ) ? this.metadatum_id : (typeof this.filter.metadatum.metadatum_id == 'object' ? this.filter.metadatum.metadatum_id.metadatum_id : this.filter.metadatum.metadatum_id);
-            this.options = this.filter.filter_type_options;
-
-            let in_route = '/collection/' + this.collection + '/metadata/' +  this.metadatum;
-
-            if (this.isRepositoryLevel || this.collection == 'filter_in_repository')
-                in_route = '/metadata/'+ this.metadatum;
-        
-            axios.get(in_route)
-                .then( res => {
-                    let result = res.data;
-                    if ( result && result.metadata_type ){
-                        this.metadatum_object = result;
-                        this.selectedValues();
-                    }
-                })
-                .catch(error => {
-                    this.$console.log(error);
-                });
-            this.$eventBusSearch.$on('removeFromFilterTag', this.cleanSearchFromTags);
-        },
+        mixins: [
+            wpAjax,
+            filterTypeMixin
+        ],
         mounted() {
-            this.selectedValues();
+            this.updateSelectedValues();
         },
         data(){
             return {
                 value: null,
-                clear: false,
-                options: [],
-                collection: '',
-                metadatum: '',
-                metadatum_object: {},
+                filterTypeOptions: [],
                 comparator: '=' // =, !=, >, >=, <, <=
             }
         },
-        props: {
-            filter: {
-                type: Object // concentrate all attributes metadatum id and type
-            },
-            metadatum_id: [Number], // not required, but overrides the filter metadatum id if is set
-            collection_id: [Number], // not required, but overrides the filter metadatum id if is set
-            labelId: '',
-            query: Object,
-            isRepositoryLevel: Boolean,
-        },
         computed: {
             comparatorSymbol() {
                 switch(this.comparator) {
@@ -134,12 +101,17 @@
                 }
             }
         },
+        watch: {
+            'query.metaquery'() {
+                this.updateSelectedValues();
+            }
+        },
         methods: {
-            selectedValues(){
+            updateSelectedValues(){
                 if ( !this.query || !this.query.metaquery || !Array.isArray( this.query.metaquery ) )
                     return false;
 
-                let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key === this.metadatum );
+                let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key == this.metadatumId );
                 
                 if ( index >= 0){
                     let metadata = this.query.metaquery[ index ];
@@ -150,65 +122,36 @@
                     if ( metadata.compare)
                         this.comparator = metadata.compare;
 
-                    if (this.value != undefined) {
-                        this.$eventBusSearch.$emit( 'sendValuesToTags', {
-                            filterId: this.filter.id,
-                            value: this.comparator + ' ' + this.value
-                        });
-                    }
+                    if (this.value != undefined)
+                        this.$emit('sendValuesToTags', { label: this.comparator + ' ' + this.value, value: this.value });
 
                 } else {
-                    return false;
+                    this.value = null;
                 }
 
             },
-            cleanSearchFromTags(filterTag) {
-                if (filterTag.filterId == this.filter.id)
-                    this.clearSearch();
-            },
-            clearSearch(){
-
-                this.clear = true;
-
-                this.$emit('input', {
-                    filter: 'numeric',
-                    compare: this.comparator,
-                    metadatum_id: this.metadatum,
-                    collection_id: ( this.collection_id ) ? this.collection_id : this.filter.collection_id,
-                    value: '',
-                    type: 'NUMERIC'
-                });
-
-                this.value = null;
-            },
             // emit the operation for listeners
             emit() {
 
                 if ( this.value === null || this.value === '')
                     return;
-
+                    
                 this.$emit('input', {
                     filter: 'numeric',
                     compare: this.comparator,
-                    metadatum_id: this.metadatum,
-                    collection_id: ( this.collection_id ) ? this.collection_id : this.filter.collection_id,
+                    metadatum_id: this.metadatumId,
+                    collection_id: this.collectionId,
                     value: this.value,
                     type: 'NUMERIC'
                 });
 
-                this.$eventBusSearch.$emit( 'sendValuesToTags', {
-                    filterId: this.filter.id,
-                    value: this.comparator + ' ' + this.value
-                });
+                this.$emit('sendValuesToTags', { label: this.comparator + ' ' + this.value, value: this.value });
                 
             },
             onChangeComparator(newComparator) {
                 this.comparator = newComparator;
                 this.emit();
             }
-        },
-        beforeDestroy() {
-            this.$eventBusSearch.$off('removeFromFilterTag', this.cleanSearchFromTags);
         }
     }
 </script>
diff --git a/src/classes/filter-types/numeric/class-tainacan-numeric.php b/src/classes/filter-types/numeric/class-tainacan-numeric.php
index cb2e4ae34..4860b7804 100644
--- a/src/classes/filter-types/numeric/class-tainacan-numeric.php
+++ b/src/classes/filter-types/numeric/class-tainacan-numeric.php
@@ -10,6 +10,7 @@ defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 class Numeric extends Filter_Type {
 
     function __construct(){
+        $this->set_name( __('Numeric', 'tainacan') );
         $this->set_supported_types(['float']);
         $this->set_component('tainacan-filter-numeric');
         $this->set_form_component('tainacan-filter-form-numeric');
diff --git a/src/classes/filter-types/selectbox/Selectbox.vue b/src/classes/filter-types/selectbox/Selectbox.vue
index e8cd648ef..8e265d1dc 100644
--- a/src/classes/filter-types/selectbox/Selectbox.vue
+++ b/src/classes/filter-types/selectbox/Selectbox.vue
@@ -5,7 +5,7 @@
         <b-select
                 v-if="!isLoadingOptions"
                 :value="selected"
-                :aria-labelledby="labelId"
+                :aria-labelledby="'filter-label-id-' + filter.id"
                 @input="onSelect($event)"
                 :placeholder="$i18n.get('label_selectbox_init')"
                 expanded>
@@ -25,80 +25,27 @@
 </template>
 
 <script>
-    import { tainacan as axios, isCancel } from '../../../js/axios/axios';
-    import { filter_type_mixin } from '../filter-types-mixin'
+    import { isCancel } from '../../../js/axios/axios';
+    import { filterTypeMixin, dynamicFilterTypeMixin } from '../filter-types-mixin';
 
     export default {
-        created(){
-            this.collection = ( this.collection_id ) ? this.collection_id : this.filter.collection_id;
-            this.metadatum = ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum.metadatum_id;
-            const vm = this;
-
-            let in_route = '/collection/' + this.collection + '/metadata/' +  this.metadatum;
-
-            if(this.isRepositoryLevel || this.collection == 'filter_in_repository'){
-                in_route = '/metadata/'+ this.metadatum;
-            }
-
-            axios.get(in_route)
-                .then( res => {
-                    let result = res.data;
-                    if( result && result.metadata_type ){
-                        vm.metadatum_object = result;
-                        vm.type = result.metadata_type;
-                        
-                        if (!this.isUsingElasticSearch)
-                            vm.loadOptions();
-                    }
-                })
-                .catch(error => {
-                    this.$console.error(error);
-                });
-            
-            this.$eventBusSearch.$on('removeFromFilterTag', this.cleanSearchFromTags);
-
-            if (this.isUsingElasticSearch) {
-                this.$eventBusSearch.$on('isLoadingItems', isLoading => {
-                    this.isLoadingOptions = isLoading;
-                });
-            }
-        },
-        props: {
-            isRepositoryLevel: Boolean,
-            labelId: String
-        },
+        mixins: [filterTypeMixin, dynamicFilterTypeMixin],
         data(){
             return {
                 options: [],
-                type: '',
-                collection: '',
-                metadatum: ''
+                selected: ''
             }
         },
-        mixins: [filter_type_mixin],
         watch: {
-            selected(value) {
-                if (value) {
-                    this.$eventBusSearch.$emit( 'sendValuesToTags', {
-                        filterId: this.filter.id,
-                        value: value
-                    });
-                }
+            'query.metaquery'() {
+                if (!this.isUsingElasticSearch)
+                    this.loadOptions();
             }
         },
-        computed: {
-            selected() {
-                if ( this.query && this.query.metaquery && Array.isArray( this.query.metaquery ) ) {
-
-                    let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key === this.metadatum );
-                    if ( index >= 0){
-                        let metadata = this.query.metaquery[ index ];
-                        return metadata.value;
-                    }
-                }
-                return undefined;
-            }
-        }, 
+        mounted(){           
+            if (!this.isUsingElasticSearch)
+                this.loadOptions();
+        },
         methods: {
             loadOptions(){
                 // Cancels previous Request
@@ -106,9 +53,10 @@
                     this.getOptionsValuesCancel.cancel('Facet search Canceled.');
 
                 let promise = null;
-                promise = this.getValuesPlainText( this.metadatum, null, this.isRepositoryLevel );
+                promise = this.getValuesPlainText( this.metadatumId, null, this.isRepositoryLevel );
                 promise.request
                     .then(() => {
+                        this.updateSelectedValues();
                     })
                     .catch( error => {
                         if (isCancel(error))
@@ -120,25 +68,34 @@
                 // Search Request Token for cancelling
                 this.getOptionsValuesCancel = promise.source;
             },
-            onSelect(value){
-                //this.selected = value;
+            updateSelectedValues() {
+                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) {
+                        let metadata = this.query.metaquery[ index ];
+                        if (this.selected != metadata.value) {
+                            this.selected = metadata.value;
+                        }
+                    } else {
+                        this.selected = '';
+                    }
+                } else {
+                    this.selected = '';
+                }
+
+                this.$emit('sendValuesToTags', { label: this.selected, value: this.selected })
+            },
+            onSelect(value) {
                 this.$emit('input', {
                     filter: 'selectbox',
-                    metadatum_id: this.metadatum,
-                    collection_id: ( this.collection_id ) ? this.collection_id : this.filter.collection_id,
-                    value: ( value ) ? value : ''
+                    metadatum_id: this.metadatumId,
+                    collection_id: this.collectionId,
+                    value: value
                 });
-            },
-            cleanSearchFromTags(filterTag) {
-                if (filterTag.filterId == this.filter.id)
-                    this.onSelect();
-            }
-        },
-        beforeDestroy() {
-            this.$eventBusSearch.$off('removeFromFilterTag', this.cleanSearchFromTags);
 
-            if (this.isUsingElasticSearch)
-                this.$eventBusSearch.$off('isLoadingItems');
+                this.updateSelectedValues();
+            }
         }
     }
 </script>
diff --git a/src/classes/filter-types/selectbox/class-tainacan-selectbox.php b/src/classes/filter-types/selectbox/class-tainacan-selectbox.php
index a9cc6bbc3..57cf4002b 100644
--- a/src/classes/filter-types/selectbox/class-tainacan-selectbox.php
+++ b/src/classes/filter-types/selectbox/class-tainacan-selectbox.php
@@ -9,6 +9,7 @@ defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 class Selectbox extends Filter_Type {
 
     function __construct(){
+        $this->set_name( __('Select Box', 'tainacan') );
         $this->set_supported_types(['string', 'long_string']);
         $this->set_component('tainacan-filter-selectbox');
         $this->set_use_max_options(false);
diff --git a/src/classes/filter-types/taginput/Taginput.vue b/src/classes/filter-types/taginput/Taginput.vue
index c48f6d3c7..1b51c3469 100644
--- a/src/classes/filter-types/taginput/Taginput.vue
+++ b/src/classes/filter-types/taginput/Taginput.vue
@@ -11,10 +11,11 @@
                 :remove-on-keys="[]"
                 field="label"
                 attached
+                @input="onSelect"
                 @typing="search"
                 :aria-close-label="$i18n.get('remove_value')"
-                :aria-labelledby="labelId"
-                :placeholder="(type == 'Tainacan\\Metadata_Types\\Relationship') ? $i18n.get('info_type_to_search_items') : $i18n.get('info_type_to_add_metadata')">
+                :aria-labelledby="'filter-label-id-' + filter.id"
+                :placeholder="(metadatumType == 'Tainacan\\Metadata_Types\\Relationship') ? $i18n.get('info_type_to_add_items') : $i18n.get('info_type_to_add_metadata')">
             <template slot-scope="props">
                 <div class="media">
                     <div
@@ -44,78 +45,36 @@
 
 <script>
     import { tainacan as axios, isCancel } from '../../../js/axios/axios';
-    import { filter_type_mixin } from '../filter-types-mixin'
+    import { filterTypeMixin, dynamicFilterTypeMixin } from '../filter-types-mixin';
     import qs from 'qs';
 
     export default {
-        created(){
-            this.collection = ( this.collection_id ) ? this.collection_id : this.filter.collection_id;
-            this.metadatum = ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum.metadatum_id;
-            const vm = this;
-
-            let in_route = '/collection/' + this.collection + '/metadata/' +  this.metadatum;
-
-            if(this.isRepositoryLevel || this.collection == 'filter_in_repository'){
-                in_route = '/metadata/'+ this.metadatum + '?nopaging=1';
-            }
-
-            axios.get(in_route)
-                .then( res => {
-                    let result = res.data;
-                    if( result && result.metadata_type ){
-                        vm.metadatum_object = result;
-                        vm.type = result.metadata_type;
-                        vm.selectedValues();
-                    }
-                })
-                .catch(error => {
-                    this.$console.log(error);
-                });
-            
-            this.$eventBusSearch.$on('removeFromFilterTag', this.cleanSearchFromTags);
-        },
+        mixins: [filterTypeMixin, dynamicFilterTypeMixin],
         data(){
             return {
                 results:'',
                 selected:[],
                 options: [],
-                type: '',
-                collection: '',
-                metadatum: '',
-                metadatum_object: {}
+                relatedCollectionId: ''
             }
         },
-        props: {
-            isRepositoryLevel: Boolean,
-            labelId: String
-        },
-        mixins: [filter_type_mixin],
         watch: {
-            selected( value ){
-                this.selected = value;
-
-                let values = [];
-                let labels = [];
-                if( this.selected.length > 0 ){
-                    for(let val of this.selected){
-                        values.push( val.value );
-                        labels.push( val.label );
-                    }
-                }
-                this.$emit('input', {
-                    filter: 'taginput',
-                    compare: 'IN',
-                    metadatum_id: this.metadatum,
-                    collection_id: ( this.collection_id ) ? this.collection_id : this.filter.collection_id,
-                    value: values
-                });
-
-                this.$eventBusSearch.$emit( 'sendValuesToTags', {
-                    filterId: this.filter.id,
-                    value: labels
-                });
+            'query.metaquery'() {
+                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();
+        },
         methods: {
             search: _.debounce( function(query) {
                 let promise = null;
@@ -129,10 +88,10 @@
                 if (this.getOptionsValuesCancel != undefined)
                     this.getOptionsValuesCancel.cancel('Facet search Canceled.');
 
-                if ( this.type === 'Tainacan\\Metadata_Types\\Relationship' )
+                if ( this.metadatumType === 'Tainacan\\Metadata_Types\\Relationship' )
                     promise = this.getValuesRelationship( query, this.isRepositoryLevel, valuesToIgnore );
                 else
-                    promise = this.getValuesPlainText( this.metadatum, query, this.isRepositoryLevel, valuesToIgnore );
+                    promise = this.getValuesPlainText( this.metadatumId, query, this.isRepositoryLevel, valuesToIgnore );
 
                 promise.request
                     .catch( error => {
@@ -146,75 +105,68 @@
                 this.getOptionsValuesCancel = promise.source;
                 
             }, 500),
-            selectedValues(){
-                const instance = this;
+            updateSelectedValues() {
+
                 if ( !this.query || !this.query.metaquery || !Array.isArray( this.query.metaquery ) )
                     return false;
 
-                let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key == this.metadatum );
-                if ( index >= 0){
+                let index = this.query.metaquery.findIndex(newMetadatum => newMetadatum.key == this.metadatumId );
+                if (index >= 0) {
                     let metadata = this.query.metaquery[ index ];
-                    let collectionTarget = ( this.metadatum_object && this.metadatum_object.metadata_type_options.collection_id ) ?
-                        this.metadatum_object.metadata_type_options.collection_id : this.collection_id;
 
+                    if ( this.metadatumType === 'Tainacan\\Metadata_Types\\Relationship' ) {
+                        let query = qs.stringify({ postin: metadata.value, fetch_only: 'title,thumbnail', fetch_only_meta: '' });
+                        let endpoint = '/items/';
 
-                    if ( this.type === 'Tainacan\\Metadata_Types\\Relationship' ) {
-                        let query = qs.stringify({ postin: metadata.value  });
+                        if (this.relatedCollectionId != '')
+                            endpoint = '/collection/' + this.relatedCollectionId + endpoint; 
 
-                        axios.get('/collection/' + collectionTarget + '/items?' + query)
+                        axios.get(endpoint + '?' + query)
                             .then( res => {
                                 if (res.data.items) {
-                                    for (let item of res.data) {
-                                        instance.selected.push({ label: item.title, value: item.id, img: item.thumbnail.thumbnail[0] });
+                                    this.selected = [];
+                                    for (let item of res.data.items) {
+                                        let existingItem = this.selected.findIndex((anItem) => item.id == anItem.id);
+                                        if (existingItem < 0) {
+                                            this.selected.push({ 
+                                                label: item.title, 
+                                                value: item.id, 
+                                                img: item.thumbnail && item.thumbnail.thumbnail && item.thumbnail.thumbnail[0] ? item.thumbnail.thumbnail[0] : null 
+                                            });
+                                        }
                                     }
+                                    this.$emit( 'sendValuesToTags', { 
+                                        label: this.selected.map((option) => option.label), 
+                                        value: this.selected.map((option) => option.value)
+                                    });
                                 }
                             })
                             .catch(error => {
                                 this.$console.log(error);
                             });
                     } else {
-                        for (let item of metadata.value) {
-                            instance.selected.push({ label: item, value: item, img: '' });
-                        }
+                        this.selected = [];
+                        for (let item of metadata.value)
+                            this.selected.push({ label: item, value: item, img: null });
+                        
+                        this.$emit( 'sendValuesToTags', { 
+                            label: this.selected.map((option) => option.label), 
+                            value: this.selected.map((option) => option.value)
+                        });
                     }
                 } else {
-                    return false;
+                    this.selected = [];
                 }
             },
-            cleanSearchFromTags(filterTag) {
-                               
-                if (filterTag.filterId == this.filter.id) {
-
-                    let selectedIndex = this.selected.findIndex(option => option.label == filterTag.singleValue);
-                    if (selectedIndex >= 0) {
-
-                        this.selected.splice(selectedIndex, 1);
-
-                        let values = [];
-                        let labels = [];  
-                        for(let val of this.selected){
-                            values.push( val.value );
-                            labels.push( val.label );
-                        }
-                        
-                        this.$emit('input', {
-                            filter: 'taginput',
-                            compare: 'IN',
-                            metadatum_id: this.metadatum,
-                            collection_id: ( this.collection_id ) ? this.collection_id : this.filter.collection_id,
-                            value: values
-                        });
-
-                        this.$eventBusSearch.$emit( 'sendValuesToTags', {
-                            filterId: this.filter.id,
-                            value: labels
-                        });
-                    }
-                }
+            onSelect() {
+                this.$emit('input', {
+                    filter: 'taginput',
+                    compare: 'IN',
+                    metadatum_id: this.metadatumId,
+                    collection_id: this.collectionId,
+                    value: this.selected.map((option) => option.value)
+                });
             }
-        },
-        beforeDestroy() {
-            this.$eventBusSearch.$off('removeFromFilterTag', this.cleanSearchFromTags);
         }
     }
 </script>
\ No newline at end of file
diff --git a/src/classes/filter-types/taginput/class-tainacan-taginput.php b/src/classes/filter-types/taginput/class-tainacan-taginput.php
index 518c5dd03..086a3b5ea 100644
--- a/src/classes/filter-types/taginput/class-tainacan-taginput.php
+++ b/src/classes/filter-types/taginput/class-tainacan-taginput.php
@@ -9,6 +9,7 @@ defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 class Taginput extends Filter_Type {
 
     function __construct(){
+        $this->set_name( __('Tag Input', 'tainacan') );
         $this->set_supported_types(['string','long_string','item']);
         $this->set_component('tainacan-filter-taginput');
         $this->set_use_max_options(false);
diff --git a/src/classes/filter-types/tainacan-filter-item.vue b/src/classes/filter-types/tainacan-filter-item.vue
index 69593a138..edaae5fb3 100644
--- a/src/classes/filter-types/tainacan-filter-item.vue
+++ b/src/classes/filter-types/tainacan-filter-item.vue
@@ -1,8 +1,6 @@
 <template>
     <b-field
-            class="filter-item-forms"
-            :message="getErrorMessage"
-            :type="filterTypeMessage">
+            class="filter-item-forms">
         <b-collapse
                 class="show" 
                 :open.sync="open"
@@ -33,62 +31,59 @@
                 </span>
                 <span class="collapse-label">{{ filter.name }}</span>
             </button>
-            <div
-                    :id="'filter-input-id-' + filter.id">
+            <div :id="'filter-input-id-' + filter.id">
                 <component
-                        :label-id="'filter-label-id-' + filter.id"
                         :is="filter.filter_type_object.component"
                         :filter="filter"
                         :query="query"
                         :is-repository-level="isRepositoryLevel"
-                        @input="listen( $event )"/>
+                        :is-loading-items.sync="isLoadingItems"
+                        @input="onInput"
+                        @sendValuesToTags="onSendValuesToTags"/>
             </div>
         </b-collapse>
     </b-field>
 </template>
 
 <script>
-    import { mapActions } from 'vuex';
-
     export default {
         name: 'TainacanFilterItem',
         props: {
             filter: Object,
             query: Object,
             isRepositoryLevel: Boolean,
-            open: true,
+            open: true
         },
-        data(){
+        data() {
             return {
-                inputs: [],
-                filterTypeMessage:''
+                isLoadingItems: Boolean,
+                isUsingElasticSearch: tainacan_plugin.wp_elasticpress == "1" ? true : false
             }
         },
-        computed: {
-            getErrorMessage() {
-                let msg = '';
-                let errors = this.$eventBusSearch.getErrors( this.filter.id );
-                if ( errors) {
-                    this.setFilterTypeMessage('is-danger');
-                    for (let index in errors) {
-                        msg += errors[index] + '\n';
-                    }
-                } else {
-                    this.setFilterTypeMessage('');
-                }
-                return msg;
+        mounted() {
+            if (this.isUsingElasticSearch) {
+                this.$eventBusSearch.$on('isLoadingItems', isLoadingItems => {
+                    this.isLoadingOptions = isLoadingItems;
+                });
             }
         },
         methods: {
-            ...mapActions('search', [
-                'setPage'
-            ]),
-            listen( inputEvent ){
-                this.$eventBusSearch.$emit( 'input', ( inputEvent.metadatum_id ) ?  inputEvent :  inputEvent.detail[0] );
+            onInput(inputEvent) {
+                this.$eventBusSearch.$emit('input', inputEvent);
             },
-            setFilterTypeMessage( message ){
-                this.filterTypeMessage = message;
+            onSendValuesToTags($event) {
+                this.$eventBusSearch.$emit('sendValuesToTags', { 
+                    filterId: this.filter.id,
+                    label: $event.label,
+                    value: $event.value,
+                    taxonomy: $event.taxonomy,
+                    metadatumId: this.filter.metadatum_id
+                });
             }
+        },    
+        beforeDestroy() {
+            if (this.isUsingElasticSearch)
+                this.$eventBusSearch.$off('isLoadingItems');
         }
     }
 </script>
@@ -98,185 +93,6 @@
 
     .filter-item-forms {
 
-        .datepicker {
-            width: 100%;
-
-            .datepicker-content {
-                height: auto;
-                
-                input {
-                    height: 30px;
-                }
-            }
-
-            .dropdown-menu {
-                background: transparent;
-                border: none;
-                
-                .dropdown-item {
-                    background-color: white !important;
-                }
-            }
-
-            .datepicker-header {
-                .pagination {
-                    a>span>i:before {
-                        display: inline-block;
-                        font: normal normal normal 20px/1 "TainacanIcons";
-                        font-size: inherit;
-                        text-rendering: auto;
-                        vertical-align: middle;
-                        line-height: inherit;
-                        -webkit-font-smoothing: antialiased;
-                        -moz-osx-font-smoothing: grayscale;
-                        color: $secondary;
-                    }
-
-                    .pagination-previous {
-                        border: none;
-                        flex-grow: 0;
-
-                        &>span>i:before {
-                            content: 'previous';
-                            font-size: 20px;
-                        }
-                    }
-
-                    .pagination-next {
-                        border: none;
-                        flex-grow: 0;
-
-                        &>span>i:before {
-                            content: 'next';
-                            font-size: 20px;
-                        }
-                    }
-                }
-            }
-
-            .datepicker-table {
-                margin-bottom: 0px;
-                
-                .datepicker-cell {
-                    border: none !important;
-                    padding: 0.5rem 0.75rem !important;
-                }
-                .datepicker-cell.is-today,
-                .datepicker-cell.is-today:hover {
-                    color: $gray4 !important;
-                    background-color: $turquoise1;
-                }
-                .datepicker-cell.is-selected,
-                .datepicker-cell.is-selected:hover {
-                    color: white !important;
-                    background-color: $turquoise5 !important;
-                }
-
-                .datepicker-months {
-                    width: auto;
-
-                    .datepicker-cell {
-                        height: 2rem;
-                        width: 50%;
-                        padding: 0.3rem 0.25rem !important;
-                        text-overflow: ellipsis;
-                        overflow: hidden;
-                        display: block;
-                    }
-                }
-            }
-
-            @media screen and (min-width: 1024px) {
-
-                .datepicker-header {
-                    margin-bottom: 0.5rem;
-                    padding-top: 0.15rem;
-                    padding-bottom: 0.5rem;
-                    
-                    .pagination {
-                        flex-wrap: wrap;
-                    
-                        .pagination-list {
-                            margin-bottom: 0.5rem;
-
-                            .field.has-addons {
-                                width: 100% !important;
-
-                                .control {
-                                    height: 24px !important;
-                                    width: 74px !important;
-
-                                    .select {
-                                        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;
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                        .pagination-previous {
-                            margin: 0;
-                            height: 24px;
-                            padding: 0;
-                            font-size: 0.75rem; 
-                            order: 3;
-                        }
-
-                        .pagination-next {
-                            margin: 0;
-                            height: 24px;
-                            padding: 0;
-                            font-size: 0.75rem;
-                        }
-                    }
-                }
-
-                .dropdown-item {
-                    padding: 0.8rem !important;
-                }
-
-                .dropdown-menu {
-                    min-width: 100% !important;
-                    max-width: 165px !important;
-                }
-
-
-                .datepicker-table {
-                    margin-bottom: 0px;
-                    
-                    .datepicker-cell {
-                        padding: 0.15rem 0.175rem !important;
-                    }
-                }
-                
-                .select {
-                    select {
-                        display: unset;
-                        overflow: hidden;
-                        white-space: nowrap;
-                        text-overflow: ellipsis;
-                    }
-                }
-
-                .dropdown-content {
-                    max-width: 165px !important;
-                    border-radius: 2px !important;
-                    padding: 0px;
-                    max-height: inherit !important;
-                }
-            }
-        }
-
         .collapse-trigger {
             margin-left: -5px;
             .icon {
@@ -386,5 +202,36 @@
             margin-right: 2px;
         }
 
+        .datepicker {
+            @media screen and (min-width: 768px) {
+
+                .datepicker-header {
+
+                    .dropdown-menu {
+                        max-width: 165px !important;
+                    }
+                    .pagination .pagination-list .control {
+                        width: 77px !important; 
+
+                        .select {
+                            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;
+                            }
+                        }
+                    }
+                }
+                .datepicker-cell {
+                    padding: 0.15rem 0.175rem !important;
+                }
+            }
+        }
     }
 </style>
\ No newline at end of file
diff --git a/src/classes/filter-types/taxonomy/Checkbox.vue b/src/classes/filter-types/taxonomy/Checkbox.vue
index 490b4239a..432794f97 100644
--- a/src/classes/filter-types/taxonomy/Checkbox.vue
+++ b/src/classes/filter-types/taxonomy/Checkbox.vue
@@ -1,17 +1,17 @@
 <template>
     <div 
-            :style="{ 'height': isLoading ? (Number(filter.max_options)*28) + 'px' : 'auto' }"
-            :class="{ 'skeleton': isLoading }"
+            :style="{ 'height': isLoadingOptions ? (Number(filter.max_options)*28) + 'px' : 'auto' }"
+            :class="{ 'skeleton': isLoadingOptions }"
             class="block">
         <!-- <span 
-                v-if="isLoading"
+                v-if="isLoadingOptions"
                 style="width: 100%"
                 class="icon has-text-centered loading-icon">
             <div class="control has-icons-right is-loading is-clearfix" />
         </span> -->
         <div
                 v-for="(option, index) in options.slice(0, filter.max_options)"
-                v-if="!isLoading"
+                v-if="!isLoadingOptions"
                 :key="index"
                 :value="index"
                 class="control">
@@ -38,7 +38,7 @@
             </button>
         </div>
         <p 
-                v-if="!isLoading && options.length != undefined && options.length <= 0"
+                v-if="!isLoadingOptions && options.length != undefined && options.length <= 0"
                 class="no-options-placeholder">
             {{ $i18n.get('info_no_options_avialable_filtering') }}
         </p>
@@ -50,73 +50,54 @@
     import { tainacan as axios, CancelToken, isCancel } from '../../../js/axios/axios';
     import { mapGetters } from 'vuex';
     import CheckboxRadioModal from '../../../admin/components/other/checkbox-radio-modal.vue';
-
+    import { filterTypeMixin, dynamicFilterTypeMixin } from '../filter-types-mixin';
+    
     export default {
-        created(){
-            this.collection = ( this.collection_id ) ? this.collection_id : this.filter.collection_id;
-            this.metadatum = ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum.metadatum_id ;
-            this.type = this.filter.metadatum.metadata_type;
-
-            this.loadOptions();
-            this.$eventBusSearch.$on('removeFromFilterTag', this.cleanSearchFromTag);
-
-            if (this.isUsingElasticSearch)
-                this.$eventBusSearch.$on('isLoadingItems', this.updatesIsLoading);
-            
-        },    
-        mounted(){
-            // We listen to event, but reload event if hasFiltered is negative, as 
-            // an empty query also demands filters reloading.
-            this.$eventBusSearch.$on('hasFiltered', () => {
-                if (typeof this.loadOptions == "function")
-                    this.loadOptions(true);
-            });
-        },        
+        mixins: [ filterTypeMixin, dynamicFilterTypeMixin ],   
         data(){
             return {
-                isLoading: true,
+                isLoadingOptions: true,
                 options: [],
-                type: '',
-                collection: '',
-                metadatum: '',
                 selected: [],
                 taxonomy: '',
-                taxonomy_id: Number,
-                getOptionsValuesCancel: undefined,
-                isUsingElasticSearch: tainacan_plugin.wp_elasticpress == "1" ? true : false
-            }
-        },
-        props: {
-            filter: {
-                type: Object // concentrate all attributes metadatum id and type
-            },
-            metadatum_id: [Number], // not required, but overrides the filter metadatum id if is set
-            collection_id: [Number], // not required, but overrides the filter metadatum id if is set
-            labelId: '',
-            query: {
-                type: Object // concentrate all attributes metadatum id and type
+                taxonomyId: ''
             }
         },
         watch: {
-            selected: function(){
-                //this.selected = val;
-                this.onSelect();
+            selected(newVal, oldVal) {
+                const isEqual = (newVal.length == oldVal.length) && newVal.every((element, index) => {
+                    return element === oldVal[index]; 
+                });
+
+                if (!isEqual)
+                    this.onSelect();
             },
             facetsFromItemSearch() {
                 if (this.isUsingElasticSearch)
                     this.loadOptions();
+            },
+            'query.taxquery'() {
+                this.loadOptions();
             }
         },    
-        computed: {
-            facetsFromItemSearch() {
-                return this.getFacets();
-            }
+        created() {
+            if (this.filter.metadatum && 
+                this.filter.metadatum.metadata_type_object && 
+                this.filter.metadatum.metadata_type_object.options &&
+                this.filter.metadatum.metadata_type_object.options.taxonomy &&
+                this.filter.metadatum.metadata_type_object.options.taxonomy_id) {
+                    this.taxonomyId = this.filter.metadatum.metadata_type_object.options.taxonomy_id;
+                    this.taxonomy = this.filter.metadatum.metadata_type_object.options.taxonomy;
+                }
         },
+        mounted(){
+            this.loadOptions();
+        }, 
         methods: {
             ...mapGetters('search', [
                 'getFacets'
             ]),
-            loadOptions(skipSelected) {
+            loadOptions() {
                 if (!this.isUsingElasticSearch) {
                     let promise = null;
                     const source = CancelToken.source();
@@ -125,15 +106,15 @@
                     if (this.getOptionsValuesCancel != undefined)
                         this.getOptionsValuesCancel.cancel('Facet search Canceled.');
 
-                    this.isLoading = true;
+                    this.isLoadingOptions = true;
                     let query_items = { 'current_query': this.query };
 
                     let route = '';
                     
-                    if(this.collection == 'filter_in_repository')
-                        route = `/facets/${this.metadatum}?getSelected=1&order=asc&parent=0&number=${this.filter.max_options}&` + qs.stringify(query_items);
+                    if (this.collectionId == 'default')
+                        route = `/facets/${this.metadatumId}?getSelected=1&order=asc&parent=0&number=${this.filter.max_options}&` + qs.stringify(query_items);
                     else
-                        route = `/collection/${this.collection}/facets/${this.metadatum}?getSelected=1&order=asc&parent=0&number=${this.filter.max_options}&` + qs.stringify(query_items);
+                        route = `/collection/${this.collectionId}/facets/${this.metadatumId}?getSelected=1&order=asc&parent=0&number=${this.filter.max_options}&` + qs.stringify(query_items);
 
                     this.options = [];
 
@@ -152,15 +133,15 @@
                     });
                     promise.request
                         .then((res) => {
-                            this.prepareOptionsForTaxonomy(res.data.values ? res.data.values : res.data, skipSelected);
-                            this.isLoading = false;
+                            this.prepareOptionsForTaxonomy(res.data.values ? res.data.values : res.data);
+                            this.isLoadingOptions = false;
                         })
                         .catch( error => {
                             if (isCancel(error)) {
                                 this.$console.log('Request canceled: ' + error.message);
                             } else {
                                 this.$console.log('Error on facets request: ', error);
-                                this.isLoading = false;
+                                this.isLoadingOptions = false;
                             }
                         });
                     
@@ -172,19 +153,18 @@
                     for (const facet in this.facetsFromItemSearch) {
                         if (facet == this.filter.id) {
                             if (Array.isArray(this.facetsFromItemSearch[facet]))
-                                this.prepareOptionsForTaxonomy(this.facetsFromItemSearch[facet], skipSelected);
+                                this.prepareOptionsForTaxonomy(this.facetsFromItemSearch[facet]);
                             else
-                                this.prepareOptionsForTaxonomy(Object.values(this.facetsFromItemSearch[facet]), skipSelected);
+                                this.prepareOptionsForTaxonomy(Object.values(this.facetsFromItemSearch[facet]));
                         }    
                     }
-
                 }
             },
-            selectedValues(){
+            updateSelectedValues(){
                 
                 if ( !this.query || !this.query.taxquery || !Array.isArray( this.query.taxquery ) )
                     return false;
-                
+                    
                 let index = this.query.taxquery.findIndex(newMetadatum => newMetadatum.taxonomy == this.taxonomy );
                 if ( index >= 0){
                     let metadata = this.query.taxquery[ index ];
@@ -193,17 +173,7 @@
                     this.selected = [];
                     return false;
                 }
-            },
-            onSelect(){
-                this.$emit('input', {
-                    filter: 'checkbox',
-                    taxonomy: this.taxonomy,
-                    compare: 'IN',
-                    metadatum_id: this.metadatum,
-                    collection_id: this.collection,
-                    terms: this.selected
-                });
-                
+
                 let onlyLabels = [];
 
                 for (let selected of this.selected) {
@@ -224,10 +194,10 @@
 
                         // let route = '';
                         
-                        // if (this.collection == 'filter_in_repository')
-                        //     route = '/facets/' + this.metadatum +`?term_id=${selected}&fetch_only=name,id`;
+                        // if (this.collectionId == 'default')
+                        //     route = '/facets/' + this.metadatumId +`?term_id=${selected}&fetch_only=name,id`;
                         // else
-                        //     route = '/collection/'+ this.collection +'/facets/' + this.metadatum +`?term_id=${selected}&fetch_only=name,id`;
+                        //     route = '/collection/'+ this.collectionId +'/facets/' + this.metadatumId +`?term_id=${selected}&fetch_only=name,id`;
                         
                         // axios.get(route)
                         //     .then( res => {
@@ -260,9 +230,16 @@
                     }
                 }
 
-                this.$eventBusSearch.$emit("sendValuesToTags", {
-                    filterId: this.filter.id,
-                    value: onlyLabels
+                this.$emit('sendValuesToTags', { label: onlyLabels, taxonomy: this.taxonomy, value: this.selected });
+            },
+            onSelect(){
+                this.$emit('input', {
+                    filter: 'checkbox',
+                    taxonomy: this.taxonomy,
+                    compare: 'IN',
+                    metadatum_id: this.metadatumId,
+                    collection_id: this.collectionId,
+                    terms: this.selected
                 });
             },
             openCheckboxModal(parent) {
@@ -272,11 +249,11 @@
                     props: {
                         parent: parent,
                         filter: this.filter,
-                        taxonomy_id: this.taxonomy_id,
+                        taxonomy_id: this.taxonomyId,
                         selected: this.selected,
-                        metadatum_id: this.metadatum,
+                        metadatumId: this.metadatumId,
                         taxonomy: this.taxonomy,
-                        collection_id: this.collection,
+                        collectionId: this.collectionId,
                         isTaxonomy: true,
                         query: this.query
                     },                    
@@ -285,46 +262,11 @@
                             this.loadOptions();
                         } 
                     },
-                    width: 'calc(100% - 8.333333333%)',
+                    width: 'calc(100% - 16.6666%)',
+                    trapFocus: true
                 });
             },
-            cleanSearchFromTag(filterTag) {
-                if (filterTag.filterId == this.filter.id) {
-
-                    let selectedOption = this.options.find(option => option.label == filterTag.singleValue);
-
-                    if (selectedOption) {
-                    
-                        let selectedIndex = this.selected.findIndex(option => option == selectedOption.value);
-                        if (selectedIndex >= 0) {
-
-                            this.selected.splice(selectedIndex, 1); 
-
-                            this.$emit('input', {
-                                filter: 'checkbox',
-                                compare: 'IN',
-                                taxonomy: this.taxonomy,
-                                metadatum_id: this.metadatum,
-                                collection_id: ( this.collection_id ) ? this.collection_id : this.filter.collection_id,
-                                terms: this.selected
-                            });
-
-                            this.$eventBusSearch.$emit( 'sendValuesToTags', {
-                                filterId: this.filter.id,
-                                value: this.selected
-                            });
-
-                            this.selectedValues();
-                        }
-                    }
-                }
-            },
-            prepareOptionsForTaxonomy(items, skipSelected) {
-
-                if (items[0] != undefined) {
-                    this.taxonomy = items[0].taxonomy;
-                    this.taxonomy_id = items[0].taxonomy_id;
-                }
+            prepareOptionsForTaxonomy(items) {
 
                 this.options = [];
                 this.options = items.slice(); // copy array.
@@ -349,24 +291,17 @@
                         }
                     }
                 }
-
-                if (skipSelected == undefined || skipSelected == false) {
-                    this.selectedValues();
-                }
+                this.updateSelectedValues();
             },
-            updatesIsLoading(isLoading) {
-                this.isLoading = isLoading;
+            updatesIsLoading(isLoadingOptions) {
+                this.isLoadingOptions = isLoadingOptions;
             }
         },
         beforeDestroy() {
-            this.$eventBusSearch.$off('removeFromFilterTag', this.cleanSearchFromTags);
             
             // Cancels previous Request
             if (this.getOptionsValuesCancel != undefined)
                 this.getOptionsValuesCancel.cancel('Facet search Canceled.');
- 
-            if (this.isUsingElasticSearch)
-                this.$eventBusSearch.$off('isLoadingItems', this.updatesIsLoading);
         }
     }
 </script>
diff --git a/src/classes/filter-types/taxonomy/Taginput.vue b/src/classes/filter-types/taxonomy/Taginput.vue
index 1a5455503..848f28021 100644
--- a/src/classes/filter-types/taxonomy/Taginput.vue
+++ b/src/classes/filter-types/taxonomy/Taginput.vue
@@ -6,15 +6,16 @@
                 v-model="selected"
                 :data="options"
                 autocomplete
-                :loading="isLoading"
+                :loading="isLoadingOptions"
                 expanded
                 :remove-on-keys="[]"
                 field="label"
                 attached
                 :aria-close-label="$i18n.get('remove_value')"
-                :aria-labelledby="labelId"
+                :aria-labelledby="'filter-label-id-' + filter.id"
                 :class="{'has-selected': selected != undefined && selected != []}"
                 @typing="search"
+                @input="onSelect"
                 :placeholder="$i18n.get('info_type_to_add_terms')">
             <template slot-scope="props">
                 <div class="media">
@@ -27,7 +28,7 @@
                 </div>
             </template>
             <template 
-                    v-if="!isLoading" 
+                    v-if="!isLoadingOptions" 
                     slot="empty">
                 {{ $i18n.get('info_no_options_found'	) }}
             </template>
@@ -38,82 +39,40 @@
 <script>
     import qs from 'qs';
     import { tainacan as axios } from '../../../js/axios/axios';
-
+    import { filterTypeMixin, dynamicFilterTypeMixin } from '../filter-types-mixin';
+    
     export default {
-        created(){
-            this.collection = ( this.collection_id ) ? this.collection_id : this.filter.collection_id;
-            this.metadatum = ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum.metadatum_id ;
-            this.type = this.filter.metadatum.metadata_type;
-
-            let in_route = '/collection/' + this.collection + '/metadata/' +  this.metadatum;
-
-            if(this.isRepositoryLevel || this.collection == 'filter_in_repository'){
-                in_route = '/metadata/'+ this.metadatum;
+        mixins: [ filterTypeMixin, dynamicFilterTypeMixin ],
+        created() {
+            if (this.filter.metadatum && 
+                this.filter.metadatum.metadata_type_object && 
+                this.filter.metadatum.metadata_type_object.options &&
+                this.filter.metadatum.metadata_type_object.options.taxonomy &&
+                this.filter.metadatum.metadata_type_object.options.taxonomy_id) {
+                    this.taxonomyId = this.filter.metadatum.metadata_type_object.options.taxonomy_id;
+                    this.taxonomy = this.filter.metadatum.metadata_type_object.options.taxonomy;
+                }
+        },
+        watch: {
+            'query.taxquery'() {
+                this.updateSelectedValues();
             }
-
-            axios.get(in_route)
-                .then( res => {
-                    let metadatum = res.data;
-                    this.selectedValues( metadatum.metadata_type_options.taxonomy_id );
-                });
-            
-            this.$eventBusSearch.$on('removeFromFilterTag', this.cleanSearchFromTag);
+        },
+        mounted() {
+            this.updateSelectedValues();
         },
         data(){
             return {
                 results:'',
                 selected:[],
                 options: [],
-                isLoading: false,
-                type: '',
-                collection: '',
-                metadatum: '',
                 taxonomy: '',
-                isUsingElasticSearch: tainacan_plugin.wp_elasticpress == "1" ? true : false
-            }
-        },
-        props: {
-            filter: {
-                type: Object // concentrate all attributes metadatum id and type
-            },
-            metadatum_id: [Number], // not required, but overrides the filter metadatum id if is set
-            collection_id: [Number], // not required, but overrides the filter metadatum id if is set
-            labelId: '',
-            query: {
-                type: Object // concentrate all attributes metadatum id and type
-            },
-            isRepositoryLevel: Boolean,
-        },
-        watch: {
-            selected( value ){
-                this.selected = value;
-
-                let values = [];
-                let labels = [];
-                if( this.selected.length > 0 ){
-                    for(let val of this.selected){
-                        values.push( val.value );
-                        labels.push( val.label );
-                    }
-                }
-                this.$emit('input', {
-                    filter: 'taginput',
-                    compare: 'IN',
-                    taxonomy: this.taxonomy,
-                    metadatum_id: ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum,
-                    collection_id: ( this.collection_id ) ? this.collection_id : this.filter.collection_id,
-                    terms: values
-                });
-
-                this.$eventBusSearch.$emit("sendValuesToTags", {
-                    filterId: this.filter.id,
-                    value: labels
-                });
+                taxonomyId: ''
             }
         },
         methods: {
             search: _.debounce( function(query) {
-                this.isLoading = true;
+                this.isLoadingOptions = true;
                 this.options = [];
                 
                 let query_items = { 
@@ -121,18 +80,16 @@
                     'search': query
                 };
 
-                let endpoint = this.isRepositoryLevel ? '/facets/' + this.metadatum : '/collection/'+ this.collection +'/facets/' + this.metadatum;
+                let endpoint = this.isRepositoryLevel ? '/facets/' + this.metadatumId : '/collection/'+ this.collectionId +'/facets/' + this.metadatumId;
 
                 endpoint += '?order=asc&' + qs.stringify(query_items);
+                
                 let valuesToIgnore = [];
-                for(let val of this.selected){
+                for(let val of this.selected)
                     valuesToIgnore.push( val.value );
-                }
-
+                
                 return axios.get(endpoint).then( res => {
                     for (let term of res.data.values) {   
-                          
-                        this.taxonomy = term.taxonomy;
 
                         if (valuesToIgnore != undefined && valuesToIgnore.length > 0) {
                             let indexToIgnore = valuesToIgnore.findIndex(value => value == term.value);
@@ -155,74 +112,62 @@
                             }
                         }                                       
                     }
-                    this.isLoading = false;
+                    this.isLoadingOptions = false;
                 })
                 .catch(error => {
-                    this.isLoading = false;
+                    this.isLoadingOptions = false;
                     this.$console.log(error);
                 });
             }, 500),
-            selectedValues( taxonomyId ){
+            updateSelectedValues(){
                 if ( !this.query || !this.query.taxquery || !Array.isArray( this.query.taxquery ) )
                     return false;
 
-                this.taxonomy = 'tnc_tax_' + taxonomyId;
+                let index = this.query.taxquery.findIndex(newMetadatum => newMetadatum.taxonomy == this.taxonomy);
 
-                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 = [];
 
-                    for ( let id of metadata.terms ){
-                       this.getTerm( taxonomyId, id );
+                    if (metadata.terms && metadata.terms.length) {
+                        this.getTerms(metadata)
+                            .then(() => {
+                                this.$emit( 'sendValuesToTags', { 
+                                    label: this.selected.map((option) => option.label), 
+                                    value: this.selected.map((option) => option.value),
+                                    taxonomy: this.taxonomy
+                                });
+                            });
                     }
                 } else {
-                    return false;
+                    this.selected = [];
                 }
             },
-            getTerm( taxonomy, id ){
-                //getting a specific value from api, does not need be in fecat api
-                return axios.get('/taxonomy/' + taxonomy + '/terms/' + id + '?order=asc' )
+            onSelect() {
+                this.$emit('input', {
+                    filter: 'taginput',
+                    compare: 'IN',
+                    taxonomy: this.taxonomy,
+                    metadatum_id: this.metadatumId,
+                    collection_id: this.collectionId,
+                    terms: this.selected.map((option) => option.value)
+                });
+            },
+            getTerms(metadata) {
+
+                let params = { 
+                    'include': metadata.terms, 
+                    'order': 'asc'
+                };
+
+                return axios.get('/taxonomy/' + this.taxonomyId + '/terms/?' + qs.stringify(params) )
                     .then( res => {
-                        this.selected.push({ label: res.data.name, value: res.data.id });
+                        this.selected = res.data.map(term => { return { label: term.name, value: term.id } });
                     })
                     .catch(error => {
                         this.$console.log(error);
-                    });
-            },
-            cleanSearchFromTag(filterTag) {
-                               
-                if (filterTag.filterId == this.filter.id) {
-
-                    let selectedIndex = this.selected.findIndex(option => option.label == filterTag.singleValue);
-                    if (selectedIndex >= 0) {
-
-                        this.selected.splice(selectedIndex, 1);
-
-                        let values = [];
-                        let labels = [];
-                        for(let val of this.selected){
-                            values.push( val.value );
-                            labels.push( val.label );
-                        }
-                        
-                        this.$emit('input', {
-                            filter: 'taginput',
-                            compare: 'IN',
-                            taxonomy: this.taxonomy,
-                            metadatum_id: ( this.metadatum_id ) ? this.metadatum_id : this.filter.metadatum,
-                            collection_id: ( this.collection_id ) ? this.collection_id : this.filter.collection_id,
-                            terms: values
-                        });
-                        this.$eventBusSearch.$emit( 'sendValuesToTags', {
-                            filterId: this.filter.id,
-                            value: labels
-                        });
-                   }
-                }
+                    })
             }
-        },
-        beforeDestroy() {
-            this.$eventBusSearch.$off('removeFromFilterTag', this.cleanSearchFromTags);
         }
     }
 </script>
diff --git a/src/classes/filter-types/taxonomy/class-tainacan-taxonomycheckbox.php b/src/classes/filter-types/taxonomy/class-tainacan-taxonomycheckbox.php
index 9070a8c42..b327ca54a 100644
--- a/src/classes/filter-types/taxonomy/class-tainacan-taxonomycheckbox.php
+++ b/src/classes/filter-types/taxonomy/class-tainacan-taxonomycheckbox.php
@@ -9,6 +9,7 @@ defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 class TaxonomyCheckbox extends Filter_Type {
 
     function __construct(){
+        $this->set_name( __('Taxonomy Checkbox List', 'tainacan') );
         $this->set_supported_types(['term']);
         $this->set_component('tainacan-filter-taxonomy-checkbox');
         $this->set_preview_template('
diff --git a/src/classes/filter-types/taxonomy/class-tainacan-taxonomytaginput.php b/src/classes/filter-types/taxonomy/class-tainacan-taxonomytaginput.php
index 158751856..0be31c430 100644
--- a/src/classes/filter-types/taxonomy/class-tainacan-taxonomytaginput.php
+++ b/src/classes/filter-types/taxonomy/class-tainacan-taxonomytaginput.php
@@ -9,6 +9,7 @@ defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 class TaxonomyTaginput extends Filter_Type {
 
     function __construct(){
+        $this->set_name( __('Taxonomy Tag Input', 'tainacan') );
         $this->set_supported_types(['term']);
         $this->set_component('tainacan-filter-taxonomy-taginput');
         $this->set_use_max_options(false);
diff --git a/src/classes/libs/wp-async-request.php b/src/classes/libs/wp-async-request.php
index f1bef8344..42f6d9ac0 100644
--- a/src/classes/libs/wp-async-request.php
+++ b/src/classes/libs/wp-async-request.php
@@ -5,14 +5,14 @@
  * @package WP-Background-Processing
  */
 
-if ( ! class_exists( 'WP_Async_Request' ) ) {
+//if ( ! class_exists( 'WP_Async_Request' ) ) {
 
 	/**
 	 * Abstract WP_Async_Request class.
 	 *
 	 * @abstract
 	 */
-	abstract class WP_Async_Request {
+	abstract class Tainacan_WP_Async_Request {
 
 		/**
 		 * Prefix
@@ -160,4 +160,4 @@ if ( ! class_exists( 'WP_Async_Request' ) ) {
 		abstract protected function handle();
 
 	}
-}
+//}
diff --git a/src/classes/libs/wp-background-process.php b/src/classes/libs/wp-background-process.php
index de8ccc17b..24bcf908f 100644
--- a/src/classes/libs/wp-background-process.php
+++ b/src/classes/libs/wp-background-process.php
@@ -5,7 +5,7 @@
  * @package WP-Background-Processing
  */
 
-if ( ! class_exists( 'WP_Background_Process' ) ) {
+//if ( ! class_exists( 'WP_Background_Process' ) ) {
 
 	/**
 	 * Abstract WP_Background_Process class.
@@ -13,7 +13,7 @@ if ( ! class_exists( 'WP_Background_Process' ) ) {
 	 * @abstract
 	 * @extends WP_Async_Request
 	 */
-	abstract class WP_Background_Process extends WP_Async_Request {
+	abstract class Tainacan_WP_Background_Process extends Tainacan_WP_Async_Request {
 
 		/**
 		 * Action
@@ -554,4 +554,4 @@ if ( ! class_exists( 'WP_Background_Process' ) ) {
 		}
 
 	}
-}
+//}
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/relationship/FormRelationship.vue b/src/classes/metadata-types/relationship/FormRelationship.vue
index 5f3be581c..88e79a6e0 100644
--- a/src/classes/metadata-types/relationship/FormRelationship.vue
+++ b/src/classes/metadata-types/relationship/FormRelationship.vue
@@ -40,17 +40,20 @@
                             :title="$i18n.getHelperTitle('tainacan-relationship', 'search')"
                             :message="$i18n.getHelperMessage('tainacan-relationship', 'search')"/>
                 </label>
-                    <div
-                        v-for="(option, index) in metadata"
-                        :key="index"
-                        class="field">
-                        <b-checkbox
-                                name="metadata_type_relationship[search][]"
-                                v-model="modelSearch"
-                                :native-value="option.id">
+                    <b-select
+                            name="metadata_type_relationship[search]"
+                            v-model="modelSearch">
+                        
+                        <option
+                                v-for="(option, index) in metadata"
+                                :key="index"
+                                :value="option.id"
+                                class="field">
                             {{ option.name }}
-                        </b-checkbox>
-                    </div>
+                        </option>
+                        
+                    </b-select>
+                    
             </b-field>
 
         </transition>
@@ -98,7 +101,7 @@
                 hasMetadata: false,
                 loadingMetadata: false,
                 modelRepeated: 'yes',
-                modelSearch:[],
+                modelSearch:'',
                 collectionType: '',
                 collectionMessage: ''
             }
@@ -111,7 +114,7 @@
                 } else {
                     this.metadata = [];
                     this.hasMetadata = false;
-                    this.modelSearch = [];
+                    this.modelSearch = '';
 
                     this.emitValues();
                 }
@@ -180,7 +183,7 @@
                             this.metadata = [];
 
                             for (let metadatum of metadata) {
-                               if (metadatum.metadata_type !== "Tainacan\\Metadata_Types\\Relationship" && metadatum.metadata_type !== "Tainacan\\Metadata_Types\\Taxonomy") {
+                               if (metadatum.metadata_type !== "Tainacan\\Metadata_Types\\Relationship") {
                                    this.metadata.push( metadatum );
                                    this.hasMetadata = true;
                                    this.checkMetadata()
@@ -207,14 +210,14 @@
 
             },
             checkMetadata(){
-                if( this.value && this.value.search.length > 0 ){
+                if( this.value && this.value.search ){
                     this.modelSearch = this.value.search;
                 } else {
                     try {
                         const json = JSON.parse( this.search );
                         this.modelSearch = json;
                     } catch(e){
-                        this.modelSearch = [];
+                        this.modelSearch = '';
                     }
                 }
             },
diff --git a/src/classes/metadata-types/relationship/Relationship.vue b/src/classes/metadata-types/relationship/Relationship.vue
index 95b42ba9c..b36e5262d 100644
--- a/src/classes/metadata-types/relationship/Relationship.vue
+++ b/src/classes/metadata-types/relationship/Relationship.vue
@@ -26,11 +26,12 @@
             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 )){
                 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')
                     .then( res => {
                         if (res.data.items) {
                             for (let item of res.data.items) {
-                                this.selected.push({ label: item.title, value: item.id, img: item.thumbnail && item.thumbnail['tainacan-small'] && item.thumbnail['tainacan-small'][0] ? item.thumbnail['tainacan-small'][0] : '' });
+                                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] : '' });
                             }
                         }
                     })
@@ -104,7 +105,7 @@
 
                             if (result.items) {
                                 for (let item of result.items) {
-                                    this.options.push({ label: item.title, value: item.id })
+                                    this.options.push({ label: this.getItemLabel(item), value: item.id })
                                 }
                             }
                         })
@@ -115,28 +116,39 @@
                     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) {
+                        label = item.metadata[m].value_as_string;
+                    }
+                }
+                if (label != '' && label != item.title && item.title != '') {
+                    label += ' (' + item.title + ')';
+                } else if (label == '') {
+                    label = item.title;
+                }
+                return label;
+            },
             mountQuery( search ) {
                 let query = [];
 
                 if ( this.metadatum.metadatum.metadata_type_options &&
-                    this.metadatum.metadatum.metadata_type_options.search &&
-                    this.metadatum.metadatum.metadata_type_options.search.length > 0)
+                    this.metadatum.metadatum.metadata_type_options.search)
                 {
                     query['metaquery'] = [];
-                    const metaquery = query['metaquery'];
-                    metaquery['relation'] = 'OR'
-                    for ( let i = 0; i < this.metadatum.metadatum.metadata_type_options.search.length; i++ ){
-                        metaquery[i] = {
-                            key: this.metadatum.metadatum.metadata_type_options.search[i],
-                            value: search,
-                            compare: 'LIKE'
-                        }
+                    
+                    query['metaquery'][0] = {
+                        key: this.metadatum.metadatum.metadata_type_options.search,
+                        value: search,
+                        compare: 'LIKE'
                     }
-                    query['metaquery'] = metaquery;
+                    
                 } else {
                     query['search'] = search;
                 }
                 query['fetch_only'] = 'title,thumbnail';
+                query['fetch_only_meta'] = this.metadatum.metadatum.metadata_type_options.search;
 
                 return query;
             }
diff --git a/src/classes/metadata-types/relationship/class-tainacan-relationship.php b/src/classes/metadata-types/relationship/class-tainacan-relationship.php
index 012d4e862..698d5d88a 100644
--- a/src/classes/metadata-types/relationship/class-tainacan-relationship.php
+++ b/src/classes/metadata-types/relationship/class-tainacan-relationship.php
@@ -56,8 +56,8 @@ class Relationship extends Metadata_Type {
                'description' => __( 'Select the collection to fetch items', 'tainacan' ),
            ],
            'search' => [
-               'title' => __( 'Metadata to search', 'tainacan' ),
-               'description' => __( 'Select the metadata to use as search criteria in the target collection', 'tainacan' ),
+               'title' => __( 'Related Metadatum', 'tainacan' ),
+               'description' => __( 'Select the metadata to use as search criteria in the target collection and as a label when representing the relationship', 'tainacan' ),
            ],
            'repeated' => [
                'title' =>__( 'Allow repeated items', 'tainacan' ),
@@ -93,10 +93,10 @@ class Relationship extends Metadata_Type {
                 'collection_id' => __('The related collection is required','tainacan')
             ];
         }
-		
-		if  ( !is_array($this->get_option('search')) ) {
+		// empty is ok
+		if  ( !empty($this->get_option('search')) && !is_numeric($this->get_option('search')) ) {
 			return [
-                'search' => __('Search option must be an array','tainacan')
+                'search' => __('Search option must be a numeric Metadatum ID','tainacan')
             ];
 		}
 		
@@ -137,7 +137,7 @@ class Relationship extends Metadata_Type {
 						
 						$return .= $prefix;
 						
-						$return .= $item->_toHtml();
+						$return .= $this->get_item_html($item);
 						
 						$return .= $suffix;
 						
@@ -148,8 +148,8 @@ class Relationship extends Metadata_Type {
 					}
 					
 					
-				} catch (Exception $e) {
-					// item not found 
+				} catch (\Exception $e) {
+					// item not found
 				}
 				
 			}
@@ -161,10 +161,10 @@ class Relationship extends Metadata_Type {
 				$item = new \Tainacan\Entities\Item($value);
 				
 				if ( $item instanceof \Tainacan\Entities\Item ) {
-					$return .= $item->_toHtml();
+					$return .= $this->get_item_html($item);
 				}
 				
-			} catch (Exception $e) {
+			} catch (\Exception $e) {
 				// item not found 
 			}
 			
@@ -174,6 +174,46 @@ class Relationship extends Metadata_Type {
 		
 	}
 	
+	private function get_item_html($item) {
+		
+		$return = '';
+		$id = $item->get_id();
+		
+		$search_meta_id = $this->get_option('search');
+		
+		if ( $id && $search_meta_id ) {
+			
+			$link = get_permalink( (int) $id );
+			
+			$search_meta_id = $this->get_option('search');
+			
+			$metadatum = \Tainacan\Repositories\Metadata::get_instance()->fetch((int) $search_meta_id);
+			
+			$label = '';
+			
+			if ($metadatum instanceof \Tainacan\Entities\Metadatum) {
+				$item_meta = new \Tainacan\Entities\Item_Metadata_Entity($item, $metadatum);
+				$label = $item_meta->get_value_as_string();
+			}
+			
+			if ( empty($label) ) {
+				$label = $item->get_title();
+			}
+			
+			if (is_string($link)) {
+				
+				$return = "<a data-linkto='item' data-id='$id' href='$link'>";
+				$return.= $label;
+				$return .= "</a>";
+				
+			}
+			
+		}
+
+		return $return;
+		
+	}
+	
 	/**
 	 * Get related Collection object 
 	 * @return \Tainacan\Entities\Collection|false The Collection object or false
diff --git a/src/classes/metadata-types/tainacan-form-item.vue b/src/classes/metadata-types/tainacan-form-item.vue
index d39c4937f..2500b6dd0 100644
--- a/src/classes/metadata-types/tainacan-form-item.vue
+++ b/src/classes/metadata-types/tainacan-form-item.vue
@@ -28,7 +28,7 @@
                     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>
+            <span class="metadata-type">({{ metadatum.metadatum.metadata_type_object.name }})</span>
             <help-button 
                     :title="metadatum.metadatum.name"
                     :message="metadatum.metadatum.description"/>
@@ -46,7 +46,7 @@
                 <div v-if="metadatum.metadatum.multiple == 'yes'">
                     <div 
                             v-if="index > 0" 
-                            v-for="(input, index) in inputsList " 
+                            v-for="(input, index) in inputs" 
                             :key="index" 
                             class="multiple-inputs">
                         <component 
@@ -98,39 +98,33 @@
     export default {
         name: 'TainacanFormItem',
         props: {
-            metadatum: {
-                type: Object
-            },
-            isCollapsed: true // Metadatum Collapses
+            metadatum: Object,
+            isCollapsed: true
         },
         data(){
             return {
                 inputs: [],
-                metadatumTypeMessage:''
+                metadatumTypeMessage: ''
             }
         },
         computed: {
-            inputsList() {
-                return this.inputs;
-            },
             getErrorMessage() {
-                
-                let msg = '';
+                let errorMessage = '';
                 let errors = eventBus.getErrors(this.metadatum.metadatum.id);
 
-                if ( errors) {
+                if (errors) {
                     this.setMetadatumTypeMessage('is-danger');
                     for (let error of errors) { 
                         for (let index of Object.keys(error)) {
                             // this.$console.log(index);
-                            msg += error[index] + '\n';
+                            errorMessage += error[index] + '\n';
                         }
                     }
                 } else {
                     this.setMetadatumTypeMessage('');
                 }
 
-                return msg;
+                return errorMessage;
             }
         },
         created(){
@@ -142,53 +136,41 @@
             },
             changeValue: _.debounce(function() {
                 
-                if(this.metadatum.value != this.inputs){
+                if (this.metadatum.value != this.inputs) {
 
-                    if(this.inputs.length > 0 && this.inputs[0].value){
-                        let terms = [];
+                    if (this.inputs.length > 0 && this.inputs[0].value) {
+                        let terms = this.inputs.map(term => term.value)
+                        
+                        if (this.metadatum.value instanceof Array){
+                            let equal = [];
 
-                        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);
-                                }
+                            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(eq.length == terms.length && this.metadatum.value.length <= eq.length){
+                            if (equal.length == terms.length && this.metadatum.value.length <= equal.length)
                                 return;
-                            }
-                        }
-                    } else if(this.metadatum.value.constructor.name == 'Object'){
 
-                        if(this.metadatum.value.id == this.inputs){
+                        }
+                    } 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 = [];
+                        
+                    } else if (this.metadatum.value instanceof Array) {                        
+                        let equal = [];
 
-                        for(let meta of this.inputs){
-                            let found = this.metadatum.value.find((element) => {
-                                return meta == element.id;
-                            });
+                        for (let meta of this.inputs) {
+                            let foundIndex = this.metadatum.value.findIndex(element => meta == element.id);
 
-                            if(found){
-                                eq.push(found);
-                            }
+                            if (foundIndex >= 0)
+                                equal.push(this.metadatum.value[foundIndex]);
                         }
 
-                        if(eq.length == this.inputs.length && this.metadatum.value.length <= eq.length){
+                        if (equal.length == this.inputs.length && this.metadatum.value.length <= equal.length)
                             return;
-                        }
                     } 
 
                     eventBus.$emit('input', { item_id: this.metadatum.item.id, metadatum_id: this.metadatum.metadatum.id, values: this.inputs } );
@@ -198,9 +180,9 @@
                 if (this.metadatum.value instanceof Array) {
                     this.inputs = this.metadatum.value.slice(0);
                     
-                    if (this.inputs.length === 0){
+                    if (this.inputs.length === 0)
                         this.inputs.push('');
-                    }
+                    
                 } else {
                     this.metadatum.value == null || this.metadatum.value == undefined ? this.inputs.push('') : this.inputs.push(this.metadatum.value);
                 }
@@ -213,11 +195,11 @@
                 this.inputs.splice(index, 1);
                 this.changeValue();
             },
-            isTextInputComponent( component ){
+            isTextInputComponent(component){
                 let array = ['tainacan-relationship','tainacan-taxonomy'];
                 return !( array.indexOf( component ) >= 0 );
             },
-            setMetadatumTypeMessage( message ){
+            setMetadatumTypeMessage(message){
                 this.metadatumTypeMessage = message;
             }
         }
diff --git a/src/classes/metadata-types/taxonomy/FormTaxonomy.vue b/src/classes/metadata-types/taxonomy/FormTaxonomy.vue
index 2266c0ec2..6f166e211 100644
--- a/src/classes/metadata-types/taxonomy/FormTaxonomy.vue
+++ b/src/classes/metadata-types/taxonomy/FormTaxonomy.vue
@@ -85,10 +85,8 @@
 
 <script>
     import { tainacan as axios }  from '../../../js/axios/axios';
-    import BCheckbox from "../../../../node_modules/buefy/src/components/checkbox/Checkbox.vue";
 
     export default {
-        components: {BCheckbox},
         props: {
             value: [ String, Object, Array ],
             metadatum: [ String, Object ],
diff --git a/src/classes/metadata-types/taxonomy/Taxonomy.vue b/src/classes/metadata-types/taxonomy/Taxonomy.vue
index 7acd3a756..af3a0428a 100644
--- a/src/classes/metadata-types/taxonomy/Taxonomy.vue
+++ b/src/classes/metadata-types/taxonomy/Taxonomy.vue
@@ -12,7 +12,7 @@
                 :options="getOptions(0)"/>
         <a
                 class="add-new-term"
-                v-if="(this.getComponent == 'tainacan-taxonomy-checkbox' || this.getComponent == 'tainacan-taxonomy-radio') &&
+                v-if="(getComponent == 'tainacan-taxonomy-checkbox' || getComponent == 'tainacan-taxonomy-radio') &&
                  terms.length < totalTerms"
                 @click="openCheckboxModal()">
             {{ $i18n.get('label_view_all') }}
@@ -47,14 +47,12 @@
             this.taxonomy_id = 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 condition is temporary, used by bulk edition modal
+            if (this.component != 'tainacan-taxonomy-tag-input' || this.forcedComponentType != 'tainacan-taxonomy-tag-input')
                 this.getTermsFromTaxonomy();
-            }
 
             this.getTermsId();
         },
@@ -80,7 +78,6 @@
         },
         watch: {
             valueComponent( val ){
-                this.valueComponent = val;
                 this.$emit('input', val);
                 this.$emit('blur');
             }
@@ -120,9 +117,9 @@
                         parent: 0,
                         taxonomy_id: this.taxonomy_id,
                         selected: !this.valueComponent ? [] : this.valueComponent,
-                        metadatum_id: this.metadatum.metadatum.id,
+                        metadatumId: this.metadatum.metadatum.id,
                         taxonomy: this.taxonomy,
-                        collection_id: this.collectionId,
+                        collectionId: this.collectionId,
                         isTaxonomy: true,
                         query: '',
                         metadatum: this.metadatum.metadatum,
@@ -134,6 +131,7 @@
                         }
                     },
                     width: 'calc(100% - 8.333333333%)',
+                    trapFocus: true
                 });
             },
             getTermsFromTaxonomy(){
diff --git a/src/classes/metadata-types/taxonomy/TaxonomyTaginput.vue b/src/classes/metadata-types/taxonomy/TaxonomyTaginput.vue
index c4af7a2f0..db805ce23 100644
--- a/src/classes/metadata-types/taxonomy/TaxonomyTaginput.vue
+++ b/src/classes/metadata-types/taxonomy/TaxonomyTaginput.vue
@@ -99,7 +99,7 @@
                     throw error;
                 });
             }, 500),
-            selectedValues(){
+            updateSelectedValues(){
                 let selected = [];
 
                 for( let term of this.value){
@@ -112,11 +112,10 @@
                 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');
                 }
@@ -125,9 +124,8 @@
                 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 1e01c66c7..d7785de94 100644
--- a/src/classes/metadata-types/taxonomy/class-tainacan-taxonomy.php
+++ b/src/classes/metadata-types/taxonomy/class-tainacan-taxonomy.php
@@ -217,6 +217,10 @@ class Taxonomy extends Metadata_Type {
 				
 				$count ++;
 				
+				if ( is_integer($term) ) {
+					$term = \Tainacan\Repositories\Terms::get_instance()->fetch($term, $this->get_option('taxonomy_id'));
+				}
+				
 				if ( $term instanceof \Tainacan\Entities\Term ) {
 					$return .= $prefix;
 					
diff --git a/src/classes/metadata-types/text/class-tainacan-text.php b/src/classes/metadata-types/text/class-tainacan-text.php
index 31e3d2390..552da64a7 100644
--- a/src/classes/metadata-types/text/class-tainacan-text.php
+++ b/src/classes/metadata-types/text/class-tainacan-text.php
@@ -45,7 +45,7 @@ class Text extends Metadata_Type {
 	public function get_value_as_html(\Tainacan\Entities\Item_Metadata_Entity $item_metadata) {
 		$value = $item_metadata->get_value();
 		$return = '';
-		if ( $item_metadata->is_multiple() ) {
+		if ( is_array($value) && $item_metadata->is_multiple() ) {
 			$total = sizeof($value);
 			$count = 0;
 			$prefix = $item_metadata->get_multivalue_prefix();
diff --git a/src/classes/repositories/class-tainacan-collections.php b/src/classes/repositories/class-tainacan-collections.php
index ee0cf1be7..690e4e0b7 100644
--- a/src/classes/repositories/class-tainacan-collections.php
+++ b/src/classes/repositories/class-tainacan-collections.php
@@ -141,18 +141,18 @@ class Collections extends Repository {
 			],
 			'metadata_order'             => [
 				'map'         => 'meta',
-				'title'       => __( 'Ordination metadata', 'tainacan' ),
+				'title'       => __( 'Metadata order', 'tainacan' ),
 				'type'        => 'array/object/string',
 				'items'       => [ 'type' => 'array/string/integer/object' ],
-				'description' => __( 'Collection metadata ordination', 'tainacan' ),
+				'description' => __( 'The order of the metadata in the collection', 'tainacan' ),
 				//'validation' => v::stringType(),
 			],
 			'filters_order'              => [
 				'map'         => 'meta',
-				'title'       => __( 'Ordination filters', 'tainacan' ),
+				'title'       => __( 'Filters order', 'tainacan' ),
 				'type'        => 'array/object/string',
 				'items'       => [ 'type' => 'array/string/integer/object' ],
-				'description' => __( 'Collection filters ordination', 'tainacan' ),
+				'description' => __( 'The order of the filters in the collection', 'tainacan' ),
 				//'validation' => v::stringType(),
 			],
 			'enable_cover_page'          => [
@@ -167,7 +167,7 @@ class Collections extends Repository {
 			'cover_page_id'              => [
 				'map'         => 'meta',
 				'title'       => __( 'Cover Page ID', 'tainacan' ),
-				'type'        => 'string',
+				'type'        => 'integer/string',
 				'description' => __( 'If enabled, this custom page will be used as cover for this collection, instead of default items list.', 'tainacan' ),
 				'on_error'    => __( 'Invalid page', 'tainacan' ),
 				//'validation' => v::numeric(),
@@ -187,7 +187,7 @@ class Collections extends Repository {
 				'title'       => __( 'Moderators', 'tainacan' ),
 				'type'        => 'array/object/string',
 				'items'       => [ 'type' => 'array/string/integer/object' ],
-				'description' => __( 'To assign users as Moderators of this collection', 'tainacan' ),
+				'description' => __( 'Moderators of this collection', 'tainacan' ),
 				'validation'  => ''
 			],
 			'_thumbnail_id'              => [
diff --git a/src/classes/repositories/class-tainacan-filters.php b/src/classes/repositories/class-tainacan-filters.php
index 9a102ef76..9015262b6 100644
--- a/src/classes/repositories/class-tainacan-filters.php
+++ b/src/classes/repositories/class-tainacan-filters.php
@@ -25,6 +25,7 @@ class Filters extends Repository {
 	protected function __construct() {
 		parent::__construct();
 		add_action( 'tainacan-deleted-tainacan-metadatum', array( &$this, 'hook_delete_when_metadata_deleted' ), 10, 2 );
+		add_action( 'tainacan-insert-tainacan-metadatum', array( &$this, 'hook_update_when_metadata_saved_as_private' ), 10, 2 );
 	}
 
 	protected function _get_map() {
@@ -64,7 +65,7 @@ class Filters extends Repository {
 				'map'         => 'meta',
 				'title'       => __( 'Type', 'tainacan' ),
 				'type'        => 'string',
-				'description' => __( 'The filter type', 'tainacan' ),
+				'description' => __( 'The filter type class name, such as filter_type: Tainacan\Filter_Types\Checkbox', 'tainacan' ),
 				'validation'  => ''
 			],
 			'collection_id'       => [
@@ -365,7 +366,7 @@ class Filters extends Repository {
 		$parents[] = $collection_id;
 
 		//search for default metadatum
-		$parents[] = 'filter_in_repository';
+		$parents[] = 'default';
 
 		$meta_query = array(
 			'key'     => 'collection_id',
@@ -416,7 +417,7 @@ class Filters extends Repository {
 		$parents[] = $collection_id;
 
 		//search for default metadatum
-		$parents[] = 'filter_in_repository';
+		$parents[] = 'default';
 
 		$meta_query = array(
 			'key'     => 'collection_id',
@@ -508,10 +509,10 @@ class Filters extends Repository {
 		return $result;
 	}
 	
-	public function hook_delete_when_metadata_deleted($filter, $permanent) {
+	public function hook_delete_when_metadata_deleted($metadatum, $permanent) {
 		
-		if ( $filter instanceof Entities\Metadatum ) {
-			$metadatum_id = $filter->get_id();
+		if ( $metadatum instanceof Entities\Metadatum ) {
+			$metadatum_id = $metadatum->get_id();
 			$filters = $this->fetch(['metadatum_id' => $metadatum_id, 'post_status' => 'any'], 'OBJECT');
 			foreach ($filters as $filter) {
 				if ($permanent) {
@@ -525,4 +526,33 @@ class Filters extends Repository {
 		
 	}
 	
+	public function hook_update_when_metadata_saved_as_private($metadatum) {
+		
+		if ( $metadatum instanceof Entities\Metadatum ) {
+			
+			$status_obj = get_post_status_object( $metadatum->get_status() );
+			
+			if ( ! $status_obj->public ) {
+				
+				$stati = get_post_stati(['public' => true]);
+				
+				$metadatum_id = $metadatum->get_id();
+				
+				$filters = $this->fetch(['metadatum_id' => $metadatum_id, 'post_status' => $stati], 'OBJECT');
+				
+				foreach ($filters as $filter) {
+					$filter->set_status( $metadatum->get_status() );
+					if ( $filter->validate() ) {
+						$this->insert($filter);
+					}
+					
+				}
+				
+			}
+			
+			
+		}
+		
+	}
+	
 }
\ No newline at end of file
diff --git a/src/classes/repositories/class-tainacan-item-metadata.php b/src/classes/repositories/class-tainacan-item-metadata.php
index bb647f215..cab3bc6dc 100644
--- a/src/classes/repositories/class-tainacan-item-metadata.php
+++ b/src/classes/repositories/class-tainacan-item-metadata.php
@@ -36,26 +36,12 @@ class Item_Metadata extends Repository {
 			throw new \Exception( 'Entities must be validated before you can save them' );
 			// TODO: Throw Warning saying you must validate object before insert()
 		}
-
-		$is_update = true;
+		
+		do_action( 'tainacan-pre-insert', $item_metadata );
+		do_action( 'tainacan-pre-insert-Item_Metadata_Entity', $item_metadata );
 		
 		$new = $item_metadata->get_value();
 
-		$diffs = [];
-
-		if ($this->use_logs) {
-			$old = get_post_meta( $item_metadata->get_item()->get_id(), $item_metadata->get_metadatum()->get_id(), true );
-			if($old != $new) {
-				$diffs['value'] = [
-					'new'             => $new,
-					'old'             => $old,
-					'diff_with_index' => [],
-				];
-			} else {
-				$diffs['value'] = [];
-			}
-		}
-
 		$unique = ! $item_metadata->is_multiple();
 
 		$metadata_type = $item_metadata->get_metadatum()->get_metadata_type_object();
@@ -106,13 +92,10 @@ class Item_Metadata extends Repository {
 				}
 			}
 			
-			if ($this->use_logs) {
-				$this->logs_repository->insert_log( $item_metadata, $diffs, $is_update );
-			}
-
-			do_action( 'tainacan-insert', $item_metadata, $diffs, $is_update );
-			do_action( 'tainacan-insert-Item_Metadata_Entity', $item_metadata );
 		}
+		
+		do_action( 'tainacan-insert', $item_metadata );
+		do_action( 'tainacan-insert-Item_Metadata_Entity', $item_metadata );
 
 		$new_entity = new Entities\Item_Metadata_Entity( $item_metadata->get_item(), $item_metadata->get_metadatum() );
 
@@ -164,11 +147,6 @@ class Item_Metadata extends Repository {
 			$taxonomy  = new Entities\Taxonomy( $metadata_type->get_option( 'taxonomy_id' ) );
 
 			if ( $taxonomy ) {
-				if ( $this->use_logs  ) {
-					$old = wp_get_object_terms(  $item_metadata->get_item()->get_id(), $taxonomy->get_db_identifier(), [
-						'fields' => 'names'
-					] );
-				}
 
 				// We can not simply use wp_set_object_terms() because it uses term_exists() which is not reliable 
 				// see https://core.trac.wordpress.org/ticket/45333 and https://core.trac.wordpress.org/ticket/47099
@@ -200,26 +178,6 @@ class Item_Metadata extends Repository {
 				
 				$success = wp_set_object_terms( $item_metadata->get_item()->get_id(), $insert, $taxonomy->get_db_identifier() );
 				
-				if ( $this->use_logs && ! $success instanceof \WP_Error ) {
-
-					$new = get_terms(array(
-						'taxonomy'   => $taxonomy->get_db_identifier(),
-						'hide_empty' => false,
-						'object_ids' => $item_metadata->get_item()->get_id(),
-						'fields'     => 'names',
-					));
-
-					$diffs[ 'value' ] = [
-						'new'             => $new,
-						'old'             => $old,
-						'diff_with_index' => []
-					];
-
-					if($this->use_logs){
-						$this->logs_repository->insert_log( $item_metadata, $diffs, true );
-						//do_action( 'tainacan-insert', $item_metadata, $diffs, true );
-					}
-				}
 			}
 		}
 	}
diff --git a/src/classes/repositories/class-tainacan-logs.php b/src/classes/repositories/class-tainacan-logs.php
index 8b3578c44..a1ddec024 100644
--- a/src/classes/repositories/class-tainacan-logs.php
+++ b/src/classes/repositories/class-tainacan-logs.php
@@ -16,6 +16,9 @@ defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 class Logs extends Repository {
 	public $entities_type = '\Tainacan\Entities\Log';
 	private static $instance = null;
+	private $current_diff = null;
+	private $current_deleting_entity;
+	private $current_action;
 
 	public static function get_instance() {
 		if ( ! isset( self::$instance ) ) {
@@ -29,7 +32,17 @@ class Logs extends Repository {
 	protected function __construct() {
 		parent::__construct();
 
-		add_action( 'add_attachment', array( $this, 'prepare_attachment_log_before_insert' ), 10 );
+		add_action( 'tainacan-pre-insert', array( $this, 'pre_insert_entity' ) );
+		
+		add_action( 'tainacan-insert', array( $this, 'insert_entity' ) );
+		add_action( 'tainacan-deleted', array( $this, 'delete_entity' ), 10, 2 );
+		add_action( 'tainacan-pre-delete', array( $this, 'pre_delete_entity' ), 10, 2 );
+		
+		add_action( 'add_attachment', array( $this, 'insert_attachment' ) );
+		add_action( 'delete_attachment', array( $this, 'pre_delete_attachment' ) );
+		add_action( 'delete_post', array( $this, 'delete_attachment' ) );
+		
+		add_filter('tainacan-log-set-title', [$this, 'filter_log_title']);
 	}
 
 	protected function _get_map() {
@@ -42,26 +55,12 @@ class Logs extends Repository {
 				'on_error'    => __( 'The title should be a text value and not empty', 'tainacan' ),
 				'validation'  => ''
 			],
-			'log_date'       => [
+			'date'       => [
 				'map'         => 'post_date',
 				'title'       => __( 'Log date', 'tainacan' ),
 				'type'        => 'string',
 				'description' => __( 'The log date', 'tainacan' ),
 			],
-			'order'          => [
-				'map'         => 'menu_order',
-				'title'       => __( 'Menu order', 'tainacan' ),
-				'type'        => 'string',
-				'description' => __( 'Log order' ),
-				'validation'  => ''
-			],
-			'parent'         => [
-				'map'         => 'parent',
-				'title'       => __( 'Parent', 'tainacan' ),
-				'type'        => 'string',
-				'description' => __( 'Log order' ),
-				'validation'  => ''
-			],
 			'description'    => [
 				'map'         => 'post_content',
 				'title'       => __( 'Description', 'tainacan' ),
@@ -77,13 +76,6 @@ class Logs extends Repository {
 				'description' => __( 'The log slug' ),
 				'validation'  => ''
 			],
-			'items_per_page' => [
-				'map'         => 'meta',
-				'title'       => __( 'Items per page', 'tainacan' ),
-				'type'        => 'integer',
-				'description' => __( 'The quantity of items that should be loaded' ),
-				'validation'  => ''
-			],
 			'user_id'        => [
 				'map'         => 'post_author',
 				'title'       => __( 'User ID', 'tainacan' ),
@@ -91,21 +83,19 @@ class Logs extends Repository {
 				'description' => __( 'Unique identifier' ),
 				'validation'  => ''
 			],
-			'blog_id'        => [
+			'item_id'        => [
 				'map'         => 'meta',
-				'title'       => __( 'Blog ID', 'tainacan' ),
+				'title'       => __( 'Item ID', 'tainacan' ),
 				'type'        => 'integer',
-				'description' => __( 'Unique identifier' ),
-				'validation'  => ''
 			],
-			'value'          => [
-				'map'         => 'meta',
-				'title'       => __( 'Actual value', 'tainacan' ),
-				'type'        => 'string',
-				'description' => __( 'The actual log value' ),
-				'validation'  => ''
-			],
-			'log_diffs'      => [
+			// 'value'          => [
+			// 	'map'         => 'meta',
+			// 	'title'       => __( 'Actual value', 'tainacan' ),
+			// 	'type'        => 'string',
+			// 	'description' => __( 'The actual log value' ),
+			// 	'validation'  => ''
+			// ],
+			'log_diffs'      => [ // deprecated
 				'map'         => 'meta',
 				'title'       => __( 'Log differences', 'tainacan' ),
 				'description' => __( 'Differences between old and new versions of object', 'tainacan' )
@@ -115,10 +105,27 @@ class Logs extends Repository {
 				'title'       => __( 'Log collection relationship', 'tainacan' ),
 				'description' => __( 'The ID of the collection that this log is related to', 'tainacan' )
 			],
-			'item_id' => [
+			'object_id' => [
 				'map'         => 'meta',
 				'title'       => __( 'Log item relationship', 'tainacan' ),
-				'description' => __( 'The id of the item that this log is related to', 'tainacan' ),
+				'description' => __( 'The id of the object that this log is related to', 'tainacan' ),
+			],
+			'object_type' => [
+				'map'         => 'meta',
+				'title'       => __( 'Log item relationship', 'tainacan' ),
+				'description' => __( 'The type of the object that this log is related to', 'tainacan' ),
+			],
+			'old_value' => [
+				'map'         => 'meta',
+				'title'       => __( 'Old Value', 'tainacan' ),
+			],
+			'new_value' => [
+				'map'         => 'meta',
+				'title'       => __( 'New value', 'tainacan' ),
+			],
+			'action' => [
+				'map'         => 'meta',
+				'title'       => __( 'Action', 'tainacan' ),
 			]
 		] );
 	}
@@ -218,7 +225,11 @@ class Logs extends Repository {
 	public function update( $object, $new_values = null ) {
 		return $this->insert( $object );
 	}
-
+	
+	/**
+	 * Feth most recent log
+	 * @return Entities\Log The most recent Log entity
+	 */
 	public function fetch_last() {
 		$args = [
 			'post_type'      => Entities\Log::get_post_type(),
@@ -232,196 +243,535 @@ class Logs extends Repository {
 		return array_pop( $logs );
 	}
 
-
-	public function prepare_attachment_log_before_insert( $post_ID ) {
+	/**
+	 * Callback to generate log when attachments are added to any Tainacan entity
+	 */
+	public function insert_attachment( $post_ID ) {
 		$attachment = get_post( $post_ID );
 		$post       = $attachment->post_parent;
 
-		if ( $post ) {
-			// was added attachment on a tainacan object
+		if ( $post ) { // attached to a post
 
-			$tainacan_post = Repository::get_entity_by_post( $post );
+			$entity = Repository::get_entity_by_post( $post );
 
-			if ( $tainacan_post ) {
-				// was added a normal attachment
-
-				// get all attachments except the new
-				$old_attachments_objects = $tainacan_post->get_attachments( $post_ID );
-
-				// get all attachments
-				$new_attachments_objects = $tainacan_post->get_attachments();
+			if ( $entity ) { // attached to a tainacan entity
 				
-				$old_attachments = $this->prepare_attachments($old_attachments_objects);
-				$new_attachments = $this->prepare_attachments($new_attachments_objects);
-
-				$array_diff_with_index = array_map( 'unserialize',
-					array_diff_assoc( array_map( 'serialize', $new_attachments ), array_map( 'serialize', $old_attachments ) ) );
-
-				$diff['attachments'] = [
-					'new'             => $new_attachments,
-					'old'             => $old_attachments,
-					'diff_with_index' => $array_diff_with_index
+				$log = new Entities\Log();
+				
+				$collection_id = method_exists($entity, 'get_collection_id') ? $entity->get_collection_id() : 'default';
+				
+				if ( $entity instanceof Entities\Collection ) {
+					$collection_id = $entity->get_id();
+					$log->set_title( sprintf( __( 'New file was attached to Collection "%s"', 'tainacan'), $entity->get_name() ) );
+				}
+				if ( $entity instanceof Entities\Item ) {
+					$log->set_item_id($entity->get_id());
+					$log->set_title( sprintf( __( 'New file was attached to Item "%s"', 'tainacan'), $entity->get_title() ) );
+				}
+				
+				$object_type = get_class($entity);
+				$object_id = $entity->get_id();
+				
+				$diff = [];
+				
+				$log->set_collection_id($collection_id);
+				$log->set_object_type($object_type);
+				$log->set_object_id($object_id);
+				$log->set_action('new-attachment');
+				
+				$title = __( sprintf('') , 'tainacan');
+				
+				$prepared = [
+					'id'          => $attachment->ID,
+					'title'       => $attachment->post_title,
+					'description' => $attachment->post_content,
+					'mime_type'   => $attachment->post_mime_type,
 				];
-
-				$this->insert_log( $tainacan_post, $diff, true );
+				
+				$log->set_new_value($prepared);
+				
+				if ( $log->validate() ) {
+					$this->insert($log);
+				}
 
 			}
 		}
 
 	}
 	
-	private function prepare_attachments($attachments) {
-		$attachments_prepared = [];
-		if ( is_array($attachments) ) {
-			foreach ( $attachments as $attachment ) {
-				$prepared = [
-					'id'          => $attachment->ID,
-					'title'       => $attachment->post_title,
-					'description' => $attachment->post_content,
-					'mime_type'   => $attachment->post_mime_type,
-					'url'         => $attachment->guid,
-				];
+	/**
+	 * Callback to generate log when attachments attached to any Tainacan entity are deleted
+	 */
+	public function pre_delete_attachment($attachment_id) {
+		
+		$attachment_post = get_post($attachment_id);
+		
+		$entity_post = get_post($attachment_post->post_parent);
 
-				array_push( $attachments_prepared, $prepared );
+		if ( $entity_post ) {
+
+			$entity = Repository::get_entity_by_post( $entity_post );
+
+			if ( $entity ) {
+				
+				$collection_id = method_exists($entity, 'get_collection_id') ? $entity->get_collection_id() : 'default';
+				
+				$log = new Entities\Log();
+				
+				if ( $entity instanceof Entities\Collection ) {
+					$collection_id = $entity->get_id();
+					$log->set_title( sprintf(__( 'File attached to Collection "%s" was removed', 'tainacan'), $entity->get_name() ) );
+				}
+				if ( $entity instanceof Entities\Item ) {
+					$log->set_item_id($entity->get_id());
+					$log->set_title( sprintf( __( 'File attached to Item "%s" was removed' , 'tainacan'), $entity->get_title() ) );
+				}
+				
+				$object_type = get_class($entity);
+				$object_id = $entity->get_id();
+				
+				$preapred = [
+					'id'          => $attachment_id,
+					'title'       => $attachment_post->post_title,
+					'description' => $attachment_post->post_content,
+				];
+				
+				$log->set_collection_id($collection_id);
+				$log->set_object_type($object_type);
+				$log->set_object_id($object_id);
+				$log->set_old_value($preapred);
+				$log->set_action('delete-attachment');
+				
+				$this->current_attachment_delete_log = $log;
+				
+			}
+			
+		}
+	}
+	
+	/**
+	 * Callback to generate log when attachments attached to any Tainacan entity are deleted
+	 */
+	public function delete_attachment($attachment_id) {
+		if ( isset($this->current_attachment_delete_log) && $this->current_attachment_delete_log instanceof Entities\Log ) {
+			$log = $this->current_attachment_delete_log;
+			$att = $log->get_old_value();
+			if ( is_array($att) && isset($att['id']) && $att['id'] == $attachment_id && $log->validate() ) {
+				$this->insert($log);
 			}
 		}
-		return $attachments_prepared;
 	}
-
+	
 	/**
-	 * Insert a log when a new entity is inserted
+	 * Compare two repository entities and sets the current_diff property to be used in the insert hook
 	 *
-	 * @param Entity $value
-	 * @param array $diffs
-	 * @param bool $is_update
+	 * @param Entity $unsaved The new entity that is going to be saved
 	 *
-	 * @param bool $is_delete
-	 * @param bool $is_trash
-	 *
-	 * @return Entities\Log|bool new created log
+	 * @return void
 	 */
-	public function insert_log( $value, $diffs = [], $is_update = false, $is_delete = false, $is_trash = false ) {
-		$title       = null;
-		$description = null;
+	public function pre_insert_entity( Entities\Entity $unsaved ) {
 
-		if ( is_object( $value ) ) {
-			// do not log a log
-			if ( ( method_exists( $value, 'get_post_type' ) && $value->get_post_type() === 'tainacan-log' ) || $value->get_status() === 'auto-draft' ) {
-				return false;
+		if ( ! $unsaved->get_repository()->use_logs ) {
+			return;
+		}
+		
+		if ( $unsaved instanceof Entities\Item_Metadata_Entity ) {
+			return $this->prepare_item_metadata_diff($unsaved);
+		}
+		
+		// do not log a log
+		if ( ( method_exists( $unsaved, 'get_post_type' ) && $unsaved->get_post_type() === 'tainacan-log' ) || $unsaved->get_status() === 'auto-draft' ) {
+			return;
+		}
+		
+		$creating = true;
+		
+		$old = null;
+		
+		if ( is_numeric( $unsaved->get_id() ) ) {
+			if ( $unsaved instanceof Entities\Term ) {
+				$old = $unsaved->get_repository()->fetch( $unsaved->get_id(), $unsaved->get_taxonomy() );
+			} else {
+				$old = $unsaved->get_repository()->fetch( $unsaved->get_id() );
 			}
-
-			if ( $value instanceof Entities\Metadatum ) {
-				$type = $value->get_metadata_type();
-
-				if ( $type === 'Tainacan\Metadata_Types\Core_Title' || $type === 'Tainacan\Metadata_Types\Core_Description' ) {
-					return false;
+		}
+		
+		
+		if ( $old instanceof Entities\Entity ) {
+			
+			if ( $old->get_status() !== 'auto-draft' ) {
+				$creating = false;
+			}
+			
+		}
+		
+		$diff = [
+			'old' => [],
+			'new' => []
+		];
+		
+		$has_diff = false;
+		
+		if ( $creating ) {
+			$diff['new'] = $unsaved->_toArray();
+			$has_diff = true;
+		} else {
+			$map = $unsaved->get_repository()->get_map();
+			
+			foreach ( $map as $prop => $mapped ) {
+				if ( $old->get( $prop ) != $unsaved->get( $prop ) ) {
+					
+					$diff['old'][$prop] = $old->get( $prop );
+					$diff['new'][$prop] = $unsaved->get( $prop );
+					$has_diff = true;
+					
 				}
 			}
-
-			$type       = get_class( $value );
-			$class_name = explode( '\\', $type )[2];
-
-			$name = method_exists( $value, 'get_name' ) ? $value->get_name() :
-				( method_exists( $value, 'get_title' ) ? $value->get_title() : $value->get_metadatum()->get_name() );
-
-			if ( ! $name ) {
-				$name = $value->get_status();
-			}
-
-			if ( $is_update ) {
-				// entity was delete
-				$title         = $this->prepare_event_title( $value, $name, $class_name, 'updated' );
-
-				$description = $title;
-			} elseif ( $is_delete ) {
-				// entity was deleted
-				$title         = $this->prepare_event_title( $value, $name, $class_name, 'deleted' );
-
-				$description = $title;
-			} elseif ( ! empty( $diffs ) ) {
-				// entity was created
-				$title         = $this->prepare_event_title( $value, $name, $class_name, 'created' );
-
-				$description = $title;
-			} elseif ( $is_trash ) {
-				// entity was trashed
-				$title         = $this->prepare_event_title( $value, $name, $class_name, 'trashed' );
-
-				$description = $title;
-			}
-
-			$title       = apply_filters( 'tainacan-insert-log-message-title', $title, $type, $value );
-			$description = apply_filters( 'tainacan-insert-log-description', $description, $type, $value );
-		}
-
-		if ( !empty( $diffs ) || $is_delete || $is_trash) {
-			return Entities\Log::create( $title, $description, $value, $diffs );
 		}
+		
+		$diff = apply_filters( 'tainacan-entity-diff', $diff, $unsaved, $old );
+		
+		$this->current_diff = $has_diff ? $diff : false;
+		$this->current_action = $creating ? 'create' : 'update';
+		
 	}
-
-	/**
-	 * This will prepare the event title for objects
-	 *
-	 * @param $object
-	 * @param $name
-	 * @param $class_name
-	 *
-	 * @param $action_message
-	 *
-	 * @return string
-	 */
-	private function prepare_event_title( $object, $name, $class_name, $action_message ) {
-
-		// translators: 1=Object name, 2=Object type, 3=Action. e.g. The "Subject" taxonomy has been created
-		$title_format = __( '"%1$s" %2$s has been %3$s', 'tainacan' );
-
-		if ( $object instanceof Entities\Metadatum || $object instanceof Entities\Item || $object instanceof Entities\Filter ) {
-			$collection = $object->get_collection();
-
-			if ( $collection ) {
-				$parent = sprintf( __('(collection: %s)', 'tainacan'), $collection->get_name() );
-			} else {
-				$parent = __('(on repository level)', 'tainacan');
-			}
-
-			$title = sprintf( $title_format, $name, strtolower( $class_name ), $action_message );
-			$title .= ' ' . $parent . '.';
-		} elseif($object instanceof Entities\Item_Metadata_Entity) {
-			$title = sprintf(
-				$title_format,
-				$name,
-				__('item metadatum', 'tainacan'),
-				$action_message
-			               ) . ' ' . sprintf( __('(item: %s)', 'tainacan'), $object->get_item()->get_title() ) . '.';
-		} else {
-			$title = sprintf( $title_format, $name, strtolower( $class_name ), $action_message ) . '.';
+	
+	
+	private function prepare_item_metadata_diff( Entities\Entity $unsaved ) {
+		
+		$diff = [
+			'old' => [],
+			'new' => []
+		];
+		
+		$old = new Entities\Item_Metadata_Entity($unsaved->get_item(), $unsaved->get_metadatum());
+		
+		add_filter('tainacan-item-metadata-get-multivalue-separator', [$this, '__temporary_multivalue_separator']);
+		
+		if ( $old instanceof Entities\Item_Metadata_Entity ) {
+			$diff['old'] = \explode($this->__temporary_multivalue_separator(''), $old->get_value_as_string());
 		}
+		
+		$diff['new'] = \explode($this->__temporary_multivalue_separator(''), $unsaved->get_value_as_string());
+		
+		remove_filter('tainacan-item-metadata-get-multivalue-separator', [$this, '__temporary_multivalue_separator']);
+		
+		$diff = apply_filters( 'tainacan-entity-diff', $diff, $unsaved, $old );
+		
+		$this->current_diff = $diff;
+		$this->current_action = 'update-metadata-value';
+		
+	}
+	
+	public function __temporary_multivalue_separator($sep) {
+		return '--xx--';
+	}
+	
+	/**
+	 * Callback to generate log when Tainacan entities are edited
+	 */
+	public function insert_entity( Entities\Entity $entity ) {
 
+		if ( ! $entity->get_repository()->use_logs ) {
+			return;
+		}
+		
+		if ( $entity instanceof Entities\Item_Metadata_Entity ) {
+			return $this->insert_item_metadata($entity);
+		} 
+		
+		// do not log a log
+		if ( ( method_exists( $entity, 'get_post_type' ) && $entity->get_post_type() === 'tainacan-log' ) || $entity->get_status() === 'auto-draft' ) {
+			return false;
+		}
+		
+		$log = new Entities\Log();
+		$log->set_action($this->current_action);
+		
+		$collection_id = method_exists($entity, 'get_collection_id') ? $entity->get_collection_id() : 'default';
+		
+		$diff = $this->current_diff;
+		
+		if (false === $diff) {
+			return;
+		}
+		
+		if ( $entity instanceof Entities\Collection ) {
+			
+			$collection_id = $entity->get_id();
+			
+			if ($this->current_action == 'update') {
+				if (isset($diff['new']['metadata_order'])) {
+					$log->set_title( sprintf( __( 'Collection "%s" metadata order was updated', 'tainacan'), $entity->get_name() ) );
+					$log->set_action('update-metadata-order');
+				} elseif (isset($diff['new']['filters_order'])) {
+					$log->set_title( sprintf( __( 'Collection "%s" filters order was updated', 'tainacan'), $entity->get_name() ) );
+					$log->set_action('update-filters-order');
+				} else {
+					$log->set_title( sprintf( __( 'Collection "%s" was updated', 'tainacan'), $entity->get_name() ) );
+				}
+			} elseif ($this->current_action == 'create') {
+				$log->set_title( sprintf( __( 'Collection "%s" was created', 'tainacan'), $entity->get_name() ) );
+			}
+			
+		} elseif ( $entity instanceof Entities\Item ) {
+			
+			$log->set_item_id($entity->get_id());
+			
+			if ($this->current_action == 'update') {
+				if (isset($diff['new']['document'])) {
+					$log->set_title( sprintf( __( 'Item "%s" document was updated', 'tainacan'), $entity->get_title() ) );
+					$log->set_action('update-document');
+				} elseif (isset($diff['new']['_thumbnail_id'])) {
+					$log->set_title( sprintf( __( 'Item "%s" thumbnail was updated', 'tainacan'), $entity->get_title() ) );
+					$log->set_action('update-thumbnail');
+				} else {
+					$log->set_title( sprintf( __( 'Item "%s" was updated', 'tainacan'), $entity->get_title() ) );
+				}
+			} elseif ($this->current_action == 'create') {
+				$log->set_title( sprintf( __( 'Item "%1$s" was created with the ID %2$s', 'tainacan'), $entity->get_title(), $entity->get_id() ) );
+			}
+		} elseif ( $entity instanceof Entities\Filter ) {
+			
+			if ( 'default' == $collection_id ) {
+				if ($this->current_action == 'update') {
+					$log->set_title( sprintf( __( 'Filter "%1$s" was updated in repository level', 'tainacan'), $entity->get_name() ) );
+				} elseif ($this->current_action == 'create') {
+					$log->set_title( sprintf( __( 'Filter "%1$s" was added to the repository', 'tainacan'), $entity->get_name() ) );
+				}
+			} elseif ( is_numeric($collection_id) ) {
+				if ($this->current_action == 'update') {
+					$log->set_title( sprintf( __( 'Filter "%1$s" was updated in Collection "%2$s"', 'tainacan'), $entity->get_name(), $entity->get_collection()->get_name() ) );
+				} elseif ($this->current_action == 'create') {
+					$log->set_title( sprintf( __( 'Filter "%1$s" was added to Collection "%2$s"', 'tainacan'), $entity->get_name(), $entity->get_collection()->get_name() ) );
+				}
+			}
+			
+		} elseif ( $entity instanceof Entities\Metadatum ) {
+			
+			if ( 'default' == $collection_id ) {
+				if ($this->current_action == 'update') {
+					$log->set_title( sprintf( __( 'Metadatum "%s" was updated in repository level', 'tainacan'), $entity->get_name() ) );
+				} elseif ($this->current_action == 'create') {
+					$log->set_title( sprintf( __( 'Metadatum "%1$s" was added to the repository', 'tainacan'), $entity->get_name() ) );
+				}
+			} elseif ( is_numeric($collection_id) ) {
+				if ($this->current_action == 'update') {
+					$log->set_title( sprintf( __( 'Metadatum "%s" was updated in Collection "%2$s"', 'tainacan'), $entity->get_name(), $entity->get_collection()->get_name() ) );
+				} elseif ($this->current_action == 'create') {
+					$log->set_title( sprintf( __( 'Metadatum "%1$s" was added to Collection "%2$s"', 'tainacan'), $entity->get_name(), $entity->get_collection()->get_name() ) );
+				}
+			}
+			
+		} elseif ( $entity instanceof Entities\Taxonomy ) {
+			
+			if ($this->current_action == 'update') {
+				$log->set_title( sprintf( __( 'Taxonomy "%s" was updated', 'tainacan'), $entity->get_name() ) );
+			} elseif ($this->current_action == 'create') {
+				$log->set_title( sprintf( __( 'Taxonomy "%1$s" was created', 'tainacan'), $entity->get_name() ) );
+			}
+			
+		}  elseif ( $entity instanceof Entities\Term ) {
+			
+			$taxonomy = Taxonomies::get_instance()->fetch_by_db_identifier($entity->get_taxonomy());
+			$tax_name = '';
+			if ($taxonomy instanceof Entities\Taxonomy) {
+				$tax_name = $taxonomy->get_name();
+			}
+			
+			if ($this->current_action == 'update') {
+				$log->set_title( sprintf( __( 'Term "%1$s" was updated in "%2$s" taxonomy', 'tainacan'), $entity->get_name(), $tax_name ) );
+			} elseif ($this->current_action == 'create') {
+				$log->set_title( sprintf( __( 'Term "%1$s" was added to "%2$s" taxonomy', 'tainacan'), $entity->get_name(), $tax_name ) );
+			}
+			
+		}
+		
+		$object_type = get_class($entity);
+		$object_id = $entity->get_id();
+		
+		$log->set_collection_id($collection_id);
+		$log->set_object_type($object_type);
+		$log->set_object_id($object_id);
+		$log->set_old_value($diff['old']);
+		$log->set_new_value($diff['new']);
+		
+		
+		if ( $log->validate() ) {
+			$this->insert($log);
+		}
+				
+	}
+	
+	public function pre_delete_entity( Entities\Entity $entity, $permanent) {
+		
+		if ( ! $entity->get_repository()->use_logs ) {
+			return;
+		}
+		
+		// do not log a log
+		if ( ( method_exists( $entity, 'get_post_type' ) && $entity->get_post_type() === 'tainacan-log' ) || $entity->get_status() === 'auto-draft' ) {
+			return false;
+		}
+		
+		$this->current_deleting_entity = $entity->_toArray();
+		$this->current_action = $permanent ? 'delete' : 'trash';
+		
+	}
+	
+	public function delete_entity( Entities\Entity $entity, $permanent) {
+		
+		if ( ! $entity->get_repository()->use_logs ) {
+			return;
+		}
+		
+		// do not log a log
+		if ( ( method_exists( $entity, 'get_post_type' ) && $entity->get_post_type() === 'tainacan-log' ) || $entity->get_status() === 'auto-draft' ) {
+			return false;
+		}
+		
+		$log = new Entities\Log();
+		
+		$collection_id = method_exists($entity, 'get_collection_id') ? $entity->get_collection_id() : 'default';
+		
+		if ( $entity instanceof Entities\Collection ) {
+			
+			$collection_id = $entity->get_id();
+			
+			if ($this->current_action == 'delete') {
+				$log->set_title( sprintf( __( 'Collection "%s" was permanently deleted', 'tainacan'), $entity->get_name() ) );
+			} elseif ($this->current_action == 'trash') {
+				$log->set_title( sprintf( __( 'Collection "%s" was moved to trash', 'tainacan'), $entity->get_name() ) );
+			}
+			
+		} elseif ( $entity instanceof Entities\Item ) {
+			
+			$log->set_item_id($entity->get_id());
+			
+			if ($this->current_action == 'delete') {
+				$log->set_title( sprintf( __( 'Item "%1$s" (ID %2$s) was updated', 'tainacan'), $entity->get_title(), $entity->get_id() ) );
+			} elseif ($this->current_action == 'trash') {
+				$log->set_title( sprintf( __( 'Item "%1$s" (ID %2$s) was moved to trash', 'tainacan'), $entity->get_title(), $entity->get_id() ) );
+			}
+		} elseif ( $entity instanceof Entities\Filter ) {
+			
+			if ( 'default' == $collection_id ) {
+				if ($this->current_action == 'delete') {
+					$log->set_title( sprintf( __( 'Filter "%s" was permanently deleted from the repository', 'tainacan'), $entity->get_name() ) );
+				} elseif ($this->current_action == 'trash') {
+					$log->set_title( sprintf( __( 'Repository Filter "%1$s" was moved to trash', 'tainacan'), $entity->get_name() ) );
+				}
+			} elseif ( is_numeric($collection_id) ) {
+				if ($this->current_action == 'delete') {
+					$log->set_title( sprintf( __( 'Filter "%1$s" was permanently deleted from Collection "%2$s"', 'tainacan'), $entity->get_name(), $entity->get_collection()->get_name() ) );
+				} elseif ($this->current_action == 'trash') {
+					$log->set_title( sprintf( __( 'Filter "%1$s" was moved to trash in Collection "%2$s"', 'tainacan'), $entity->get_name(), $entity->get_collection()->get_name() ) );
+				}
+			}
+			
+		} elseif ( $entity instanceof Entities\Metadatum ) {
+			
+			if ( 'default' == $collection_id ) {
+				if ($this->current_action == 'delete') {
+					$log->set_title( sprintf( __( 'Metadatum "%s" was permanently deleted from the repository', 'tainacan'), $entity->get_name() ) );
+				} elseif ($this->current_action == 'trash') {
+					$log->set_title( sprintf( __( 'Repository Metadatum "%1$s" was moved to trash', 'tainacan'), $entity->get_name() ) );
+				}
+			} elseif ( is_numeric($collection_id) ) {
+				if ($this->current_action == 'delete') {
+					$log->set_title( sprintf( __( 'Metadatum "%1$s" was permanently deleted from Collection "%2$s"', 'tainacan'), $entity->get_name(), $entity->get_collection()->get_name() ) );
+				} elseif ($this->current_action == 'trash') {
+					$log->set_title( sprintf( __( 'Metadatum "%1$s" was moved to trash in Collection "%2$s"', 'tainacan'), $entity->get_name(), $entity->get_collection()->get_name() ) );
+				}
+			}
+			
+		} elseif ( $entity instanceof Entities\Taxonomy ) {
+			
+			if ($this->current_action == 'delete') {
+				$log->set_title( sprintf( __( 'Taxonomy "%s" was permanently deleted', 'tainacan'), $entity->get_name() ) );
+			} elseif ($this->current_action == 'trash') {
+				$log->set_title( sprintf( __( 'Taxonomy "%1$s" was moved to trash', 'tainacan'), $entity->get_name() ) );
+			}
+			
+		}  elseif ( $entity instanceof Entities\Term ) {
+			
+			$taxonomy = Taxonomies::get_instance()->fetch_by_db_identifier($entity->get_taxonomy());
+			$tax_name = '';
+			if ($taxonomy instanceof Entities\Taxonomy) {
+				$tax_name = $taxonomy->get_name();
+			}
+			
+			if ($this->current_action == 'delete') {
+				$log->set_title( sprintf( __( 'Term "%1$s" was permanently deleted from "%2$s" taxonomy', 'tainacan'), $entity->get_name(), $tax_name ) );
+			} elseif ($this->current_action == 'trash') {
+				$log->set_title( sprintf( __( 'Term "%1$s" was moved to trash in "%2$s" taxonomy', 'tainacan'), $entity->get_name(), $tax_name ) );
+			}
+			
+		}
+		
+		
+		$object_type = get_class($entity);
+		$object_id = $entity->get_id();
+		
+		$diff = $this->current_diff;
+		
+		$log->set_collection_id($collection_id);
+		$log->set_object_type($object_type);
+		$log->set_object_id($object_id);
+		$log->set_action($this->current_action);
+		
+		if ( $permanent ) {
+			$log->set_old_value( $this->current_deleting_entity );
+		} else {
+			$log->set_old_value( ['status' => $entity->get_status()] );
+			$log->set_new_value( ['status' => 'trash']  );
+		}
+		
+		
+		if ( $log->validate() ) {
+			$this->insert($log);
+		}
+		
+	}
+	
+	private function insert_item_metadata( Entities\Item_Metadata_Entity $entity ) {
+		
+		$log = new Entities\Log();
+		
+		$item_id = $entity->get_item()->get_id();
+		$collection_id = $entity->get_item()->get_collection_id();
+		$object_type = get_class($entity);
+		$object_id = $entity->get_metadatum()->get_id();
+		
+		$diff = $this->current_diff;
+		
+		$log->set_collection_id($collection_id);
+		$log->set_object_type($object_type);
+		$log->set_object_id($object_id);
+		$log->set_item_id($item_id);
+		$log->set_old_value($diff['old']);
+		$log->set_new_value($diff['new']);
+		$log->set_action($this->current_action);
+		
+		$meta_name = $entity->get_metadatum()->get_name();
+		$item_title = $entity->get_item()->get_title();
+		
+		$title = sprintf( __( 'Value for %1$s metadatum was updated in item "%2$s"', 'tainacan' ), $meta_name, $item_title );
+		
+		$log->set_title($title);
+		
+		if ( $log->validate() ) {
+			$this->insert($log);
+		}
+		
+	}
+	
+	public function filter_log_title($title) {
+		if (defined('TAINACAN_DOING_IMPORT') && true === TAINACAN_DOING_IMPORT) {
+			$_title = __('Importer', 'tainacan');
+			$title .= " ($_title)";
+		}
 		return $title;
 	}
 
-	/**
-	 *
-	 * @param Entities\Log $log
-	 *
-	 * @return Entities\Entity|boolean return insert/update valeu or false
-	 * @throws \Exception
-	 */
-	public function approve( $log ) {
-		$log = self::get_entity_by_post( $log );
-		if ( $log->get_status() == 'pending' ) {
-			/** @var Entity $value * */
-			$value = $log->get_value();
-
-			$value->set_status( 'publish' ); // TODO check if publish the entity on approve
-
-			$repository = self::get_repository( $value );
-
-			if ( $value->validate() ) {
-				return $repository->insert( $value );
-			}
-		}
-
-		return false;
-	}
 }
\ No newline at end of file
diff --git a/src/classes/repositories/class-tainacan-metadata.php b/src/classes/repositories/class-tainacan-metadata.php
index 80de4c7ab..f05c9d217 100644
--- a/src/classes/repositories/class-tainacan-metadata.php
+++ b/src/classes/repositories/class-tainacan-metadata.php
@@ -93,7 +93,7 @@ class Metadata extends Repository {
 				'map'         => 'meta',
 				'title'       => __( 'Type', 'tainacan' ),
 				'type'        => 'string',
-				'description' => __( 'The metadata type', 'tainacan' ),
+				'description' => __( 'The metadata type class name, such as Tainacan\Metadata_Types\Core_Title', 'tainacan' ),
 				'on_error'    => __( 'Metadata type is empty', 'tainacan' ),
 				'validation'  => v::stringType()->notEmpty(),
 			],
@@ -1080,7 +1080,7 @@ class Metadata extends Repository {
 			}
 			
 			
-			$number = is_integer($args['number']) && $args['number'] >=1 ? $args['number'] : $total;
+			$number = ctype_digit($args['number']) && $args['number'] >=1 ? $args['number'] : $total;
 			if( $number < 1){
 				$pages = 1;
 			} else {
@@ -1141,7 +1141,7 @@ class Metadata extends Repository {
 			
 			$results = $wpdb->get_col($query);
 			$total = $wpdb->get_var($total_query);
-			$number = is_integer($args['number']) && $args['number'] >=1 ? $args['number'] : $total;
+			$number = ctype_digit($args['number']) && $args['number'] >=1 ? $args['number'] : $total;
 			if( $number < 1){
 				$pages = 1;
 			} else {
diff --git a/src/classes/repositories/class-tainacan-repository.php b/src/classes/repositories/class-tainacan-repository.php
index a0f182b9d..0d829a8e8 100644
--- a/src/classes/repositories/class-tainacan-repository.php
+++ b/src/classes/repositories/class-tainacan-repository.php
@@ -128,21 +128,9 @@ abstract class Repository {
 		$old       = '';
 
 		$diffs = [];
-
-		if ( $this->use_logs ) {
-			if ( $obj->get_id() ) {
-
-				$old = $obj->get_repository()->fetch( $obj->get_id() );
-
-				if ( method_exists( $old, 'get_status' ) && $old->get_status() === 'auto-draft' ) {
-					$is_update = false;
-				} else {
-					$is_update = true;
-				}
-
-				$diffs = $this->diff( $old, $obj );
-			}
-		}
+		
+		do_action( 'tainacan-pre-insert', $obj );
+		do_action( 'tainacan-pre-insert-' . $obj->get_post_type(), $obj );
 
 		$map = $this->get_map();
 
@@ -186,11 +174,6 @@ abstract class Repository {
 			}
 		}
 
-		// TODO: Logs for header image insert and update
-		if ( $this->use_logs ) {
-			$this->logs_repository->insert_log( $obj, $diffs, $is_update );
-		}
-
 		do_action( 'tainacan-insert', $obj, $diffs, $is_update );
 		do_action( 'tainacan-insert-' . $obj->get_post_type(), $obj );
 
@@ -624,6 +607,10 @@ abstract class Repository {
 	 * @return mixed|Entity @see https://developer.wordpress.org/reference/functions/wp_delete_post/
 	 */
 	public function delete( Entities\Entity $entity, $permanent = true ) {
+		
+		do_action( 'tainacan-pre-delete', $entity, $permanent );
+		do_action( 'tainacan-pre-delete-' . $entity->get_post_type(), $entity, $permanent );
+		
 		if ($permanent === true) {
 			$return = wp_delete_post( $entity->get_id(), $permanent );
 		} elseif ($permanent === false) {
@@ -631,8 +618,7 @@ abstract class Repository {
 		}
 		
 
-		if ( $return instanceof \WP_Post && $this->use_logs) {
-			$this->logs_repository->insert_log( $entity, [], false, false, true );
+		if ( $return instanceof \WP_Post && $this->use_logs ) {
 			
 			do_action( 'tainacan-deleted', $entity, $permanent );
 			do_action( 'tainacan-deleted-' . $entity->get_post_type(), $entity, $permanent );
@@ -804,88 +790,6 @@ abstract class Repository {
 		return $temp_array;
 	}
 
-	/**
-	 * Compare two repository entities
-	 *
-	 * @param Entity|integer|\WP_Post $old default ($which = 0) to self compare with stored entity
-	 * @param Entity|integer|\WP_Post $new
-	 *
-	 * @return array List of diff values
-	 * @throws \Exception
-	 */
-	public function diff( $old = 0, $new ) {
-		$old_entity = null;
-
-		if ( $old === 0 || is_array( $old ) && count( $old ) == 0 ) { // self diff or other entity?
-			$id = $new->get_id();
-
-			if ( ! empty( $id ) ) { // there is a repository entity?
-				$old_entity = $this->get_entity_by_post( $new->WP_Post->ID );
-			} else {
-				$entity_type = get_class( $new );
-				$old_entity  = new $entity_type; // there is no saved entity, let compare with a new empty one
-			}
-		} else {
-			if ( $old->get_status() === 'auto-draft' ) {
-				$entity_type = get_class( $new );
-				$old_entity  = new $entity_type;
-			} else {
-				$old_entity = $old;
-			}
-		}
-
-		$new_entity = $new;
-
-		$map = $this->get_map();
-
-		$diff = [];
-
-		foreach ( $map as $prop => $mapped ) {
-			// I can't verify differences on item, because it attributes are added when item is a auto-draft
-			if ( $old_entity->get_mapped_property( $prop ) != $new_entity->get_mapped_property( $prop ) ) {
-
-				if ( $mapped['map'] === 'meta_multi' || ( $mapped['map'] === 'meta' && is_array( $new_entity->get_mapped_property( $prop ) ) ) ) {
-
-					// Array of diffs with index of diff in new array
-					$new_v = $new_entity->get_mapped_property( $prop );
-					$old_v = $old_entity->get_mapped_property( $prop );
-
-					$old_v = ! is_array( $old_v ) && empty( $old_v ) && ! is_string( $old_v ) ? array() : ( ! is_string( $old_v ) ? $old_v : [ $old_v ] );
-
-					$array_diff_with_index = array_map( 'unserialize',
-						array_diff_assoc( array_map( 'serialize', $new_v ), array_map( 'serialize', $old_v ) ) );
-
-					if ( ! empty( $array_diff_with_index ) ) {
-
-						$diff[ $prop ] = [
-							'new'             => $new_entity->get_mapped_property( $prop ),
-							'old'             => $old_entity->get_mapped_property( $prop ),
-							'diff_with_index' => $array_diff_with_index,
-						];
-					}
-				} elseif ( $mapped['map'] !== 'post_modified' ) {
-					$new_as_array = explode( ' ', $new_entity->get_mapped_property( $prop ) );
-					$old_as_array = explode( ' ', $old_entity->get_mapped_property( $prop ) );
-
-					// Array of diffs with index of diff in new array
-					$array_diff_with_index = array_diff_assoc( $new_as_array, $old_as_array );
-
-					$diff[ $prop ] = [
-						'new'             => $new_as_array,
-						'old'             => $old_entity->get_mapped_property( $prop ),
-						'diff_with_index' => $array_diff_with_index,
-					];
-				}
-
-			}
-		}
-
-		unset( $diff['id'], $diff['collection_id'], $diff['author_id'], $diff['creation_date'], $diff['_thumbnail_id'] );
-		$diff = apply_filters( 'tainacan-entity-diff', $diff, $new, $old );
-
-		return $diff;
-	}
-
 	/**
 	 * Inserts or update thumbnail for items and collections and return an array
 	 * with old thumbnail and new thumbnail
diff --git a/src/classes/repositories/class-tainacan-taxonomies.php b/src/classes/repositories/class-tainacan-taxonomies.php
index 0a1337f4a..722e86f88 100644
--- a/src/classes/repositories/class-tainacan-taxonomies.php
+++ b/src/classes/repositories/class-tainacan-taxonomies.php
@@ -208,7 +208,7 @@ class Taxonomies extends Repository {
 	 * @param array $args WP_Query args plus disabled_metadata
 	 * @param string $output The desired output format (@see \Tainacan\Repositories\Repository::fetch_output() for possible values)
 	 *
-	 * @return array Entities\Metadatum
+	 * @return array Entities\Taxonomy
 	 * @throws \Exception
 	 */
 	public function fetch_by_collection( Entities\Collection $collection, $args = [], $output = null ) {
@@ -240,6 +240,22 @@ class Taxonomies extends Repository {
 		return $this->fetch($args, $output);
 
 	}
+	
+	/**
+	 * fetch taxonomies by DB Identifier
+	 *
+	 * @param string $db_identifier The db Identifier of the taxonomy. This is the internal WordPress taxonomy slug, something like tnc_123_tax
+	 *
+	 * @return Entities\Taxonomy|Array The entity when found. An empty array when nothing was found
+	 * @throws \Exception
+	 */
+	public function fetch_by_db_identifier($db_identifier) {
+		$id = $this->get_id_by_db_identifier($db_identifier);
+		if ($id) {
+			return $this->fetch( (int) $id );
+		}
+		return [];
+	}
 
 	public function update( $object, $new_values = null ) {
 		return $this->insert( $object );
diff --git a/src/classes/repositories/class-tainacan-terms.php b/src/classes/repositories/class-tainacan-terms.php
index bfce0d9e7..18888140b 100644
--- a/src/classes/repositories/class-tainacan-terms.php
+++ b/src/classes/repositories/class-tainacan-terms.php
@@ -117,16 +117,9 @@ class Terms extends Repository {
 			throw new \Exception( 'Entities must be validated before you can save them' );
 		}
 		
-		$is_update = false;
-		$diffs     = [];
-		if ( $term->get_id() && $this->use_logs) {
-			$is_update = true;
-
-			$old = $this->fetch( $term->get_id(), $term->get_taxonomy() );
-
-			$diffs = $this->diff( $old, $term );
-		}
-
+		do_action( 'tainacan-pre-insert', $term );
+		do_action( 'tainacan-pre-insert-term', $term );
+		
 		// First iterate through the native post properties
 		$map = $this->get_map();
 		foreach ( $map as $prop => $mapped ) {
@@ -169,17 +162,13 @@ class Terms extends Repository {
 				update_term_meta( $term_saved['term_id'], $prop, wp_slash( $term->get_mapped_property( $prop ) ) );
 			}
 		}
+		
+		$new_entity = new Entities\Term( $term_saved['term_id'], $term->get_taxonomy() );
 
-		if($this->use_logs){
-			// TODO: Log header image updates
-			$this->logs_repository->insert_log( $term, $diffs, $is_update );
-		}
+		do_action( 'tainacan-insert', $new_entity );
+		do_action( 'tainacan-insert-term', $new_entity );
 
-
-		do_action( 'tainacan-insert', $term, $diffs, $is_update );
-		do_action( 'tainacan-insert-term', $term );
-
-		return new Entities\Term( $term_saved['term_id'], $term->get_taxonomy() );
+		return $new_entity;
 	}
 	
 	// TODO: Is this workaround ok to avoid getting htmlentities ?
@@ -246,8 +235,8 @@ class Terms extends Repository {
 			}
 
 			return $return;
-		} elseif ( is_numeric( $args ) && ! empty( $cpt ) && ! is_array( $cpt ) ) { // if an id is passed taxonomy cannot be an array
-			$wp_term       = get_term_by( 'id', $args, $cpt );
+		} elseif ( is_numeric( $args ) ) { 
+			$wp_term       = get_term( (int) $args, $cpt );
 			$tainacan_term = new Entities\Term( $wp_term );
 			return $tainacan_term;
 		} else {
@@ -261,18 +250,23 @@ class Terms extends Repository {
 
 	/**
 	 * @param Entities\Term $term
-	 * @param bool $permanent this parameter is not used by Terms repository
+	 * @param bool $permanent this parameter is not used by Terms repository. Delete is always permanent
 	 *
 	 * @return bool|int|mixed|\WP_Error
 	 */
 	public function delete( Entities\Entity $term, $permanent = true ) {
 		$deleted = $term;
+		
+		$permanent = true; // there is no such option for terms
+		
+		do_action( 'tainacan-pre-delete', $deleted, $permanent );
+		do_action( 'tainacan-pre-delete-term', $deleted, $permanent );
+		
 		$return = wp_delete_term( $term->get_id(), $term->get_taxonomy() );
 
-		if ( $deleted && $this->use_logs ) {
-			$this->logs_repository->insert_log( $deleted, [], false, true );
-			do_action( 'tainacan-deleted', $deleted );
-			do_action( 'tainacan-deleted-term', $deleted );
+		if ( $deleted ) {
+			do_action( 'tainacan-deleted', $deleted, $permanent );
+			do_action( 'tainacan-deleted-term', $deleted, $permanent );
 		}
 
 		return $return;
diff --git a/src/classes/tainacan-creator.php b/src/classes/tainacan-creator.php
index 964f38ee8..e05717842 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');
@@ -141,6 +140,9 @@ $Tainacan_Filters->register_filter_type('Tainacan\Filter_Types\Taginput');
 $Tainacan_Filters->register_filter_type('Tainacan\Filter_Types\Checkbox');
 $Tainacan_Filters->register_filter_type('Tainacan\Filter_Types\TaxonomyTaginput');
 $Tainacan_Filters->register_filter_type('Tainacan\Filter_Types\TaxonomyCheckbox');
+$Tainacan_Filters->register_filter_type('Tainacan\Filter_Types\Date_Interval');
+$Tainacan_Filters->register_filter_type('Tainacan\Filter_Types\Numeric_Interval');
+$Tainacan_Filters->register_filter_type('Tainacan\Filter_Types\Numeric_List_Interval');
 
 $Tainacan_Taxonomies = \Tainacan\Repositories\Taxonomies::get_instance();
 
diff --git a/src/cli/class-tainacan-cli-garbage-collector.php b/src/cli/class-tainacan-cli-garbage-collector.php
index 6ca0064b8..8a9ce8231 100644
--- a/src/cli/class-tainacan-cli-garbage-collector.php
+++ b/src/cli/class-tainacan-cli-garbage-collector.php
@@ -30,6 +30,9 @@ class Cli_Garbage_Collector {
 	 * [--skip-metadata]
 	 * : Do not try to find orphan and unused metadata
 	 *
+	 * [--skip-transients]
+	 * : Do not try to find tainacan transients
+ 	 *
  	 * [--yes]
  	 * : Skip confirmation before execution
 	 *  
@@ -65,6 +68,10 @@ class Cli_Garbage_Collector {
 			$this->delete_metadata($dry_run, $deep);
 		}
 		
+		if (!isset($assoc_args['skip-transients'])) {
+			$this->delete_transients($dry_run, $deep);
+		}
+		
 		// delete bulk post meta 
 		
 		if ($dry_run) {
@@ -346,6 +353,22 @@ class Cli_Garbage_Collector {
 		
 	}
 	
+	private function delete_transients($dry_run) {
+		
+		global $wpdb;
+		
+		$count = $wpdb->get_var( "SELECT COUNT(option_id) FROM $wpdb->options WHERE option_name LIKE 'tnc_transient%'" );
+		
+		WP_CLI::line( "Found $count tainacan transients records in the Options table" );
+		
+		if (!$dry_run) {
+			WP_CLI::line( "Deleting transients..." );
+			$wpdb->query( "DELETE FROM $wpdb->options WHERE option_name LIKE 'tnc_transient%'" );
+			WP_CLI::success( "Transients deleted!" );
+		}
+		
+	}
+	
 	
 }
 
diff --git a/src/exporter/class-tainacan-csv.php b/src/exporter/class-tainacan-csv.php
index b83b8676b..ea1b82ee9 100644
--- a/src/exporter/class-tainacan-csv.php
+++ b/src/exporter/class-tainacan-csv.php
@@ -112,10 +112,18 @@ class CSV extends Exporter {
 				
 				$metadata = $collection->get_metadata();
 				foreach ($metadata as $meta) {
-					$line[] = $meta->get_name();
+					$meta_type =  explode('\\', $meta->get_metadata_type()) ;
+					$meta_type = strtolower($meta_type[sizeof($meta_type)-1]);
+
+					$desc_title_meta = $meta->get_name() .
+						($meta->is_multiple() ? '|multiple': '') .
+						($meta->is_required() ? '|required': '') .
+						('|display_' . $meta->get_display()) .
+						($meta->is_collection_key() ? '|collection_key_yes' : '') .
+						('|' . $meta_type);
+
+					$line[] = $desc_title_meta;
 				}
-				
-				
 			}
 		}
 		
diff --git a/src/exporter/class-tainacan-export-handler.php b/src/exporter/class-tainacan-export-handler.php
index 00c969179..8d84c3e32 100644
--- a/src/exporter/class-tainacan-export-handler.php
+++ b/src/exporter/class-tainacan-export-handler.php
@@ -103,6 +103,34 @@ class Export_Handler {
 		}
 		return false;
 	}
+	
+	/**
+	 * Save exporter instance to the database
+	 * @param  Tainacan\Exporter\Exporter $exporter The Importer object
+	 * @return void
+	 */
+	public function save_exporter_instance(\Tainacan\Exporter\Exporter $exporter) {
+		update_option('tnc_transient_' . $exporter->get_id(), $exporter, false);
+	}
+	
+	/**
+	 * Retrieves an Importer instance from the database based on its session_id
+	 * @param  string $session_id The Importer ID
+	 * @return \Tainacan\Exporter\Exporter|false The Importer object, if found. False otherwise
+	 */
+	public function get_exporter_instance_by_session_id($session_id) {
+		$exporter = get_option('tnc_transient_' . $session_id);
+		return $exporter;
+	}
+	
+	/**
+	 * Deletes this exporter instance from the database
+	 * @param  Tainacan\Exporter\Exporter $exporter The Importer object
+	 * @return bool True, if exporter is successfully deleted. False on failure.
+	 */
+	public function delete_exporter_instance(\Tainacan\Exporter\Exporter $exporter) {
+		return delete_option('tnc_transient_' . $exporter->get_id());
+	}
 }
 
 global $Tainacan_Exporter_Handler;
diff --git a/src/exporter/class-tainacan-exporter.php b/src/exporter/class-tainacan-exporter.php
index 43910df11..e35ff4dd7 100644
--- a/src/exporter/class-tainacan-exporter.php
+++ b/src/exporter/class-tainacan-exporter.php
@@ -6,9 +6,6 @@ use Tainacan\Entities;
 abstract class CommunImportExport {
 
 	public function __construct( ) {
-		if (!session_id()) {
-			@session_start();
-		}
 		$this->id = uniqid();
 		$author = get_current_user_id();
 		if($author) {
@@ -20,7 +17,7 @@ abstract class CommunImportExport {
 	 * The ID for this importer/exporter session
 	 *
 	 * When creating a new importer/exporter session via API, an id is returned and used to access this
-	 * importer/exporter instance in the SESSION array
+	 * importer/exporter instance. This is temporarly saved in the database and discarded after the bg process is triggered
 	 * 
 	 * @var identifier
 	 */
@@ -516,7 +513,7 @@ class Exporter extends CommunImportExport {
 			'send_email'
 		]);
 		parent::__construct();
-		$_SESSION['tainacan_exporter'][$this->get_id()] = $this;
+
 		if (!empty($attributess)) {
 			foreach ($attributess as $attr => $value) {
 				$method = 'set_' . $attr;
diff --git a/src/gutenberg-blocks/class-tainacan-gutenberg-block.php b/src/gutenberg-blocks/class-tainacan-gutenberg-block.php
index a0dade68d..1b5046874 100644
--- a/src/gutenberg-blocks/class-tainacan-gutenberg-block.php
+++ b/src/gutenberg-blocks/class-tainacan-gutenberg-block.php
@@ -17,6 +17,7 @@ function tainacan_blocks_add_gutenberg_blocks_actions() {
 	add_action('init', 'tainacan_blocks_register_tainacan_items_list');
 	add_action('init', 'tainacan_blocks_register_tainacan_dynamic_items_list');
 	add_action('init', 'tainacan_blocks_register_tainacan_carousel_items_list');
+	add_action('init', 'tainacan_blocks_register_tainacan_carousel_terms_list');
 	add_action('init', 'tainacan_blocks_register_tainacan_search_bar');
 	add_action('init', 'tainacan_blocks_register_tainacan_collections_list');
 	add_action('init', 'tainacan_blocks_register_tainacan_carousel_collections_list');
@@ -176,6 +177,36 @@ function tainacan_blocks_register_tainacan_carousel_items_list(){
 	}
 }
 
+function tainacan_blocks_register_tainacan_carousel_terms_list(){
+	global $TAINACAN_BASE_URL;
+
+	wp_enqueue_script(
+		'carousel-terms-list-theme',
+		$TAINACAN_BASE_URL . '/assets/gutenberg_carousel_terms_list_theme-components.js',
+		array('wp-components')
+	);
+
+	wp_register_script(
+		'carousel-terms-list',
+		$TAINACAN_BASE_URL . '/assets/gutenberg_carousel_terms_list-components.js',
+		array('wp-blocks', 'wp-element', 'wp-components', 'wp-editor')
+	);
+
+	wp_register_style(
+		'carousel-terms-list',
+		$TAINACAN_BASE_URL . '/assets/css/tainacan-gutenberg-block-carousel-terms-list.css',
+		array('wp-edit-blocks')
+	);
+
+	if (function_exists('register_block_type')) {
+		register_block_type( 'tainacan/carousel-terms-list', array(
+			'editor_script' => 'carousel-terms-list',
+			'style'         => 'carousel-terms-list',
+			'script'		=> 'carousel-terms-list-theme'
+		) );
+	}
+}
+
 function tainacan_blocks_register_tainacan_search_bar(){
 	global $TAINACAN_BASE_URL;
 
@@ -281,6 +312,7 @@ function tainacan_blocks_add_plugin_settings() {
 	wp_localize_script( 'items-list', 'tainacan_plugin', $settings );
 	wp_localize_script( 'dynamic-items-list', 'tainacan_plugin', $settings );
 	wp_localize_script( 'carousel-items-list', 'tainacan_plugin', $settings );
+	wp_localize_script( 'carousel-terms-list', 'tainacan_plugin', $settings );
 	wp_localize_script( 'search-bar', 'tainacan_plugin', $settings );
 	wp_localize_script( 'collections-list', 'tainacan_plugin', $settings );
 	wp_localize_script( 'carousel-collections-list', 'tainacan_plugin', $settings );
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..e87700aec 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"
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 2be2ca942..84efe953c 100644
--- a/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/index.js
+++ b/src/gutenberg-blocks/tainacan-collections/carousel-collections-list/index.js
@@ -25,6 +25,7 @@ registerBlockType('tainacan/carousel-collections-list', {
         </svg>,
     category: 'tainacan-blocks',
     keywords: [ __( 'collections', 'tainacan' ), __( 'carousel', 'tainacan' ), __( 'slider', 'tainacan' ) ],
+    description: __('List collections on a Carousel, using search or collection selection.', 'tainacan'),
     attributes: {
         content: {
             type: 'array',
@@ -456,7 +457,7 @@ registerBlockType('tainacan/carousel-collections-list', {
                                     width="24px">
                                 <path d="M18,17v2H12a5.65,5.65,0,0,0-.36-2ZM2,7v7.57a5.74,5.74,0,0,1,2-1.2V7ZM20,6H15L13,4H8A2,2,0,0,0,6,6v7a6,6,0,0,1,5.19,3H20a2,2,0,0,0,2-2V8A2,2,0,0,0,20,6ZM7,16.05v6.06l3.06-3.06ZM5,22.11V16.05L1.94,19.11Z"/>
                             </svg>
-                            {__('List collections on a Carousel, using search or collection selection.', 'tainacan')}
+                            {__('List collections on a Carousel, showing their thumbnails or a preview of items.', 'tainacan')}
                         </p>
                         <Button
                             isPrimary
diff --git a/src/gutenberg-blocks/tainacan-collections/collections-list/index.js b/src/gutenberg-blocks/tainacan-collections/collections-list/index.js
index 22040662d..7281d8d00 100644
--- a/src/gutenberg-blocks/tainacan-collections/collections-list/index.js
+++ b/src/gutenberg-blocks/tainacan-collections/collections-list/index.js
@@ -19,6 +19,7 @@ registerBlockType('tainacan/collections-list', {
         </svg>,
     category: 'tainacan-blocks',
     keywords: [ __( 'Tainacan', 'tainacan' ), __( 'collections', 'tainacan' ), __( 'repository', 'tainacan' ) ],
+    description: __('Expose collections from your Tainacan repository', 'tainacan'),
     attributes: {
         selectedCollectionsObject: {
             type: 'array',
diff --git a/src/gutenberg-blocks/tainacan-facets/facets-list/facets-list-theme.vue b/src/gutenberg-blocks/tainacan-facets/facets-list/facets-list-theme.vue
index d25d45220..9ea3dc21a 100644
--- a/src/gutenberg-blocks/tainacan-facets/facets-list/facets-list-theme.vue
+++ b/src/gutenberg-blocks/tainacan-facets/facets-list/facets-list-theme.vue
@@ -123,8 +123,9 @@
             </button>
             <div
                     v-else
-                    class="spinner-container">
-                {{ facets.length > 0 ? '' : $root.__('Nothing found.', 'tainacan') }}
+                    class="spinner-container"
+                    :style="{ display: facets.length > 0 ? 'none' : 'flex'}">
+                {{ $root.__('Nothing found.', 'tainacan') }}
             </div>
         </div>
     </div>
diff --git a/src/gutenberg-blocks/tainacan-facets/facets-list/index.js b/src/gutenberg-blocks/tainacan-facets/facets-list/index.js
index 831d293c3..95d44c612 100644
--- a/src/gutenberg-blocks/tainacan-facets/facets-list/index.js
+++ b/src/gutenberg-blocks/tainacan-facets/facets-list/index.js
@@ -25,6 +25,7 @@ registerBlockType('tainacan/facets-list', {
         </svg>,
     category: 'tainacan-blocks',
     keywords: [ __( 'facets', 'tainacan' ), __( 'search', 'tainacan' ), __( 'terms', 'tainacan' ) ],
+    description: __('List facets from a Tainacan Collection or Repository', 'tainacan'),
     attributes: {
         content: {
             type: 'array',
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..4035c8efb 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.'
         }
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 76612a41a..30ddffc7f 100644
--- a/src/gutenberg-blocks/tainacan-items/carousel-items-list/index.js
+++ b/src/gutenberg-blocks/tainacan-items/carousel-items-list/index.js
@@ -25,6 +25,7 @@ registerBlockType('tainacan/carousel-items-list', {
         </svg>,
     category: 'tainacan-blocks',
     keywords: [ __( 'items', 'tainacan' ), __( 'carousel', 'tainacan' ), __( 'slider', 'tainacan' ) ],
+    description: __('List items on a Carousel, using search or item selection.', 'tainacan'),
     attributes: {
         content: {
             type: 'array',
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 02e7f9b60..2f54761cf 100644
--- a/src/gutenberg-blocks/tainacan-items/dynamic-items-list/index.js
+++ b/src/gutenberg-blocks/tainacan-items/dynamic-items-list/index.js
@@ -25,6 +25,7 @@ registerBlockType('tainacan/dynamic-items-list', {
         </svg>,
     category: 'tainacan-blocks',
     keywords: [ __( 'items', 'tainacan' ), __( 'search', 'tainacan' ), __( 'collection', 'tainacan' ) ],
+    description: __('Dynamically list items from a Tainacan items search', 'tainacan'),
     attributes: {
         content: {
             type: 'array',
diff --git a/src/gutenberg-blocks/tainacan-items/items-list/index.js b/src/gutenberg-blocks/tainacan-items/items-list/index.js
index b0895c0a1..a5bcc5899 100644
--- a/src/gutenberg-blocks/tainacan-items/items-list/index.js
+++ b/src/gutenberg-blocks/tainacan-items/items-list/index.js
@@ -19,6 +19,7 @@ registerBlockType('tainacan/items-list', {
         </svg>,
     category: 'tainacan-blocks',
     keywords: [ __( 'Tainacan', 'tainacan' ), __( 'items', 'tainacan' ), __( 'collection', 'tainacan' ) ],
+    description: __('Expose items from your Tainacan collections', 'tainacan'),
     attributes: {
         selectedItemsObject: {
             type: 'array',
diff --git a/src/gutenberg-blocks/tainacan-items/search-bar/index.js b/src/gutenberg-blocks/tainacan-items/search-bar/index.js
index 9d3df9d03..a71172a3f 100644
--- a/src/gutenberg-blocks/tainacan-items/search-bar/index.js
+++ b/src/gutenberg-blocks/tainacan-items/search-bar/index.js
@@ -28,6 +28,7 @@ registerBlockType('tainacan/search-bar', {
         </svg>,
     category: 'tainacan-blocks',
     keywords: [ __( 'items', 'tainacan' ), __( 'search', 'tainacan' ), __( 'bar', 'tainacan' ) ],
+    description: __('Set up a custom search bar to redirect to an item\'s list', 'tainacan'),
     attributes: {
         content: {
             type: 'array',
diff --git a/src/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list-theme.js b/src/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list-theme.js
new file mode 100644
index 000000000..92db0b2d1
--- /dev/null
+++ b/src/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list-theme.js
@@ -0,0 +1,75 @@
+import Vue from 'vue';
+import CarouselTermsListTheme from './carousel-terms-list-theme.vue';
+
+// This is rendered on the theme side.
+document.addEventListener("DOMContentLoaded", () => {
+
+    // Gets all divs with content created by our block;
+    let blocks = document.getElementsByClassName('wp-block-tainacan-carousel-terms-list');
+    
+    if (blocks) {
+        let blockIds = Object.values(blocks).map((block) => block.id);
+
+        // Creates a new Vue Instance to manage each block isolatelly
+        for (let blockId of blockIds) {
+
+            // Configure Vue logic before passing it to constructor:
+            let vueOptions = {
+                data: {
+                    selectedItem: [],
+                    maxItemsNumber: 12,
+                    arrowsPosition: 'around',
+                    autoPlay: false,
+                    autoPlaySpeed: 3,
+                    loopSlides: false,
+                    hideName: true,
+                    showTermThumbnail: false,
+                    tainacanApiRoot: '',
+                    tainacanBaseUrl: '',
+                    className: '',
+                    taxonomyId: ''
+                },
+                render(h){ 
+                    return h(CarouselTermsListTheme, {
+                        props: {
+                            blockId: blockId,
+                            selectedTerms: this.selectedTerms,
+                            maxItemsNumber: this.maxItemsNumber,
+                            arrowsPosition: this.arrowsPosition,
+                            autoPlay: this.autoPlay,
+                            autoPlaySpeed: this.autoPlaySpeed,
+                            loopSlides: this.loopSlides,
+                            hideName: this.hideName,
+                            showTermThumbnail: this.showTermThumbnail,
+                            tainacanApiRoot: this.tainacanApiRoot,
+                            tainacanBaseUrl: this.tainacanBaseUrl,
+                            className: this.className,
+                            taxonomyId: this.taxonomyId
+                        }
+                    });
+                },
+                beforeMount () {
+                    this.className = this.$el.attributes.class != undefined ? this.$el.attributes.class.value : undefined;
+                    this.selectedTerms = this.$el.attributes['selected-terms'] != undefined ? JSON.parse(this.$el.attributes['selected-terms'].value) : undefined;
+                    this.maxItemsNumber = this.$el.attributes['max-terms-number'] != undefined ? this.$el.attributes['max-terms-number'].value : undefined;
+                    this.arrowsPosition = this.$el.attributes['arrows-position'] != undefined ? this.$el.attributes['arrows-position'].value : undefined;
+                    this.autoPlay = this.$el.attributes['auto-play'] != undefined ? this.$el.attributes['auto-play'].value == 'true' : false;
+                    this.autoPlaySpeed = this.$el.attributes['auto-play-speed'] != undefined ? this.$el.attributes['auto-play-speed'].value : 3;
+                    this.loopSlides = this.$el.attributes['loop-slides'] != undefined ? this.$el.attributes['loop-slides'].value == 'true' : false;
+                    this.hideName = this.$el.attributes['hide-name'] != undefined ? this.$el.attributes['hide-name'].value == 'true' : false;
+                    this.taxonomyId = this.$el.attributes['taxonomy-id'] != undefined ? this.$el.attributes['taxonomy-id'].value : undefined;
+                    this.showTermThumbnail = this.$el.attributes['show-term-thumbnail'] != undefined ? this.$el.attributes['show-term-thumbnail'].value == 'true' : false;
+                    this.tainacanApiRoot = this.$el.attributes['tainacan-api-root'] != undefined ? this.$el.attributes['tainacan-api-root'].value : undefined;
+                    this.tainacanBaseUrl = this.$el.attributes['tainacan-base-url'] != undefined ? this.$el.attributes['tainacan-base-url'].value : undefined;
+                },
+                methods: {
+                    __(text, domain) {
+                        return wp.i18n.__(text, domain);
+                    }
+                }
+            };
+
+            new Vue( Object.assign({ el: '#' + blockId }, vueOptions) );
+        }
+    }
+});
\ No newline at end of file
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
new file mode 100644
index 000000000..bd00f838a
--- /dev/null
+++ b/src/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list-theme.vue
@@ -0,0 +1,293 @@
+<template>
+    <div :class="className">
+        <div v-if="!isLoading">
+            <div  
+                    :class="'tainacan-carousel has-arrows-' + arrowsPosition"
+                    v-if="terms.length > 0">
+                <swiper 
+                        role="list"
+                        ref="myTermSwiper"
+                        :options="swiperOptions">
+                    <swiper-slide 
+                            role="listitem"
+                            :key="index"
+                            v-for="(term, index) of terms"
+                            :class="'term-list-item ' + (!showTermThumbnail ? 'term-list-item-grid' : '')">      
+                        <a 
+                                v-if="showTermThumbnail"
+                                :id="isNaN(term.id) ? term.id : 'term-id-' + term.id"
+                                :href="term.url"
+                                target="_blank">
+                            <img
+                                :src="term.header_image ? term.header_image : `${tainacanBaseUrl}/admin/images/placeholder_square.png`"
+                                :alt="term.name ? term.name : $root.__('Thumbnail', 'tainacan')" >
+                            <span v-if="!hideName">{{ term.name ? term.name : '' }}</span>
+                        </a>
+                        <a 
+                                v-else
+                                :id="isNaN(term.id) ? term.id : 'term-id-' + term.id"
+                                :href="term.url"
+                                target="_blank">
+                            <div class="term-items-grid">
+                                <img 
+                                    :src="
+                                        termItems[term.id][0] && termItems[term.id][0].thumbnail && termItems[term.id][0].thumbnail['tainacan-medium'][0] && termItems[term.id][0].thumbnail['tainacan-medium'][0] 
+                                            ?
+                                        termItems[term.id][0].thumbnail['tainacan-medium'][0] 
+                                            :
+                                        (termItems[term.id][0] && termItems[term.id][0].thumbnail && termItems[term.id][0].thumbnail['thumbnail'][0] && termItems[term.id][0].thumbnail['thumbnail'][0]
+                                            ?    
+                                        termItems[term.id][0].thumbnail['thumbnail'][0] 
+                                            : 
+                                        `${tainacanBaseUrl}/admin/images/placeholder_square.png`)
+                                    "
+                                    :alt="termItems[term.id][0] && termItems[term.id][0].name ? termItems[term.id][0].name : $root.__( 'Thumbnail', 'tainacan' ) ">
+                                <img
+                                    :src=" 
+                                        termItems[term.id][1] && termItems[term.id][1].thumbnail && termItems[term.id][1].thumbnail['tainacan-medium'][0] && termItems[term.id][1].thumbnail['tainacan-medium'][0] 
+                                            ?
+                                        termItems[term.id][1].thumbnail['tainacan-medium'][0] 
+                                            :
+                                        (termItems[term.id][1] && termItems[term.id][1].thumbnail && termItems[term.id][1].thumbnail['thumbnail'][0] && termItems[term.id][1].thumbnail['thumbnail'][0]
+                                            ?    
+                                        termItems[term.id][1].thumbnail['thumbnail'][0] 
+                                            : 
+                                        `${tainacanBaseUrl}/admin/images/placeholder_square.png`)
+                                    "
+                                    :alt="termItems[term.id][1] && termItems[term.id][1].name ? termItems[term.id][1].name : $root.__( 'Thumbnail', 'tainacan' ) ">
+                                <img
+                                    :src=" 
+                                        termItems[term.id][2] && termItems[term.id][2].thumbnail && termItems[term.id][2].thumbnail['tainacan-medium'][0] && termItems[term.id][2].thumbnail['tainacan-medium'][0] 
+                                            ?
+                                        termItems[term.id][2].thumbnail['tainacan-medium'][0] 
+                                            :
+                                        (termItems[term.id][2] && termItems[term.id][2].thumbnail && termItems[term.id][2].thumbnail['thumbnail'][0] && termItems[term.id][2].thumbnail['thumbnail'][0]
+                                            ?    
+                                        termItems[term.id][2].thumbnail['thumbnail'][0] 
+                                            : 
+                                        `${tainacanBaseUrl}/admin/images/placeholder_square.png`)
+                                    "
+                                    :alt="termItems[term.id][2] && termItems[term.id][2].name ? termItems[term.id][2].name : $root.__( 'Thumbnail', 'tainacan' ) ">
+                            </div>
+                            <span v-if="!hideName">{{ term.name ? term.name : '' }}</span>
+                        </a>
+                    </swiper-slide>
+                </swiper>
+                <button 
+                        class="swiper-button-prev" 
+                        :id="blockId + '-prev'" 
+                        slot="button-prev"
+                        :style="hideName ? 'top: calc(50% - 21px)' : 'top: calc(50% - 42px)'">
+                    <svg
+                            width="42"
+                            height="42"
+                            viewBox="0 0 24 24">
+                        <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z"/>
+                        <path
+                                d="M0 0h24v24H0z"
+                                fill="none"/>                         
+                    </svg>
+                </button>
+                <button 
+                        class="swiper-button-next" 
+                        :id="blockId + '-next'" 
+                        slot="button-next"
+                        :style="hideName ? 'top: calc(50% - 21px)' : 'top: calc(50% - 42px)'">
+                    <svg
+                            width="42"
+                            height="42"
+                            viewBox="0 0 24 24">
+                        <path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/>
+                        <path
+                                d="M0 0h24v24H0z"
+                                fill="none"/>                        
+                    </svg>
+                </button>
+            </div>
+            <div
+                    v-else
+                    class="spinner-container">
+                {{ $root.__('No terms found.', 'tainacan') }}
+            </div>
+            <!-- Swiper buttons are hidden as they actually swipe from slide to slide -->
+        </div>
+        <div v-else-if="isLoading && !autoPlay && !loopSlides">
+            <div :class="'tainacan-carousel has-arrows-' + arrowsPosition">
+                <swiper 
+                        role="list"
+                        ref="myTermSwiper"
+                        :options="swiperOptions">
+                    <swiper-slide 
+                            role="listitem"
+                            :key="index"
+                            v-for="(term, index) of 18"
+                            class="term-list-item skeleton">      
+                        <a>
+                            <img>
+                            <span v-if="!hideName" />
+                        </a>
+                    </swiper-slide>
+                </swiper>
+                <button 
+                        class="swiper-button-prev" 
+                        :id="blockId + '-prev'" 
+                        slot="button-prev"
+                        :style="hideName ? 'top: calc(50% - 21px)' : 'top: calc(50% - 42px)'">
+                    <svg
+                            width="42"
+                            height="42"
+                            viewBox="0 0 24 24">
+                        <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z"/>
+                        <path
+                                d="M0 0h24v24H0z"
+                                fill="none"/>                         
+                    </svg>
+                </button>
+                <button 
+                        class="swiper-button-next" 
+                        :id="blockId + '-next'" 
+                        slot="button-next"
+                        :style="hideName ? 'top: calc(50% - 21px)' : 'top: calc(50% - 42px)'">
+                    <svg
+                            width="42"
+                            height="42"
+                            viewBox="0 0 24 24">
+                        <path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/>
+                        <path
+                                d="M0 0h24v24H0z"
+                                fill="none"/>                        
+                    </svg>
+                </button>
+            </div>
+        </div>
+    </div>
+</template>
+ 
+<script>
+import axios from 'axios';
+import qs from 'qs';
+import 'swiper/dist/css/swiper.css';
+import { swiper, swiperSlide } from 'vue-awesome-swiper';
+
+export default {
+    name: "CarouselTermsListTheme",
+    data() {
+        return {
+            terms: [],
+            termItems: {},
+            term: undefined,
+            termsRequestSource: undefined,
+            isLoading: false,
+            isLoadingTerm: false,
+            localMaxTermsNumber: undefined,
+            localOrder: undefined,
+            tainacanAxios: undefined,
+            paged: undefined,
+            totalTerms: 0,
+            swiperOptions: {
+                mousewheel: true,
+                observer: true,
+                preventInteractionOnTransition: true,
+                allowClick: true,
+                allowTouchMove: true, 
+                slidesPerView: this.showTermThumbnail ? 6 : 5,
+                slidesPerGroup: 1,
+                spaceBetween: this.showTermThumbnail ? 32 : 16,
+                slideToClickedSlide: true,
+                navigation: {
+                    nextEl: '#' + this.blockId + '-next',
+                    prevEl: '#' + this.blockId + '-prev',
+                },
+                breakpoints: {
+                    498:  { slidesPerView: this.showTermThumbnail ? 1 : 1 },
+                    768:  { slidesPerView: this.showTermThumbnail ? 2 : 1 },
+                    1024: { slidesPerView: this.showTermThumbnail ? 3 : 2 },
+                    1366: { slidesPerView: this.showTermThumbnail ? 4 : 3 },
+                    1600: { slidesPerView: this.showTermThumbnail ? 5 : 4 },
+                },
+                autoplay: this.autoPlay ? { delay: this.autoPlaySpeed*1000 } : false,
+                loop: this.loopSlides
+            },
+            errorMessage: 'No terms found.'
+        }
+    },
+    components: {
+        swiper,
+        swiperSlide
+    },
+    props: {
+        blockId: String,
+        selectedTerms: Array,
+        maxTermsNumber: Number,
+        arrowsPosition: String,
+        autoPlay: false,
+        autoPlaySpeed: Number,
+        loopSlides: Boolean,
+        hideName: Boolean,
+        showTermThumbnail: Boolean,
+        tainacanApiRoot: String,
+        tainacanBaseUrl: String,
+        className: String,
+        taxonomyId: String
+    },
+    methods: {
+        fetchTerms() {
+            this.isLoading = true;
+            this.errorMessage = 'No terms found.';
+            
+            if (this.termsRequestSource != undefined && typeof this.termsRequestSource == 'function')
+                this.termsRequestSource.cancel('Previous terms search canceled.');
+
+            this.termsRequestSource = axios.CancelToken.source();
+
+            let endpoint = '/taxonomy/' + this.taxonomyId + '/terms/?'+ qs.stringify({ include: this.selectedTerms }) + '&fetch_only=id,name,url,header_image';
+
+            this.tainacanAxios.get(endpoint, { cancelToken: this.termsRequestSource.token })
+                .then(response => {
+
+                    if (this.showTermThumbnail) {
+                        for (let term of response.data)
+                            this.terms.push(term);
+
+                        this.isLoading = false;
+                    } else {
+                        let promises = [];
+                        for (let term of response.data) {  
+                            promises.push(
+                                this.tainacanAxios.get('/items/?perpage=3&fetch_only=name,url,thumbnail&taxquery[0][taxonomy]=tnc_tax_' + this.taxonomyId + '&taxquery[0][terms][0]=' + term.id + '&taxquery[0][compare]=IN')
+                                    .then(response => { return({ termId: term.id, termItems: response.data.items }) })
+                            );    
+                            this.terms.push(term);                  
+                        }
+                        axios.all(promises).then((results) => {
+                            for (let result of results) {
+                                this.termItems[result.termId] = result.termItems;
+                            }
+                            
+                            this.isLoading = false;
+                        }) 
+                    }
+                    
+                    this.totalTerms = response.headers['x-wp-total'];
+
+                }).catch((error) => { 
+                    this.isLoading = false;
+                     if (error.response && error.response.status && error.response.status == 401)
+                            this.errorMessage = 'Not allowed to see these terms.'
+
+                });
+            
+        },
+    },
+    created() {
+        this.tainacanAxios = axios.create({ baseURL: this.tainacanApiRoot });
+        this.fetchTerms();
+    },
+}
+</script>
+
+<style lang="scss">
+
+    @import './carousel-terms-list.scss';
+
+</style>
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
new file mode 100644
index 000000000..68dff7d07
--- /dev/null
+++ b/src/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list.scss
@@ -0,0 +1,360 @@
+@import '../../gutenberg-blocks-style.scss';
+
+.components-panel__body .term-carousel-view-modes {
+    display: flex;
+    margin: 12px 0 24px 0;
+
+    button {
+        background: transparent;
+        border: 1px solid #cbcbcb;
+        border-radius: 5px;
+        padding: 2px;
+        margin: 0;
+        width: calc(50% - 6px);
+        flex-shrink: 0;
+        cursor: pointer;
+        transition: border ease 0.5s, opacity ease 0.5;
+
+        &.term-carousel-view-mode-grid {
+            margin-right: 6px;
+            div {
+                display: grid;
+                grid-template-columns: 33% 33% 33%;
+                grid-template-rows: 50% 50%;
+                grid-column-gap: 2px;
+                grid-row-gap: 2px;
+                width: 60px;
+                height: 40px;
+                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;
+                    width: 41px;
+                    height: 42px;
+                }
+
+                &>div { 
+                    width: 20px;
+                    height: 20px;
+                    background: #555758;
+                    transition: background-color ease 0.5s; 
+                }
+            }
+        }
+        &.term-carousel-view-mode-thumbnail {
+            margin-left: 6px;
+
+            div {
+                display: block;
+                height: 40px;
+                width: 40px;
+                background: #555758;
+                margin: 4px auto 8px auto;
+                transition: background-color ease 0.5s;
+            }
+        }
+
+        label {
+            font-size: 0.75rem;
+            color: #555758;
+        }
+
+        &.is-active {
+            border: 2px solid #298596;
+            
+            &.term-carousel-view-mode-thumbnail div,
+            &.term-carousel-view-mode-grid div>div {
+                background-color: #298596;
+            }    
+        }
+        &:hover {
+            opacity: 0.9;
+            border-width: 2px;
+            button {
+                background: #f2f2f2;
+            }
+        }
+
+    }
+}
+
+.wp-block-tainacan-carousel-terms-list {
+    margin: 2rem 0px;
+
+    // Spinner
+    .spinner-container {
+        min-height: 56px;
+        padding: 1rem;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        color: #555758;
+    }
+
+    // Skeleton loading
+    @-webkit-keyframes skeleton-animation {
+        0%{opacity: 1.0}
+        50%{opacity: 0.2}
+        100%{opacity: 1.0}
+    }
+    @-moz-keyframes skeleton-animation {
+        0%{opacity: 1.0}
+        50%{opacity: 0.2}
+        100%{opacity: 1.0}
+    }
+    @-o-keyframes skeleton-animation {
+        0%{opacity: 1.0}
+        50%{opacity: 0.2}
+        100%{opacity: 1.0}
+    }
+    @keyframes skeleton-animation {
+        0%{opacity: 1.0}
+        50%{opacity: 0.2}
+        100%{opacity: 1.0}
+    }
+    .skeleton {
+        border-radius: 2px;
+        background: #f2f2f2;
+
+        -webkit-animation: skeleton-animation 1.8s ease infinite;
+        -moz-animation: skeleton-animation 1.8s ease infinite;
+        -o-animation: skeleton-animation 1.8s ease infinite;
+        animation: skeleton-animation 1.8s ease infinite;
+    }
+
+    // Tainacan Carousel
+    .tainacan-carousel {
+        position: relative;
+        width: calc(100% + 40px);
+        left: -20px;
+
+        .swiper-container {
+            margin: 0 50px;
+
+            a>span,
+            a:hover>span {
+                color: black;
+                font-weight: bold;
+                text-decoration: none;
+                padding: 8px 16px;
+                display: block;
+                line-height: 1.2rem;
+            }
+            a>img {
+                width: 100%;
+                height: auto;
+            }
+            a:hover {
+                text-decoration: none;
+            }
+
+            .swiper-slide.term-list-item-grid {
+
+                a { 
+                    width: 100%; 
+                    display: block;
+                }
+                .term-items-grid {
+                    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;
+                    }
+    
+                    img { 
+                        width: 100%;
+                        height: auto;
+                        padding: 2px;
+                        margin-bottom: 0px; 
+                    }
+                }    
+            }
+        }
+    }
+
+    .preview-warning {
+        width: 100%;
+        font-size: 0.875rem;
+        font-style: italic;
+        color: #898d8f;
+        text-align: center;
+        margin: 4px auto;
+    }
+
+    // Next and previous buttons
+    .swiper-button-prev, .swiper-button-next {
+        top: calc(50% - 42px);
+        bottom: initial;
+        background: none;
+        border: none;
+        width: 42px;
+        height: 42px;
+        padding: 0;
+        margin: 0 -4px;
+
+        svg {
+            fill: #298596;
+        }
+    }
+
+    // Carousel placeholder on editor side  ----------------------------------------------------
+    .terms-list-edit-container,
+    .tainacan-carousel {
+        position: relative;
+        
+        & .skeleton {
+            min-height: 150px;
+            max-height: 150px;
+        }
+
+        &.has-arrows-none .swiper-button-prev,
+        &.has-arrows-none .swiper-button-next {
+            display: none;
+        }
+        &.has-arrows-left .swiper-button-next {
+            left: 10px;
+            right: auto;
+            top: calc(50% + 12px)  !important;
+        }
+        &.has-arrows-right .swiper-button-prev {
+            right: 10px;
+            left: auto;
+        }
+        &.has-arrows-right .swiper-button-next {
+            top: calc(50% + 12px)  !important;
+        }
+    }
+    ul.terms-list-edit {
+        display: flex;
+        align-items: flex-start;
+        overflow-x: scroll;
+        list-style: none;
+        margin: 0 36px;
+
+        li.term-list-item {
+            position: relative;
+            display: block;
+            margin: 16px 32px 16px 0px;
+            width: calc(16.666% - 32px); 
+            min-width: calc(16.666% - 32px);
+
+            &.term-list-item-grid {
+                margin: 16px;
+                width: calc(25% - 16px); 
+                min-width: calc(25% - 16px);
+            }
+
+            a { 
+                color: #454647; 
+                font-weight: bold;
+                line-height: normal;
+            }
+
+            img {
+                height: auto;
+                padding: 0px;
+                margin-bottom: 0.5rem;
+            }
+
+            &:hover a { 
+                color: #454647; 
+                text-decoration: none;
+            }
+        
+            button {
+                position: absolute !important;
+                background-color: rgba(255, 255, 255, 0.75);
+                color: #454647;
+                padding: 2px;
+                margin-left: 5px;
+                min-width: 14px;
+                visibility: hidden;
+                position: relative;
+                opacity: 0;
+                right: -14px;
+                top: 0px;
+                justify-content: center;
+                z-index: 999;
+            }
+    
+            &:hover button {
+                visibility: visible;
+                background-color: rgba(255, 255, 255, 1) !important;
+                opacity: 1;
+                right: -8px;
+                top: -8px;
+                border: 1px solid #cbcbcb;
+                border-radius: 12px;
+                transition: opacity linear 0.15s, right linear 0.15s;
+            }
+            &:hover button:hover {
+                background-color: rgba(255, 255, 255, 1) !important;
+                border: 1px solid #cbcbcb !important;
+            }
+
+
+            .term-items-grid {
+                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;
+                }
+
+                img { 
+                    padding: 2px;
+                    margin-bottom: 0px; 
+                }
+            }
+        }
+    }
+    @media only screen and (max-width: 1686px) { 
+        
+        ul.terms-list-edit li.term-list-item { 
+            width: calc(20% - 32px); 
+            min-width: calc(20% - 32px); 
+        }
+    }
+    @media only screen and (max-width: 1452px) { 
+        
+        ul.terms-list-edit li.term-list-item { 
+            width: calc(25% - 32px); 
+            min-width: calc(25% - 32px); 
+        }
+    }
+    @media only screen and (max-width: 1118px) { 
+        
+        ul.terms-edit li.term-list-item { 
+            width: calc(33.333% - 32px); 
+            min-width: calc(33.333% - 32px); 
+        }
+    }
+    @media only screen and (max-width: 854px) { 
+        
+        ul.terms-list-edit li.term-list-item { 
+            width: calc(50% - 32px); 
+            min-width: calc(50% - 32px);
+        }
+    }
+    @media only screen and (max-width: 584px) { 
+        
+        ul.terms-list-edit li.term-list-item { 
+            width: calc(100% - 32px); 
+            min-width: calc(100% - 32px);
+        }
+    }
+
+}
diff --git a/src/gutenberg-blocks/tainacan-terms/carousel-terms-list/index.js b/src/gutenberg-blocks/tainacan-terms/carousel-terms-list/index.js
new file mode 100644
index 000000000..5652dcc43
--- /dev/null
+++ b/src/gutenberg-blocks/tainacan-terms/carousel-terms-list/index.js
@@ -0,0 +1,556 @@
+const { registerBlockType } = wp.blocks;
+
+const { __ } = wp.i18n;
+
+const { RangeControl, Spinner, Button, BaseControl, ToggleControl, SelectControl, Placeholder, IconButton, PanelBody } = wp.components;
+
+const { InspectorControls } = wp.editor;
+
+import TermsModal from '../terms-list/terms-modal.js';
+import tainacan from '../../api-client/axios.js';
+import axios from 'axios';
+import qs from 'qs';
+
+registerBlockType('tainacan/carousel-terms-list', {
+    title: __('Tainacan Terms Carousel', 'tainacan'),
+    icon:
+        <svg
+                xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 0 24 24"
+                height="24px"
+                width="24px">
+            <path
+                fill="#298596"
+                d="M21.43,14.64,19.32,17a2.57,2.57,0,0,1-2,1H12.05a6,6,0,0,0-6-6H6V10.64A2.59,2.59,0,0,1,8.59,8H17.3a2.57,2.57,0,0,1,2,1l2.11,2.38A2.59,2.59,0,0,1,21.43,14.64ZM4,4A2,2,0,0,0,2,6v7.63a5.74,5.74,0,0,1,2-1.2V6H16V4ZM7,15.05v6.06l3.06-3.06ZM5,21.11V15.05L1.94,18.11Z"/>
+        </svg>,
+    category: 'tainacan-blocks',
+    keywords: [ __( 'terms', 'tainacan' ), __( 'carousel', 'tainacan' ), __( 'slider', 'tainacan' ),  __( 'taxonomy', 'tainacan' ) ],
+    description: __('List terms on a Carousel, showing their thumbnails or a preview of items.', 'tainacan'),
+    attributes: {
+        content: {
+            type: 'array',
+            source: 'children',
+            selector: 'div'
+        },
+        terms: {
+            type: Array,
+            default: []
+        },
+        isModalOpen: {
+            type: Boolean,
+            default: false
+        },
+        selectedTerms: {
+            type: Array,
+            default: []
+        },
+        itemsRequestSource: {
+            type: String,
+            default: undefined
+        },
+        maxTermsNumber: {
+            type: Number,
+            value: undefined
+        },
+        isLoading: {
+            type: Boolean,
+            value: false
+        },
+        isLoadingTerm: {
+            type: Boolean,
+            value: false
+        },
+        arrowsPosition: {
+            type: String,
+            value: 'search'
+        },
+        autoPlay: {
+            type: Boolean,
+            value: false
+        },
+        autoPlaySpeed: {
+            type: Number,
+            value: 3
+        },
+        loopSlides: {
+            type: Boolean,
+            value: false
+        },
+        hideName: {
+            type: Boolean,
+            value: true
+        },
+        showTermThumbnail: {
+            type: Boolean,
+            value: false
+        },
+        term: {
+            type: Object,
+            value: undefined
+        },
+        blockId: {
+            type: String,
+            default: undefined
+        },
+        termBackgroundColor: {
+            type: String,
+            default: "#454647"
+        },
+        termTextColor: {
+            type: String,
+            default: "#ffffff"
+        },
+        taxonomyId: {
+            type: String,
+            default: undefined
+        }
+    },
+    supports: {
+        align: ['full', 'wide'],
+        html: false,
+        multiple: true
+    },
+    edit({ attributes, setAttributes, className, isSelected, clientId }){
+        let {
+            terms, 
+            content, 
+            isModalOpen,
+            itemsRequestSource,
+            selectedTerms,
+            isLoading,
+            arrowsPosition,
+            autoPlay,
+            autoPlaySpeed,
+            loopSlides,
+            hideName,
+            showTermThumbnail,
+            taxonomyId
+        } = attributes;
+
+        // Obtains block's client id to render it on save function
+        setAttributes({ blockId: clientId });
+        
+        function prepareItem(term, termItems) {
+            return (
+                <li 
+                    key={ term.id }
+                    className={ 'term-list-item ' + (!showTermThumbnail ? 'term-list-item-grid' : '')}>   
+                    <IconButton
+                        onClick={ () => removeItemOfId(term.id) }
+                        icon="no-alt"
+                        label={__('Remove', 'tainacan')}/>
+                    <a 
+                        id={ isNaN(term.id) ? term.id : 'term-id-' + term.id }
+                        href={ term.url } 
+                        target="_blank">
+                        { !showTermThumbnail ? 
+                            <div class="term-items-grid">
+                                <img 
+                                    src={ 
+                                        termItems[0] && termItems[0].thumbnail && termItems[0].thumbnail['tainacan-medium'][0] && termItems[0].thumbnail['tainacan-medium'][0] 
+                                            ?
+                                        termItems[0].thumbnail['tainacan-medium'][0] 
+                                            :
+                                        (termItems[0] && termItems[0].thumbnail && termItems[0].thumbnail['thumbnail'][0] && termItems[0].thumbnail['thumbnail'][0]
+                                            ?    
+                                        termItems[0].thumbnail['thumbnail'][0] 
+                                            : 
+                                        `${tainacan_plugin.base_url}/admin/images/placeholder_square.png`)
+                                    }
+                                    alt={ termItems[0] && termItems[0].name ? termItems[0].name : __( 'Thumbnail', 'tainacan' ) }/>
+                                <img
+                                    src={ 
+                                        termItems[1] && termItems[1].thumbnail && termItems[1].thumbnail['tainacan-medium'][0] && termItems[1].thumbnail['tainacan-medium'][0] 
+                                            ?
+                                        termItems[1].thumbnail['tainacan-medium'][0] 
+                                            :
+                                        (termItems[1] && termItems[1].thumbnail && termItems[1].thumbnail['thumbnail'][0] && termItems[1].thumbnail['thumbnail'][0]
+                                            ?    
+                                        termItems[1].thumbnail['thumbnail'][0] 
+                                            : 
+                                        `${tainacan_plugin.base_url}/admin/images/placeholder_square.png`)
+                                    }
+                                    alt={ termItems[1] && termItems[1].name ? termItems[1].name : __( 'Thumbnail', 'tainacan' ) }/>
+                                <img
+                                    src={ 
+                                        termItems[2] && termItems[2].thumbnail && termItems[2].thumbnail['tainacan-medium'][0] && termItems[2].thumbnail['tainacan-medium'][0] 
+                                            ?
+                                        termItems[2].thumbnail['tainacan-medium'][0] 
+                                            :
+                                        (termItems[2] && termItems[2].thumbnail && termItems[2].thumbnail['thumbnail'][0] && termItems[2].thumbnail['thumbnail'][0]
+                                            ?    
+                                        termItems[2].thumbnail['thumbnail'][0] 
+                                            : 
+                                        `${tainacan_plugin.base_url}/admin/images/placeholder_square.png`)
+                                    }
+                                    alt={ termItems[2] && termItems[2].name ? termItems[2].name : __( 'Thumbnail', 'tainacan' ) }/>
+                            </div>
+                            :
+                            <img
+                                src={ term.header_image ? term.header_image : `${tainacan_plugin.base_url}/admin/images/placeholder_square.png`}
+                                alt={ term.name ? term.name : __( 'Thumbnail', 'tainacan' )}/>
+                        }
+                        { !hideName ? <span>{ term.name ? term.name : '' }</span> : null }
+                    </a>
+                </li>
+            );
+        }
+
+        function setContent(){
+            isLoading = true;
+
+            setAttributes({
+                isLoading: isLoading
+            });
+
+            if (itemsRequestSource != undefined && typeof itemsRequestSource == 'function')
+                itemsRequestSource.cancel('Previous terms search canceled.');
+
+            itemsRequestSource = axios.CancelToken.source();
+
+            terms = [];
+
+            let endpoint = '/taxonomy/' + taxonomyId + '/terms/?'+ qs.stringify({ include: selectedTerms }) + '&fetch_only=id,name,url,header_image';
+            tainacan.get(endpoint, { cancelToken: itemsRequestSource.token })
+                .then(response => {
+
+                    if (showTermThumbnail) {
+                        for (let term of response.data) { 
+                            terms.push(prepareItem(term));
+                        }
+                        setAttributes({
+                            content: <div></div>,
+                            terms: terms,
+                            isLoading: false,
+                            itemsRequestSource: itemsRequestSource
+                        });
+                    } 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 }) })
+                                    .catch((error) => console.log(error))
+                            );                      
+                        }
+                        axios.all(promises).then((results) => {
+                            for (let result of results) {
+                                terms.push(prepareItem(result.term, result.termItems));
+                            }
+                            setAttributes({
+                                content: <div></div>,
+                                terms: terms,
+                                isLoading: false,
+                                itemsRequestSource: itemsRequestSource
+                            });
+                        })  
+                    }
+                });
+        }
+
+        function openCarouselModal() {
+            isModalOpen = true;
+            setAttributes( { 
+                isModalOpen: isModalOpen
+            } );
+        }
+
+        function removeItemOfId(itemId) {
+
+            let existingItemIndex = terms.findIndex((existingItem) => existingItem.key == itemId);
+            if (existingItemIndex >= 0)
+                terms.splice(existingItemIndex, 1);
+
+            let existingSelectedItemIndex = selectedTerms.findIndex((existingSelectedItem) => existingSelectedItem == itemId);
+            if (existingSelectedItemIndex >= 0)
+                selectedTerms.splice(existingSelectedItemIndex, 1);
+        
+            setAttributes({ 
+                selectedTerms: selectedTerms,
+                terms: terms,
+                content: <div></div> 
+            });
+        }
+
+        // Executed only on the first load of page
+        if(content && content.length && content[0].type)
+            setContent();
+
+        return (
+            <div className={className}>
+
+                <div>
+                    <InspectorControls>
+
+                        <PanelBody
+                                title={__('Carousel', 'tainacan')}
+                                initialOpen={ true }
+                            >
+                            <div>
+                                {/* <ToggleControl
+                                            label={__('Show term\'s thumbnail', 'tainacan')}
+                                            help={ !showTermThumbnail ? __('Toggle to show items grid instead of term\'s thumbnail', 'tainacan') : __('Do not show term\'s thumbnail instead of items grid', 'tainacan')}
+                                            checked={ showTermThumbnail ? showTermThumbnail : false }
+                                            onChange={ ( isChecked ) => {
+                                                    showTermThumbnail = isChecked;
+                                                    setAttributes({ showTermThumbnail: showTermThumbnail });
+                                                    setContent();
+                                                } 
+                                            }
+                                        /> */}
+                                <BaseControl
+                                        id="term-carousel-view-modes"
+                                        label={ __('Term layout', 'tainacan')}>
+                                    <div className="term-carousel-view-modes">
+                                        <button
+                                                onClick={ () => {
+                                                        showTermThumbnail = false;
+                                                        setAttributes({ showTermThumbnail: showTermThumbnail });
+                                                        setContent();    
+                                                    }
+                                                }
+                                                className={'term-carousel-view-mode-grid' + (showTermThumbnail ? '' : ' is-active')}>
+                                            <div>
+                                                <div />
+                                            <div />
+                                            <div />
+                                            </div>
+                                            <label>{ __('Items\'s grid', 'tainacan') }</label>
+                                        </button>
+                                        <button
+                                                onClick={ () => {
+                                                        showTermThumbnail = true;
+                                                        setAttributes({ showTermThumbnail: showTermThumbnail });
+                                                        setContent();    
+                                                    }
+                                                }
+                                                className={'term-carousel-view-mode-thumbnail' + (showTermThumbnail ? ' is-active' : '')}>
+                                            <div />
+                                            <label>{ __('Thumbnail', 'tainacan') }</label>
+                                        </button>    
+                                    </div>
+                                </BaseControl>
+                                <ToggleControl
+                                        label={__('Hide name', 'tainacan')}
+                                        help={ !hideName ? __('Toggle to hide term\'s name', 'tainacan') : __('Do not hide term\'s name', 'tainacan')}
+                                        checked={ hideName }
+                                        onChange={ ( isChecked ) => {
+                                                hideName = isChecked;
+                                                setAttributes({ hideName: hideName });
+                                                setContent();
+                                            } 
+                                        }
+                                    />
+                                <ToggleControl
+                                        label={__('Loop slides', 'tainacan')}
+                                        help={ !loopSlides ? __('Toggle to make slides loop from first to last', 'tainacan') : __('Do not loop slides from first to last', 'tainacan')}
+                                        checked={ loopSlides }
+                                        onChange={ ( isChecked ) => {
+                                                loopSlides = isChecked;
+                                                setAttributes({ loopSlides: loopSlides });
+                                            } 
+                                        }
+                                    />
+                                <ToggleControl
+                                        label={__('Auto play', 'tainacan')}
+                                        help={ !autoPlay ? __('Toggle to automatically slide to next term', 'tainacan') : __('Do not automatically slide to next term', 'tainacan')}
+                                        checked={ autoPlay }
+                                        onChange={ ( isChecked ) => {
+                                                autoPlay = isChecked;
+                                                setAttributes({ autoPlay: autoPlay });
+                                            } 
+                                        }
+                                    />
+                                { 
+                                    autoPlay ? 
+                                        <RangeControl
+                                            label={__('Seconds before translating to next', 'tainacan')}
+                                            value={ autoPlaySpeed ? autoPlaySpeed : 3 }
+                                            onChange={ ( aAutoPlaySpeed ) => {
+                                                autoPlaySpeed = aAutoPlaySpeed;
+                                                setAttributes( { autoPlaySpeed: aAutoPlaySpeed } ) 
+                                            }}
+                                            min={ 1 }
+                                            max={ 5 }
+                                        />
+                                    : null
+                                }
+                                <SelectControl
+                                    label={__('Arrows', 'tainacan')}
+                                    value={ arrowsPosition }
+                                    options={ [
+                                        { label: __('Around', 'tainacan'), value: 'around' },
+                                        { label: __('Left', 'tainacan'), value: 'left' },
+                                        { label: __('Right', 'tainacan'), value: 'right' }
+                                    ] }
+                                    onChange={ ( aPosition ) => { 
+                                        arrowsPosition = aPosition;
+
+                                        setAttributes({ arrowsPosition: arrowsPosition }); 
+                                    }}/>
+                            </div>                           
+                        </PanelBody>
+                    </InspectorControls>
+                </div>
+
+                { isSelected ? 
+                    (
+                    <div>
+                        { isModalOpen ? 
+                                <TermsModal
+                                    replaceTermId={ false } // The Terms modal adds `term-id-` string to terms ids. Here we dont' need it
+                                    existingTaxonomyId={ taxonomyId } 
+                                    selectedTermsObject={ selectedTerms } 
+                                    onSelectTaxonomy={ (selectedTaxonomyId) => {
+                                        taxonomyId = selectedTaxonomyId;
+                                        setAttributes({ taxonomyId: taxonomyId });
+                                    }}
+                                    onApplySelection={ (aSelectionOfTerms) =>{
+                                        selectedTerms = selectedTerms.concat(aSelectionOfTerms.map((term) => { return term.id; }));
+                                        setAttributes({
+                                            selectedTerms: selectedTerms,
+                                            isModalOpen: false
+                                        });
+                                        setContent();
+                                    }}
+                                    onCancelSelection={ () => setAttributes({ isModalOpen: false }) }/> 
+                                : null
+                        }
+                        
+                        { terms.length ? (
+                            <div className="block-control">
+                                <p>
+                                    <svg
+                                            xmlns="http://www.w3.org/2000/svg"
+                                            viewBox="0 0 24 24"
+                                            height="24px"
+                                            width="24px">
+                                        <path d="M21.43,14.64,19.32,17a2.57,2.57,0,0,1-2,1H12.05a6,6,0,0,0-6-6H6V10.64A2.59,2.59,0,0,1,8.59,8H17.3a2.57,2.57,0,0,1,2,1l2.11,2.38A2.59,2.59,0,0,1,21.43,14.64ZM4,4A2,2,0,0,0,2,6v7.63a5.74,5.74,0,0,1,2-1.2V6H16V4ZM7,15.05v6.06l3.06-3.06ZM5,21.11V15.05L1.94,18.11Z"/>
+                                    </svg>
+                                    {__('List terms on a Carousel', 'tainacan')}
+                                </p>
+                                <Button
+                                    isPrimary
+                                    type="submit"
+                                    onClick={ () => openCarouselModal() }>
+                                    {__('Add more terms', 'tainacan')}
+                                </Button> 
+                            </div>
+                            ): null
+                        }
+                    </div>
+                    ) : null
+                }
+
+                { !terms.length && !isLoading ? (
+                    <Placeholder
+                        icon={(
+                            <img
+                                width={148}
+                                src={ `${tainacan_plugin.base_url}/admin/images/tainacan_logo_header.svg` }
+                                alt="Tainacan Logo"/>
+                        )}>
+                        <p>
+                            <svg
+                                    xmlns="http://www.w3.org/2000/svg"
+                                    viewBox="0 0 24 24"
+                                    height="24px"
+                                    width="24px">
+                                <path d="M21.43,14.64,19.32,17a2.57,2.57,0,0,1-2,1H12.05a6,6,0,0,0-6-6H6V10.64A2.59,2.59,0,0,1,8.59,8H17.3a2.57,2.57,0,0,1,2,1l2.11,2.38A2.59,2.59,0,0,1,21.43,14.64ZM4,4A2,2,0,0,0,2,6v7.63a5.74,5.74,0,0,1,2-1.2V6H16V4ZM7,15.05v6.06l3.06-3.06ZM5,21.11V15.05L1.94,18.11Z"/>
+                            </svg>
+                            {__('List terms on a Carousel, showing their thumbnails or a preview of items.', 'tainacan')}
+                        </p>
+                        <Button
+                            isPrimary
+                            type="submit"
+                            onClick={ () => openCarouselModal() }>
+                            {__('Select Terms', 'tainacan')}
+                        </Button>   
+                    </Placeholder>
+                    ) : null
+                }
+                
+                { isLoading ? 
+                    <div class="spinner-container">
+                        <Spinner />
+                    </div> :
+                    <div>
+                        { isSelected && terms.length ? 
+                            <div class="preview-warning">{__('Warning: this is just a demonstration. To see the carousel in action, either preview or publish your post.', 'tainacan')}</div>
+                            : null
+                        }
+                        {  terms.length ? ( 
+                            <div
+                                    className={'terms-list-edit-container ' + (arrowsPosition ? 'has-arrows-' + arrowsPosition : '')}>
+                                <button 
+                                        class="swiper-button-prev" 
+                                        slot="button-prev"
+                                        style={{ cursor: 'not-allowed' }}>
+                                    <svg
+                                            width="42"
+                                            height="42"
+                                            viewBox="0 0 24 24">
+                                        <path d="M15.41 7.41L14 6l-6 6 6 6 1.41-1.41L10.83 12z"/>
+                                        <path
+                                                d="M0 0h24v24H0z"
+                                                fill="none"/>                         
+                                    </svg>
+                                </button>
+                                <ul className={'terms-list-edit'}>
+                                    { terms }
+                                </ul>
+                                <button 
+                                        class="swiper-button-next" 
+                                        slot="button-next"
+                                        style={{ cursor: 'not-allowed' }}>
+                                    <svg
+                                            width="42"
+                                            height="42"
+                                            viewBox="0 0 24 24">
+                                        <path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/>
+                                        <path
+                                                d="M0 0h24v24H0z"
+                                                fill="none"/>                        
+                                    </svg>
+                                </button>
+                            </div>
+                        ):null
+                        }
+                    </div>
+                }
+            </div>
+        );
+    },
+    save({ attributes, className }){
+        const {
+            content, 
+            blockId,
+            selectedTerms,
+            arrowsPosition,
+            maxTermsNumber,
+            autoPlay,
+            autoPlaySpeed,
+            loopSlides,
+            hideName,
+            showTermThumbnail,
+            taxonomyId
+        } = attributes;
+        return <div 
+                    className={ className }
+                    selected-terms={ JSON.stringify(selectedTerms) }
+                    arrows-position={ arrowsPosition }
+                    auto-play={ '' + autoPlay }
+                    auto-play-speed={ autoPlaySpeed }
+                    loop-slides={ '' + loopSlides }
+                    hide-name={ '' + hideName }
+                    max-terms-number={ maxTermsNumber }
+                    taxonomy-id={ taxonomyId }
+                    tainacan-api-root={ tainacan_plugin.root }
+                    tainacan-base-url={ tainacan_plugin.base_url }
+                    show-term-thumbnail={ '' + showTermThumbnail }
+                    id={ 'wp-block-tainacan-carousel-terms-list_' + blockId }>
+                        { content }
+                </div>
+    }
+});
\ No newline at end of file
diff --git a/src/gutenberg-blocks/tainacan-terms/terms-list/index.js b/src/gutenberg-blocks/tainacan-terms/terms-list/index.js
index 99cce818a..b2ba89c73 100644
--- a/src/gutenberg-blocks/tainacan-terms/terms-list/index.js
+++ b/src/gutenberg-blocks/tainacan-terms/terms-list/index.js
@@ -18,6 +18,7 @@ registerBlockType('tainacan/terms-list', {
         </svg>,
     category: 'tainacan-blocks',
     keywords: [ __( 'Tainacan', 'tainacan' ), __( 'terms', 'tainacan' ), __( 'taxonomy', 'tainacan' ) ],
+    description: __('Expose terms from your Tainacan taxonomies', 'tainacan'),
     attributes: {
         selectedTermsObject: {
             type: 'array',
@@ -244,6 +245,7 @@ registerBlockType('tainacan/terms-list', {
                     <div>
                         { isModalOpen ? 
                             <TermsModal
+                                replaceTermId={ true }
                                 existingTaxonomyId={ taxonomyId } 
                                 selectedTermsObject={ selectedTermsObject } 
                                 onSelectTaxonomy={ (selectedTaxonomyId) => {
diff --git a/src/gutenberg-blocks/tainacan-terms/terms-list/terms-modal.js b/src/gutenberg-blocks/tainacan-terms/terms-list/terms-modal.js
index 3be395e69..cdf8b316d 100644
--- a/src/gutenberg-blocks/tainacan-terms/terms-list/terms-modal.js
+++ b/src/gutenberg-blocks/tainacan-terms/terms-list/terms-modal.js
@@ -66,7 +66,7 @@ export default class TermsModal extends React.Component {
         let existingTermIndex = this.state.temporarySelectedTerms.findIndex((existingTerm) => (existingTerm.id == 'term-id-' + term.id) || (existingTerm.id == term.id));
 
         if (existingTermIndex < 0) {
-            let termId = isNaN(term.id) ? term.id : 'term-id-' + term.id;
+            let termId = this.props.replaceTermId ? (isNaN(term.id) ? term.id : 'term-id-' + term.id ) : term.id;
             let aTemporarySelectedTerms = this.state.temporarySelectedTerms;
             aTemporarySelectedTerms.push({
                 id: termId,
diff --git a/src/importer/class-tainacan-bg-importer.php b/src/importer/class-tainacan-bg-importer.php
index e06f9ee20..e8789128a 100644
--- a/src/importer/class-tainacan-bg-importer.php
+++ b/src/importer/class-tainacan-bg-importer.php
@@ -31,6 +31,8 @@ class Background_Importer extends Background_Process {
 		$data = $batch->data;
 		$key = $batch->key;
 		
+		define('TAINACAN_DOING_IMPORT', true);
+		
 		$className = $data['class_name'];
 		if (class_exists($className)) {
 			$object = new $className($data);
diff --git a/src/importer/class-tainacan-csv.php b/src/importer/class-tainacan-csv.php
index 73aea6de4..456831e66 100644
--- a/src/importer/class-tainacan-csv.php
+++ b/src/importer/class-tainacan-csv.php
@@ -604,9 +604,9 @@ class CSV extends Importer {
         $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();
+        // $Tainacan_Items->disable_logs();
+        // $Tainacan_Metadata->disable_logs();
+        // $Tainacan_Item_Metadata->disable_logs();
 		
 		$itemMetadataArray = [];
 		
@@ -622,6 +622,8 @@ class CSV extends Importer {
 			if ( $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.' );
 			}
diff --git a/src/importer/class-tainacan-importer-handler.php b/src/importer/class-tainacan-importer-handler.php
index 6ac53710c..5ac58f5ba 100644
--- a/src/importer/class-tainacan-importer-handler.php
+++ b/src/importer/class-tainacan-importer-handler.php
@@ -187,6 +187,34 @@ class Importer_Handler {
 		return false;
 	}
 	
+	/**
+	 * Save importer instance to the database
+	 * @param  Tainacan\Importer\Importer $importer The Importer object
+	 * @return void
+	 */
+	public function save_importer_instance(\Tainacan\Importer\Importer $importer) {
+		update_option('tnc_transient_' . $importer->get_id(), $importer, false);
+	}
+	
+	/**
+	 * Retrieves an Importer instance from the database based on its session_id
+	 * @param  string $session_id The Importer ID
+	 * @return \Tainacan\Importer\Importer|false The Importer object, if found. False otherwise
+	 */
+	public function get_importer_instance_by_session_id($session_id) {
+		$importer = get_option('tnc_transient_' . $session_id);
+		return $importer;
+	}
+	
+	/**
+	 * Deletes this importer instance from the database
+	 * @param  Tainacan\Importer\Importer $importer The Importer object
+	 * @return bool True, if importer is successfully deleted. False on failure.
+	 */
+	public function delete_importer_instance(\Tainacan\Importer\Importer $importer) {
+		return delete_option('tnc_transient_' . $importer->get_id());
+	}
+	
 	
 }
 
diff --git a/src/importer/class-tainacan-importer.php b/src/importer/class-tainacan-importer.php
index 9841b34dc..ebc8157d5 100644
--- a/src/importer/class-tainacan-importer.php
+++ b/src/importer/class-tainacan-importer.php
@@ -9,7 +9,7 @@ abstract class Importer {
      * The ID for this importer session
      *
      * When creating a new importer session via API, an id is returned and used to access this
-     * importer instance in the SESSION array
+     * importer instance. This is temporarily stored in the database and discarded after the bg process is triggered
      * 
      * @var identifier
      */
@@ -137,9 +137,6 @@ abstract class Importer {
 	];
 
     public function __construct($attributess = array()) {
-        if (!session_id()) {
-            @session_start();
-        }
 
 		$this->id = uniqid();
 
@@ -148,8 +145,6 @@ abstract class Importer {
 			$this->add_transient('author', $author);
 		}
 
-        $_SESSION['tainacan_importer'][$this->get_id()] = $this;
-		
 		if (!empty($attributess)) {
 			foreach ($attributess as $attr => $value) {
 				$method = 'set_' . $attr;
@@ -159,7 +154,8 @@ abstract class Importer {
 			}
 		}
 		
-    }
+		
+	}
 	
 	public function _to_Array($short = false) {
 		$return = ['id' => $this->get_id()];
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-search.js b/src/js/event-bus-search.js
index d114f7351..b7306918b 100644
--- a/src/js/event-bus-search.js
+++ b/src/js/event-bus-search.js
@@ -6,7 +6,6 @@ export default {
             router: options.router,
             store: options.store,
             data: {
-                componentsTag: [],
                 errors : [],
                 query: {},
                 collectionId: undefined,
@@ -16,15 +15,12 @@ export default {
             },
             created() {
                 this.$on('input', data => {
-                    this.$store.dispatch('search/setPage', 1);
-
-                    if( data.taxonomy ){
-                        this.add_taxquery(data);
-                    } else {
-                        this.add_metaquery(data);
-                    }
                     
-                    this.updateURLQueries();
+                    this.$store.dispatch('search/setPage', 1);
+                    if (data.taxonomy)
+                        this.addTaxquery(data);
+                    else
+                        this.addMetaquery(data);
                 });
 
                 this.$on('sendValuesToTags', data => {
@@ -174,24 +170,42 @@ export default {
                     this.$store.dispatch('search/set_advanced_query', data);
                     this.updateURLQueries();
                 },
-                add_metaquery( data ){
+                addMetaquery( data ){
                     if ( data && data.collection_id ){
                         this.$store.dispatch('search/add_metaquery', data );
                     }
-                },
-                removeMetaQuery(query) {
-                    this.$store.dispatch('search/remove_metaquery', query );
                     this.updateURLQueries();
                 },
-                removeMetaFromFilterTag(filterTag) {
-                    this.$emit('removeFromFilterTag', filterTag);
-                    if (filterTag.singleValue == undefined)
-                        this.$store.dispatch('search/removeFilterTag', filterTag);
-                },
-                add_taxquery( data ){
+                addTaxquery( data ){
                     if ( data && data.collection_id ){
                         this.$store.dispatch('search/add_taxquery', data );
                     }
+                    this.updateURLQueries();
+                },
+                removeMetaFromFilterTag(filterTag) {
+
+                    if (filterTag.singleLabel != undefined || filterTag.label != undefined) {
+                        
+                        if (filterTag.taxonomy) {
+                            this.$store.dispatch('search/remove_taxquery', {
+                                filterId: filterTag.filterId,
+                                label: filterTag.singleLabel ? filterTag.singleLabel : filterTag.label,
+                                isMultiValue: filterTag.singleLabel ? false : true,
+                                taxonomy: filterTag.taxonomy,
+                                value: filterTag.value
+                            });
+                        } else {
+                            this.$store.dispatch('search/remove_metaquery', {
+                                filterId: filterTag.filterId,
+                                label: filterTag.singleLabel ? filterTag.singleLabel : filterTag.label,
+                                isMultiValue: filterTag.singleLabel ? false : true,
+                                metadatum_id: filterTag.metadatumId,
+                                value: filterTag.value
+                            });
+                        }
+                        this.$store.dispatch('search/removeFilterTag', filterTag);
+                    }
+                    this.updateURLQueries();
                 },
                 addFetchOnly( metadatum, ignorePrefs, metadatumIDs ){
                     
@@ -217,20 +231,6 @@ export default {
                     this.$store.dispatch('search/remove_fetch_only_meta', metadatum );
                     this.updateURLQueries();             
                 },
-                getErrors( filter_id ){
-                    let error = this.errors.find( errorItem => errorItem.metadatum_id === filter_id );
-                    return ( error ) ? error.errors : false;
-                },
-                // listener(){
-                //     const components = this.getAllComponents();
-                //     for (let eventElement of components){
-                //         eventElement.addEventListener('input', (event) => {
-                //             if( event.detail ) {
-                //                 this.add_metaquery( event.detail[0] );
-                //             }
-                //         });
-                //     }
-                // },
                 setPage(page) {
                     this.$store.dispatch('search/setPage', page);
                     this.updateURLQueries();
@@ -380,26 +380,7 @@ export default {
                     this.$store.dispatch('search/cleanMetaQueries');
                     this.$store.dispatch('search/cleanTaxQueries');
                     this.updateURLQueries();
-                },
-                 /* Dev interfaces methods */
-        
-                registerComponent( name ){
-                    if (this.componentsTag.indexOf(name) < 0) {
-                        this.componentsTag.push( name );
-                    }
-                },
-                getAllComponents(){
-                    const components = [];
-                    for( let component of this.componentsTag ){
-                        const eventElements = document.getElementsByTagName( component );
-                        if( eventElements ) {
-                            for (let eventElement of eventElements){
-                                components.push( eventElement );
-                            }
-                        }
-                    }
-                    return components;
-                },
+                }
             }
         });
     }
diff --git a/src/js/event-bus-web-components.js b/src/js/event-bus-web-components.js
index 11207947a..995e0d85f 100644
--- a/src/js/event-bus-web-components.js
+++ b/src/js/event-bus-web-components.js
@@ -4,14 +4,10 @@ import store from './store/store'
 export const eventBus = new Vue({
     store,
     data: {
-        componentsTag: [],
         errors : []
     },
-    created(){
-        if( tainacan_plugin.components ){
-            this.componentsTag = tainacan_plugin.components;
-        }
-        this.$on('input', this.updateValue );
+    created() {
+        this.$on('input', this.updateValue);
     },
     watch: {
         errors() {
@@ -19,66 +15,45 @@ export const eventBus = new Vue({
         }
     },
     methods : {
-        registerComponent( name ){
-            if (this.componentsTag.indexOf(name) < 0) {
-                this.componentsTag.push( name );
-            }
-        },
-        // listener(){
-        //     const components = this.getAllComponents();
-        //     for (let eventElement of components){
-        //         eventElement.addEventListener('input', (event) => {
-
-        //             if (event.detail && event.detail[0] ){
-        //                 this.updateValue({
-        //                     item_id: $(eventElement).attr("item_id"),
-        //                     metadatum_id: $(eventElement).attr("metadatum_id"),
-        //                     values: event.detail
-        //                 })
-        //             }
-        //         });
-        //     }
-        // }, 
         updateValue(data){
             
             this.$emit('isUpdatingValue', true);
 
-            if ( data.item_id ){
+            if (data.item_id) {
 
-                if(data.values.length > 0 && data.values[0].value){
+                if (data.values.length > 0 && data.values[0].value) {
                     let val = [];
-                    for(let i of data.values){
+                    for (let i of data.values)
                         val.push(i.value);
-                    }
-
+                    
                     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: data.item_id, 
+                    metadatum_id: data.metadatum_id, 
+                    values: 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 == data.metadatum_id );
+                        if ( index >= 0)
+                            this.errors.splice( index, 1);
+                    })
+                    .catch((error) => {
+                        this.$emit('isUpdatingValue', false);
+                        let index = this.errors.findIndex( errorItem => errorItem.metadatum_id == data.metadatum_id );
+                        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: data.metadatum_id, errors: messages });
+                        else
+                            this.errors.push( { metadatum_id: data.metadatum_id, errors: messages } );
                 });
             }
         },
@@ -86,51 +61,12 @@ export const eventBus = new Vue({
             let error = this.errors.find( errorItem => errorItem.metadatum_id == metadatum_id );
             return ( error ) ? error.errors : false
         },
-        clearAllErrors(){
+        clearAllErrors() {
            this.errors = [];
-        },
-        setValues(){
-            const metadatum = this.$store.getters['item/getMetadata'];
-            if( metadatum ){
-                for(let singleMetadata of metadatum){
-                    const eventElement = this.getComponentById( singleMetadata.metadatum_id );
-                    eventElement.value =  singleMetadata.values;
-                }
-            }
-        },
-        getAllComponents(){
-            const components = [];
-            for( let component of this.componentsTag ){
-                const eventElements = document.getElementsByTagName( component );
-                if( eventElements ) {
-                    for (let eventElement of eventElements){
-                        components.push( eventElement );
-                    }
-                }
-            }
-            let elements = document.querySelectorAll('[web-component="true"]');
-            if( elements ) {
-                for (let eventElement of elements){
-                    components.push( eventElement );
-                }
-            }
-            return components;
-        },
-        getComponentById( metadatum_id ){
-            for( let component of this.componentsTag ){
-                const eventElements = document.getElementsByTagName( component );
-                if( eventElements ) {
-                    for (let eventElement of eventElements){
-                        if( eventElement.metadatum_id === metadatum_id ){
-                            return eventElement;
-                        }
-                    }
-                }
-            }
         }
     },
     beforeUpdate() {
-        this.$off('input', this.updateValue );
+        this.$off('input', this.updateValue);
     }
 
 });
diff --git a/src/js/store/modules/activity/actions.js b/src/js/store/modules/activity/actions.js
index 42fe0d9db..935587948 100644
--- a/src/js/store/modules/activity/actions.js
+++ b/src/js/store/modules/activity/actions.js
@@ -1,9 +1,28 @@
-import axios from '../../../axios/axios'
+import axios from '../../../axios/axios';
+import qs from 'qs';
 
+export const fetchActivities = ({ commit }, { page, activitiesPerPage, search, searchDates} ) => {
+
+    let endpoint = `/logs?paged=${page}&perpage=${activitiesPerPage}&context=edit&orderby=id&order=desc`;
+
+    if (search != undefined && search != '')
+        endpoint += `&search=${search}`;
+    
+    if (searchDates && searchDates[0] != null && searchDates[1] != null) {
+        let dateQuery = {
+            datequery: [
+                {
+                    'after': searchDates[0],
+                    'before': searchDates[1],
+                    'inclusive': true
+                }
+            ]
+        };
+        endpoint += '&' + qs.stringify(dateQuery);
+    }
 
-export const fetchActivities = ({ commit }, { page, activitiesPerPage } ) => {
     return new Promise((resolve, reject) => {
-        axios.tainacan.get(`/logs?paged=${page}&perpage=${activitiesPerPage}&context=edit`)
+        axios.tainacan.get(endpoint)
             .then(res => {
                 let activities = res.data;
 
@@ -18,9 +37,28 @@ export const fetchActivities = ({ commit }, { page, activitiesPerPage } ) => {
     });
 };
 
-export const fetchCollectionActivities = ({ commit }, { page, activitiesPerPage, collectionId }) => {
+export const fetchCollectionActivities = ({ commit }, { page, activitiesPerPage, collectionId, search, searchDates }) => {
+
+    let endpoint = `/collection/${collectionId}/logs?paged=${page}&perpage=${activitiesPerPage}&context=edit&orderby=id&order=desc`;
+
+    if (search != undefined && search != '')
+        endpoint += `&search=${search}`;
+
+    if (searchDates && searchDates[0] != null && searchDates[1] != null) {
+        let dateQuery = {
+            datequery: [
+                {
+                    'after': searchDates[0],
+                    'before': searchDates[1],
+                    'inclusive': true
+                }
+            ]
+        };
+        endpoint += '&' + qs.stringify(dateQuery);
+    }
+
     return new Promise((resolve, reject) => {
-        axios.tainacan.get(`/collection/${collectionId}/logs?paged=${page}&perpage=${activitiesPerPage}&context=edit`)
+        axios.tainacan.get(endpoint)
             .then(res => {
                 let activities = res.data;
 
@@ -35,9 +73,28 @@ export const fetchCollectionActivities = ({ commit }, { page, activitiesPerPage,
     });
 };
 
-export const fetchItemActivities = ({ commit }, { page, activitiesPerPage, itemId }) => {
+export const fetchItemActivities = ({ commit }, { page, activitiesPerPage, itemId, search, searchDates }) => {
+
+    let endpoint = `/item/${itemId}/logs?paged=${page}&perpage=${activitiesPerPage}&context=edit&orderby=id&order=desc`;
+
+    if (search != undefined && search != '')
+        endpoint += `&search=${search}`;
+
+    if (searchDates && searchDates[0] != null && searchDates[1] != null) {
+        let dateQuery = {
+            datequery: [
+                {
+                    'after': searchDates[0],
+                    'before': searchDates[1],
+                    'inclusive': true
+                }
+            ]
+        };
+        endpoint += '&' + qs.stringify(dateQuery);
+    }
+
     return new Promise((resolve, reject) => {
-        axios.tainacan.get(`/item/${itemId}/logs?paged=${page}&perpage=${activitiesPerPage}&context=edit`)
+        axios.tainacan.get(endpoint)
             .then(res => {
                 let activities = res.data;
 
@@ -53,6 +110,7 @@ export const fetchItemActivities = ({ commit }, { page, activitiesPerPage, itemI
 };
 
 export const fetchActivity = ({ commit }, activityId) => {
+    commit('clearActivity');
     return new Promise((resolve, reject) => {
        axios.tainacan.get(`/logs/${activityId}?context=edit`)
            .then(res => {
diff --git a/src/js/store/modules/activity/mutations.js b/src/js/store/modules/activity/mutations.js
index 73d4c957d..74e2c9d03 100644
--- a/src/js/store/modules/activity/mutations.js
+++ b/src/js/store/modules/activity/mutations.js
@@ -8,4 +8,8 @@ export const setActivity = (state, activity) => {
 
 export const setActivityTitle = (state, eventTitle) => {
     state.eventTitle = eventTitle;
+};
+
+export const clearActivity = (state) => {
+  state.activity = {};
 };
\ No newline at end of file
diff --git a/src/js/store/modules/collection/actions.js b/src/js/store/modules/collection/actions.js
index 88aedd843..24345ab23 100644
--- a/src/js/store/modules/collection/actions.js
+++ b/src/js/store/modules/collection/actions.js
@@ -137,7 +137,7 @@ export const deleteItem = ({ commit }, { itemId, isPermanently }) => {
     });
 };
  
-export const fetchCollections = ({commit} , { page, collectionsPerPage, status, contextEdit, order, orderby }) => {
+export const fetchCollections = ({commit} , { page, collectionsPerPage, status, contextEdit, order, orderby, search }) => {
     
     return new Promise((resolve, reject) => {
         let endpoint = '/collections?paged='+page+'&perpage='+collectionsPerPage;
@@ -150,25 +150,28 @@ export const fetchCollections = ({commit} , { page, collectionsPerPage, status,
                     
         if (order != undefined && order != '' && orderby != undefined && orderby != '')
             endpoint = endpoint + '&order=' + order + '&orderby=' + orderby;
+        
+        if (search != undefined && search != '')
+            endpoint = endpoint + '&search=' + search;
 
         axios.tainacan.get(endpoint)
-        .then(res => {
-            let collections = res.data;
-            commit('setCollections', collections);
+            .then(res => {
+                let collections = res.data;
+                commit('setCollections', collections);
 
-            commit('setRepositoryTotalCollections', {
-                draft: res.headers['x-tainacan-total-collections-draft'],
-                trash: res.headers['x-tainacan-total-collections-trash'],
-                publish: res.headers['x-tainacan-total-collections-publish'],
-                private: res.headers['x-tainacan-total-collections-private'],
+                commit('setRepositoryTotalCollections', {
+                    draft: res.headers['x-tainacan-total-collections-draft'],
+                    trash: res.headers['x-tainacan-total-collections-trash'],
+                    publish: res.headers['x-tainacan-total-collections-publish'],
+                    private: res.headers['x-tainacan-total-collections-private'],
+                });
+
+                resolve({'collections': collections, 'total': res.headers['x-wp-total'] });
+            }) 
+            .catch(error => {
+                console.log(error);
+                reject(error);
             });
-
-            resolve({'collections': collections, 'total': res.headers['x-wp-total'] });
-        }) 
-        .catch(error => {
-            console.log(error);
-            reject(error);
-        });
     });
 };
 
diff --git a/src/js/store/modules/exporter/actions.js b/src/js/store/modules/exporter/actions.js
index b8ae73fd5..e9f7df725 100644
--- a/src/js/store/modules/exporter/actions.js
+++ b/src/js/store/modules/exporter/actions.js
@@ -26,26 +26,28 @@ export const createExporterSession = ({commit}, slug) => {
 
 export const updateExporterSession = ({commit}, exporterSessionUpdated) => {
 
-    return tainacan.patch(`/exporters/session/${exporterSessionUpdated.id}`, exporterSessionUpdated.body)
-        .then(response => {
-            commit('setExporterSession');
-
-            return response;
-        })
-        .catch(error => {
-            console.error(error.response.data);
-        });
+    return new Promise(( resolve, reject ) => { 
+        tainacan.patch(`/exporters/session/${exporterSessionUpdated.id}`, exporterSessionUpdated.body)
+            .then(response => {
+                commit('setExporterSession');
+                resolve( response.data );
+            })
+            .catch(error => {
+                reject( error.response.data );
+            });
+    });
 };
 
 export const runExporterSession = ({commit}, exporterSessionID) => {
 
-    return tainacan.post(`/exporters/session/${exporterSessionID}/run`)
-        .then(response => {
-            commit('setBackGroundProcessID', response.data);
-
-            return response.data;
-        })
-        .catch(error => {
-            console.error(error.response.data);
-        })
+    return new Promise(( resolve, reject ) => { 
+        tainacan.post(`/exporters/session/${exporterSessionID}/run`)
+            .then(response => {
+                commit('setBackGroundProcessID', response.data);
+                resolve(response.data);
+            })
+            .catch(error => {
+                reject( error.response.data );
+            })
+        });
 };
\ No newline at end of file
diff --git a/src/js/store/modules/filter/actions.js b/src/js/store/modules/filter/actions.js
index 0b2d09fdd..c57fb5523 100644
--- a/src/js/store/modules/filter/actions.js
+++ b/src/js/store/modules/filter/actions.js
@@ -192,10 +192,10 @@ export const fetchRepositoryCollectionFilters = ({ dispatch, commit } ) => {
                             axios.all(promises).then((results) => {
                                 for (let resp of results) {
                                     let repositoryFilters = resp.filter.filter((filter) => { 
-                                        return (filter.collection_id == 'default' || filter.collection_id == 'filter_in_repository')
+                                        return (filter.collection_id == 'default')
                                     });
                                     let collectionFilters = resp.filter.filter((filter) => {
-                                        return (filter.collection_id != 'default' && filter.collection_id != 'filter_in_repository')
+                                        return (filter.collection_id != 'default')
                                     });
                                     commit('setRepositoryCollectionFilters', { collectionName: resp.collectionId, repositoryCollectionFilters: collectionFilters });
                                     commit('setRepositoryCollectionFilters', { collectionName: undefined, repositoryCollectionFilters: repositoryFilters });
@@ -240,10 +240,10 @@ export const fetchTaxonomyFilters = ({ dispatch, commit }, taxonomyId ) => {
                         axios.tainacan.get(endpoint)
                             .then((resp) => {
                                 let repositoryFilters = resp.data.filter((filter) => { 
-                                    return (filter.collection_id == 'default' || filter.collection_id == 'filter_in_repository') && filter.metadatum.metadata_type_object.options.taxonomy_id != taxonomyId
+                                    return (filter.collection_id == 'default') && filter.metadatum.metadata_type_object.options.taxonomy_id != taxonomyId
                                 });
                                 let collectionFilters = resp.data.filter((filter) => {
-                                    return (filter.collection_id != 'default' && filter.collection_id != 'filter_in_repository') && filter.metadatum.metadata_type_object.options.taxonomy_id != taxonomyId
+                                    return (filter.collection_id != 'default') && filter.metadatum.metadata_type_object.options.taxonomy_id != taxonomyId
                                 });
                                 commit('setTaxonomyFiltersForCollection', { collectionName: collectionId, taxonomyFilters: collectionFilters });
                                 commit('setTaxonomyFiltersForCollection', { collectionName: undefined, taxonomyFilters: repositoryFilters });
diff --git a/src/js/store/modules/search/actions.js b/src/js/store/modules/search/actions.js
index 24e8f6f30..7b56b6862 100644
--- a/src/js/store/modules/search/actions.js
+++ b/src/js/store/modules/search/actions.js
@@ -13,8 +13,8 @@ export const set_advanced_query = ({commit}, advancedSearchQuery) => {
 };
 
 // Meta Queries from filters
-export const add_metaquery = ( { commit }, filter  ) => {
-    if (filter && (filter.value == undefined || filter.value == null || filter.value.length === 0 || filter.value == '')) {
+export const add_metaquery = ( { commit }, filter ) => {
+    if (filter && (filter.value === undefined || filter.value === null || filter.value.length === 0 || filter.value === '')) {
         commit('removeMetaQuery', filter  );
     } else {
         commit('addMetaQuery', filter  );
@@ -39,7 +39,7 @@ export const remove_fetch_only_meta = ( { commit }, metadatum ) => {
 
 // Tax Queries from filters
 export const add_taxquery = ( { commit }, filter  ) => {
-    if (filter && (filter.terms == undefined || filter.terms == null || filter.terms == '' || filter.terms.length == 0 )) {
+    if (filter && (filter.terms === undefined || filter.terms === null || filter.terms === '' || filter.terms.length === 0 )) {
         commit('removeTaxQuery', filter  );
     } else {
         commit('addTaxQuery', filter  );
@@ -50,6 +50,10 @@ export const remove_metaquery = ( { commit }, filter  ) => {
     commit('removeMetaQuery', filter  );
 };
 
+export const remove_taxquery = ( { commit }, filter  ) => {
+    commit('removeTaxQuery', filter  );
+};
+
 // Pagination queries
 export const setTotalItems = ({ commit }, total ) => {
     commit('setTotalItems', total);
@@ -142,12 +146,15 @@ export const setAdminViewMode = ({ commit }, adminViewMode ) => {
 
 // Remove filter tag
 export const addFilterTag = ( { commit }, filterTag  ) => {
-    commit('addFilterTag', filterTag  );
+    if (filterTag && (filterTag.value === undefined || filterTag.value === null || filterTag.value === '' || filterTag.value.length === 0 ))
+        commit('removeFilterTag', filterTag);
+    else
+        commit('addFilterTag', filterTag);
 };
 
 // Remove filter tag
 export const removeFilterTag = ( { commit }, filterTag  ) => {
-    commit('removeFilterTag', filterTag  );
+    commit('removeFilterTag', filterTag);
 };
 
 // Remove filter tag
diff --git a/src/js/store/modules/search/mutations.js b/src/js/store/modules/search/mutations.js
index fd51210f7..31ce86310 100644
--- a/src/js/store/modules/search/mutations.js
+++ b/src/js/store/modules/search/mutations.js
@@ -22,7 +22,6 @@ export const addMetaQuery = ( state, filter ) => {
     state.postquery.metaquery = ( ! state.postquery.metaquery  || state.postquery.metaquery.length == undefined ) ? [] : state.postquery.metaquery;
 
     let index = state.postquery.metaquery.findIndex( item => item.key === filter.metadatum_id);
-
     if ( index >= 0 ){
         Vue.set( state.postquery.metaquery, index, {
             key: filter.metadatum_id,
@@ -87,8 +86,6 @@ export const removeFetchOnlyMeta = ( state, metadatum ) => {
         fetch_meta.splice(index, 1);
 
         state.postquery.fetch_only_meta = fetch_meta.toString();
-
-        console.info(state.postquery.fetch_only_meta);
     }
 };
 
@@ -98,15 +95,28 @@ export const removeMetaQuery = ( state, filter ) => {
     let index = state.postquery.metaquery.findIndex( item => item.key == filter.metadatum_id);
 
     if (index >= 0) {
-        state.postquery.metaquery.splice(index, 1);
+        if (!filter.isMultiValue && Array.isArray(state.postquery.metaquery[index].value) && state.postquery.metaquery[index].value.length > 1) {
+            let otherIndex = state.postquery.metaquery[index].value.findIndex(item => item == filter.value);
+            if (otherIndex >= 0)
+                state.postquery.metaquery[index].value.splice(otherIndex, 1)
+        } else
+            state.postquery.metaquery.splice(index, 1);
     }
 };
 
 export const removeTaxQuery = ( state, filter ) => {
-    let index = state.postquery.taxquery.findIndex( item => item.taxonomy == filter.taxonomy);
+    state.postquery.taxquery = ( ! state.postquery.taxquery ) ? [] : state.postquery.taxquery;
 
+    let index = state.postquery.taxquery.findIndex( item => item.taxonomy == filter.taxonomy);
+    
     if (index >= 0) {
-        state.postquery.taxquery.splice(index, 1);
+        if (Array.isArray(state.postquery.taxquery[index].terms) && state.postquery.taxquery[index].terms.length > 1) {
+            let otherIndex = state.postquery.taxquery[index].terms.findIndex(item => item == filter.value);
+
+            if (otherIndex >= 0)
+                state.postquery.taxquery[index].terms.splice(otherIndex, 1)
+        } else
+            state.postquery.taxquery.splice(index, 1);
     }
 };
 
@@ -148,25 +158,22 @@ export const setOrderByName = ( state, orderByName ) => {
 };
 
 export const addFilterTag = ( state, filterTag ) => {
-    state.filter_tags = ( ! state.filter_tags) ? [] : state.filter_tags;
-
+    state.filter_tags = ( ! state.filter_tags) ? [] : state.filter_tags;    
     let index = state.filter_tags.findIndex( tag => tag.filterId == filterTag.filterId);
 
-    if ( index >= 0 ) {
+    if (index >= 0)
         Vue.set(state.filter_tags, index, filterTag);
-    } else {
+    else
         state.filter_tags.push(filterTag);
-    }
 };
 
 export const removeFilterTag = ( state, filterTag ) => {
     state.filter_tags = ( ! state.filter_tags ) ? [] : state.filter_tags;
-
     let index = state.filter_tags.findIndex( tag => tag.filterId == filterTag.filterId);
 
-    if (index >= 0) {
+    if (index >= 0)
         state.filter_tags.splice(index, 1);
-    }
+
 };
 
 export const cleanFilterTags = ( state ) => {
diff --git a/src/js/store/modules/taxonomy/actions.js b/src/js/store/modules/taxonomy/actions.js
index 487649118..a8e886552 100644
--- a/src/js/store/modules/taxonomy/actions.js
+++ b/src/js/store/modules/taxonomy/actions.js
@@ -45,7 +45,7 @@ export const updateTaxonomy = ({ commit }, taxonomy) => {
     });
 };
 
-export const fetch = ({ commit }, { page, taxonomiesPerPage, status, order, orderby } ) => {
+export const fetch = ({ commit }, { page, taxonomiesPerPage, status, order, orderby, search } ) => {
     return new Promise((resolve, reject) => {
         let endpoint = `/taxonomies?paged=${page}&perpage=${taxonomiesPerPage}&context=edit`;
 
@@ -54,6 +54,9 @@ export const fetch = ({ commit }, { page, taxonomiesPerPage, status, order, orde
         
         if (order != undefined && order != '' && orderby != undefined && orderby != '')
             endpoint = endpoint + '&order=' + order + '&orderby=' + orderby;
+        
+        if (search != undefined && search != '')
+            endpoint = endpoint + '&search=' + search;
 
         axios.tainacan.get(endpoint)
             .then(res => {
diff --git a/src/migrations.php b/src/migrations.php
index 3aab96a54..6a99ad5df 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,32 +324,103 @@ 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'"
+		);
+
+	}
+
+	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) {
+			$meta = get_post_meta($id, 'metadata_type_options', true);
+			if ( is_array($meta) && isset($meta['search']) && is_array($meta['search']) && isset($meta['search'][0]) && is_numeric($meta['search'][0]) ) {
+				$meta['search'] = $meta['search'][0];
+				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);
+					}
+
+				}
+
+			}
+
+
+
+
+		}
+
+	}
+
 }
 
 
 
-?>
\ No newline at end of file
+?>
diff --git a/src/readme.txt b/src/readme.txt
index 5f2284e1c..626660e34 100644
--- a/src/readme.txt
+++ b/src/readme.txt
@@ -1,94 +1,94 @@
-=== 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
+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
diff --git a/src/tainacan.php b/src/tainacan.php
index 674d38549..361e6bbf2 100644
--- a/src/tainacan.php
+++ b/src/tainacan.php
@@ -4,13 +4,13 @@ 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.
 Author: Tainacan.org
-Version: 0.12
+Version: 0.13
 Text Domain: tainacan
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 */
 
-const TAINACAN_VERSION = '0.12';
+const TAINACAN_VERSION = '0.13';
 
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 $TAINACAN_BASE_URL = plugins_url('', __FILE__);
diff --git a/tests/_test-api-item-metadata.php b/tests/_test-api-item-metadata.php
new file mode 100644
index 000000000..0cf82f4ff
--- /dev/null
+++ b/tests/_test-api-item-metadata.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Tainacan\Tests;
+
+/**
+ * @group api_item_meta
+ */
+class TAINACAN_REST_Item_Metadata_Controller extends TAINACAN_UnitApiTestCase {
+	protected $item;
+	protected $collection;
+	protected $metadatum;
+	
+	protected function create_meta_requirements() {
+		$collection = $this->tainacan_entity_factory->create_entity(
+			'collection',
+			array(
+				'name' => 'testeItemMetadata',
+				'description' => 'No description',
+			),
+			true,
+			true
+		);
+		
+		$type = $this->tainacan_metadatum_factory->create_metadatum('text');
+		
+		$metadatum = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
+			array(
+				'name'              => 'teste_metadado',
+				'description'       => 'descricao',
+				'collection'        => $collection,
+				'metadata_type'		=> $type,
+				'accept_suggestion'	=> true
+			),
+			true,
+			true
+		);
+		
+		$item = $this->tainacan_entity_factory->create_entity(
+			'item',
+			array(
+				'title'       => 'item_teste_metadado',
+				'description' => 'adasdasdsa',
+				'collection'  => $collection
+			),
+			true,
+			true
+		);
+		$this->collection = $collection;
+		$this->item = $item;
+		$this->metadatum = $metadatum;
+		return ['collection' => $collection, 'item' => $item, 'metadatum' => $metadatum];
+	}
+
+
+	
+}
+
+?>
\ No newline at end of file
diff --git a/tests/_test-logs.php b/tests/_test-logs.php
new file mode 100644
index 000000000..aab578492
--- /dev/null
+++ b/tests/_test-logs.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Tainacan\Tests;
+
+use Tainacan\Entities\Collection;
+use Tainacan\Entities\Log;
+
+/**
+ * Class TestCollections
+ *
+ * @package Test_Tainacan
+ */
+
+/**
+ * Sample test case.
+ */
+class Logs extends TAINACAN_UnitTestCase {
+
+
+	
+}
\ No newline at end of file
diff --git a/tests/test-api-filter-types.php b/tests/test-api-filter-types.php
index 4d284751b..c96b7099f 100644
--- a/tests/test-api-filter-types.php
+++ b/tests/test-api-filter-types.php
@@ -7,7 +7,7 @@ namespace Tainacan\Tests;
  */
 class TAINACAN_REST_Filter_Types_Controller extends TAINACAN_UnitApiTestCase {
 
-	public function test_get_filter_types(){
+	public function test_get_filter_types() {
 
 		$ftype_request = new \WP_REST_Request('GET', $this->namespace . '/filter-types');
 
@@ -17,12 +17,12 @@ class TAINACAN_REST_Filter_Types_Controller extends TAINACAN_UnitApiTestCase {
 
 		$Tainacan_Filters = \Tainacan\Repositories\Filters::get_instance();
 
-		$filter_types = $Tainacan_Filters->fetch_filter_types('NAME');
+		$filter_types = $Tainacan_Filters->fetch_filter_types( );
 
 		$this->assertEquals(count($filter_types), count($data));
 
-		foreach ($data as $ftype){
-			$this->assertContains($ftype['name'], $filter_types);
+		foreach ($data as $ftype) {
+			$this->assertContains($ftype['className'], $filter_types);
 		}
 	}
 }
diff --git a/tests/test-api-filters.php b/tests/test-api-filters.php
index 8e4258761..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 {
 
@@ -25,6 +25,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 				'description'   => 'Is filtered',
 				'collection_id' => $collection->get_id(),
 				'metadata_type'    => 'Tainacan\Metadata_Types\Numeric',
+				'status'      => 'publish'
 			),
 			true,
 			true
@@ -32,7 +33,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 
 		$request_body = json_encode(
 			array(
-				'filter_type'   => 'custom_interval',
+				'filter_type'   => 'Tainacan\Filter_Types\Numeric_Interval',
 				'filter'        => [
 					'name'        => 'Filter name',
 					'description' => 'This is CUSTOM INTERVAL!',
@@ -48,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']);
 	}
 
@@ -69,6 +70,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 				'description' => 'Is filtered',
 				'collection_id' => $collection->get_id(),
 				'metadata_type'    => 'Tainacan\Metadata_Types\Numeric',
+				'status'      => 'publish'
 			),
 			true
 		);
@@ -80,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
 		);
@@ -134,14 +136,13 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			array(
 				'name'        => 'Metadatum filtered',
 				'description' => 'Is filtered',
+				'status' => 'publish',
 				'collection_id' => $collection->get_id(),
 				'metadata_type'    => 'Tainacan\Metadata_Types\Numeric',
 			),
 			true
 		);
 
-		$filter_type = $this->tainacan_filter_factory->create_filter('custom_interval');
-
 		$filter = $this->tainacan_entity_factory->create_entity(
 			'filter',
 			array(
@@ -149,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
 		);
@@ -187,6 +188,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			array(
 				'name'          => 'Metadatum filtered',
 				'description'   => 'Is filtered',
+				'status' => 'publish',
 				'collection_id' => $collection->get_id(),
 				'metadata_type'    => 'Tainacan\Metadata_Types\Numeric'
 			),
@@ -199,13 +201,12 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 				'name'          => 'Other filtered',
 				'description'   => 'Is filtered',
 				'collection_id' => $collection->get_id(),
-				'metadata_type'    => 'Tainacan\Metadata_Types\Numeric'
+				'metadata_type'    => 'Tainacan\Metadata_Types\Numeric',
+				'status'      => 'publish'
 			),
 			true
 		);
 
-		$filter_type = $this->tainacan_filter_factory->create_filter('custom_interval');
-
 		$filter = $this->tainacan_entity_factory->create_entity(
 			'filter',
 			array(
@@ -213,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
@@ -226,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
@@ -276,7 +277,8 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 				'name'          => 'Metadatum filtered',
 				'description'   => 'Is filtered',
 				'collection_id' => $collection->get_id(),
-				'metadata_type'    => 'Tainacan\Metadata_Types\Text'
+				'metadata_type'    => 'Tainacan\Metadata_Types\Text',
+				'status'      => 'publish'
 			),
 			true
 		);
@@ -287,13 +289,14 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 				'name'          => 'Metadatum filtered',
 				'description'   => 'Is filtered',
 				'collection_id' => 'default',
-				'metadata_type'    => 'Tainacan\Metadata_Types\Text'
+				'metadata_type'    => 'Tainacan\Metadata_Types\Text',
+				'status'      => 'publish'
 			),
 			true
 		);
 
 		$filter_attr = json_encode([
-			'filter_type' => 'autocomplete',
+			'filter_type' => '\Tainacan\Filter_Types\Autocomplete',
 			'filter'      => [
 				'name'        => '2x Filter',
 				'description' => 'Description of 2x Filter',
@@ -303,7 +306,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 		]);
 
 		$filter_attr2 = json_encode([
-			'filter_type' => 'autocomplete',
+			'filter_type' => '\Tainacan\Filter_Types\Autocomplete',
 			'filter'      => [
 				'name'        => '4x Filter',
 				'description' => 'Description of 4x Filter',
@@ -321,7 +324,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 
 		$data = $response_create->get_data();
 
-		$this->assertEquals('filter_in_repository', $data['collection_id']);
+		$this->assertEquals('default', $data['collection_id']);
 
 
 		#### CREATE A FILTER IN COLLECTION WITHOUT METADATUM ASSOCIATION ####
@@ -359,6 +362,238 @@ 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(
+				'name'   => 'test_col',
+				'status' => 'publish'
+			),
+			true
+		);
+
+		$meta = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
+			array(
+				'name'   => 'number',
+				'status' => 'publish',
+				'collection' => $collection1,
+				'metadata_type'  => 'Tainacan\Metadata_Types\Numeric',
+			),
+			true
+		);
+
+		$filter_numeric = $this->tainacan_entity_factory->create_entity(
+			'filter',
+			array(
+				'name'   => 'numeric',
+				'status' => 'publish',
+				'collection' => $collection1,
+				'metadatum' => $meta,
+				'filter_type'  => 'Tainacan\Filter_Types\Numeric_Interval',
+				'filter_type_options' => [
+					'step' => 3,
+				]
+			),
+			true
+		);
+
+		$request = new \WP_REST_Request(
+			'GET',
+			$this->namespace . '/filters/' . $filter_numeric->get_id()
+		);
+
+		$response = $this->server->dispatch($request);
+
+		$data = $response->get_data();
+
+		$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(
+				'name'   => 'test_col',
+				'status' => 'publish'
+			),
+			true
+		);
+
+		$meta = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
+			array(
+				'name'   => 'number',
+				'status' => 'publish',
+				'collection' => $collection1,
+				'metadata_type'  => 'Tainacan\Metadata_Types\Numeric',
+			),
+			true
+		);
+
+		$filter_numeric = $this->tainacan_entity_factory->create_entity(
+			'filter',
+			array(
+				'name'   => 'numeric',
+				'status' => 'publish',
+				'collection' => $collection1,
+				'metadatum' => $meta,
+				'filter_type'  => 'Tainacan\Filter_Types\Numeric_Interval',
+				'filter_type_options' => [
+					'step' => 3,
+				]
+			),
+			true
+		);
+
+		$request = new \WP_REST_Request(
+			'GET',
+			$this->namespace . '/collection/' . $collection1->get_id() . '/filters'
+		);
+
+		$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()) {
+				$meta = $d;
+				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(
+				'name'   => 'test_col',
+				'status' => 'publish'
+			),
+			true
+		);
+
+		$meta = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
+			array(
+				'name'   => 'number',
+				'status' => 'publish',
+				'collection' => $collection1,
+				'metadata_type'  => 'Tainacan\Metadata_Types\Numeric',
+			),
+			true
+		);
+
+		$filter_numeric = $this->tainacan_entity_factory->create_entity(
+			'filter',
+			array(
+				'name'   => 'numeric',
+				'status' => 'publish',
+				'collection' => $collection1,
+				'metadatum' => $meta,
+				'filter_type'  => 'Tainacan\Filter_Types\Numeric_Interval',
+				// 'filter_type_options' => [
+				// 	'step' => 3,
+				// ]
+			),
+			true
+		);
+
+		$request = new \WP_REST_Request(
+			'GET',
+			$this->namespace . '/filters/' . $filter_numeric->get_id()
+		);
+
+		$response = $this->server->dispatch($request);
+
+		$data = $response->get_data();
+
+		$this->assertEquals($filter_numeric->get_id(), $data['id']);
+		$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(
+				'name'   => 'test_col',
+				'status' => 'publish'
+			),
+			true
+		);
+
+		$collection2 = $this->tainacan_entity_factory->create_entity(
+			'collection',
+			array(
+				'name'   => 'test_col',
+				'status' => 'publish'
+			),
+			true
+		);
+
+		$core1 = $collection1->get_core_title_metadatum();
+
+		$meta_relationship = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
+			array(
+				'name'   => 'relationship',
+				'status' => 'publish',
+				'collection' => $collection2,
+				'metadata_type'  => 'Tainacan\Metadata_Types\Relationship',
+				'metadata_type_options' => [
+					'repeated' => 'yes',
+					'collection_id' => $collection1->get_id(),
+					'search' => $core1->get_id()
+				]
+			),
+			true
+		);
+
+		$filter = $this->tainacan_entity_factory->create_entity(
+			'filter',
+			array(
+				'name'   => 'test',
+				'status' => 'publish',
+				'collection' => $collection2,
+				'metadatum' => $meta_relationship,
+				'filter_type'  => 'Tainacan\Filter_Types\Autocomplete',
+			),
+			true
+		);
+
+		$request = new \WP_REST_Request(
+			'GET',
+			$this->namespace . '/filters/' . $filter->get_id()
+		);
+
+		$response = $this->server->dispatch($request);
+
+		$data = $response->get_data();
+		$this->assertEquals($filter->get_id(), $data['id']);
+		$this->assertEquals('test', $data['name']);
+		$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-importers.php b/tests/test-api-importers.php
index 8c578c06d..1e064b01f 100644
--- a/tests/test-api-importers.php
+++ b/tests/test-api-importers.php
@@ -8,67 +8,51 @@ namespace Tainacan\Tests;
 class TAINACAN_REST_Importers_Controller extends TAINACAN_UnitApiTestCase {
 
 	public function test_create(){
-        
-        $params = json_encode([
+		$params = json_encode([
 			'importer_slug'       => 'csv'
 		]);
 
-
 		$request  = new \WP_REST_Request('POST', $this->namespace . '/importers/session');
 		$request->set_body($params);
+		$response = $this->server->dispatch($request);
+		$this->assertEquals(201, $response->get_status());
+		$data = $response->get_data();
+		$this->assertTrue( isset($data['id']) );
+		$this->assertTrue( is_string($data['id']) );
+	}
+
+	public function test_update() {
+		global $Tainacan_Importer_Handler;
+		$slug='csv';
+		$importer = $Tainacan_Importer_Handler->initialize_importer($slug);
+		$Tainacan_Importer_Handler->save_importer_instance($importer);
+		$session_id = $importer->get_id();
+
+		$params = json_encode([
+			'url'       => 'http://test.com',
+			'options'   => ['delimiter' => ';'],
+			'collection' => [
+					'id' => 231,
+					'map' => [
+							30 => 'column1',
+							31 => 'column2'
+					],
+					'total_items' => 1234
+			]
+		]);
+		$request  = new \WP_REST_Request('PATCH', $this->namespace . '/importers/session/' . $session_id);
+		$request->set_body($params);
 
 		$response = $this->server->dispatch($request);
-
-		$this->assertEquals(201, $response->get_status());
-
 		$data = $response->get_data();
 
-
-        $this->assertTrue( isset($data['id']) );
-        $this->assertTrue( is_string($data['id']) );
-
-        
-    }
-    
-    public function test_update() {
-
-
-        $importer = new \Tainacan\Importer\CSV();
-        $session_id = $importer->get_id();
-
-        $params = json_encode([
-            'url'       => 'http://test.com',
-            'options'   => ['delimiter' => ';'],
-            'collection' => [
-                'id' => 231,
-                'map' => [
-                    30 => 'column1',
-                    31 => 'column2'
-                ],
-                'total_items' => 1234
-            ]
-		]);
-
-        $request  = new \WP_REST_Request('PATCH', $this->namespace . '/importers/session/' . $session_id);
-		$request->set_body($params);
-
-        $response = $this->server->dispatch($request);
-        $data = $response->get_data();
-
-        $this->assertEquals(200, $response->get_status());
-        
-        $__importer = $_SESSION['tainacan_importer'][$session_id];
-
-        $this->assertEquals('http://test.com', $__importer->get_url());
-        $this->assertEquals(';', $__importer->get_option('delimiter'));
-
-        $this->assertEquals($__importer->get_url(), $data['url']);
-
-        $this->assertEquals(1234, $__importer->get_collections()[0]['total_items']);
-
-		
-
-    }
+		$this->assertEquals(200, $response->get_status());
+		$__importer = $Tainacan_Importer_Handler->get_importer_instance_by_session_id($session_id);
+		$this->assertEquals('http://test.com', $__importer->get_url());
+		$this->assertEquals(';', $__importer->get_option('delimiter'));
+		$this->assertEquals($__importer->get_url(), $data['url']);
+		$this->assertEquals(1234, $__importer->get_collections()[0]['total_items']);
+	}
 
 }
 
diff --git a/tests/test-api-item-metadata.php b/tests/test-api-item-metadata.php
deleted file mode 100644
index c5346e969..000000000
--- a/tests/test-api-item-metadata.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-
-namespace Tainacan\Tests;
-
-/**
- * @group api_item_meta
- */
-class TAINACAN_REST_Item_Metadata_Controller extends TAINACAN_UnitApiTestCase {
-	protected $item;
-	protected $collection;
-	protected $metadatum;
-	
-	protected function create_meta_requirements() {
-		$collection = $this->tainacan_entity_factory->create_entity(
-			'collection',
-			array(
-				'name' => 'testeItemMetadata',
-				'description' => 'No description',
-			),
-			true,
-			true
-		);
-		
-		$type = $this->tainacan_metadatum_factory->create_metadatum('text');
-		
-		$metadatum = $this->tainacan_entity_factory->create_entity(
-			'metadatum',
-			array(
-				'name'              => 'teste_metadado',
-				'description'       => 'descricao',
-				'collection'        => $collection,
-				'metadata_type'		=> $type,
-				'accept_suggestion'	=> true
-			),
-			true,
-			true
-		);
-		
-		$item = $this->tainacan_entity_factory->create_entity(
-			'item',
-			array(
-				'title'       => 'item_teste_metadado',
-				'description' => 'adasdasdsa',
-				'collection'  => $collection
-			),
-			true,
-			true
-		);
-		$this->collection = $collection;
-		$this->item = $item;
-		$this->metadatum = $metadatum;
-		return ['collection' => $collection, 'item' => $item, 'metadatum' => $metadatum];
-	}
-	
-	public function test_create_suggestion_item_metadata_in_a_collection(){
-		
-		extract($this->create_meta_requirements());
-
-		$item__metadata_json = json_encode([
-			'values'       => 'TestValues_metadado',
-		]);
-
-		$request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $item->get_id() . '/metadata/' . $metadatum->get_id() );
-		$request->set_body($item__metadata_json);
-
-		$response = $this->server->dispatch($request);
-
-		$this->assertEquals(200, $response->get_status());
-
-		$data = $response->get_data();
-		
-		$this->assertEquals($item->get_id() , $data['item']['id']);
-		$this->assertEquals('TestValues_metadado', $data['value']);
-		
-		$request  = new \WP_REST_Request('GET', $this->namespace . '/item/' . $item->get_id() . '/metadata/'. $metadatum->get_id() );
-		$response = $this->server->dispatch($request);
-		$this->assertEquals(200, $response->get_status());
-		$data = $response->get_data();
-		$this->assertEquals( 'TestValues_metadado', $data['value'] );
-		
-		// Test Suggestion
-		$new_user = $this->factory()->user->create(array( 'role' => 'subscriber' ));
-		wp_set_current_user($new_user);
-		
-		$item__metadata_json = json_encode([
-			'values'       => 'TestValuesSuggestion_metadado',
-		]);
-		
-		$request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $item->get_id() . '/metadata/' . $metadatum->get_id() );
-		$request->set_body($item__metadata_json);
-		$response = $this->server->dispatch($request);
-		
-		$this->assertEquals(200, $response->get_status());
-		$data = $response->get_data();
-		$this->assertEquals( 'pending', $data['status'] );
-		$Tainacan_Logs = \Tainacan\Repositories\Logs::get_instance();
-		$query = $Tainacan_Logs->fetch(['post_status' => 'pending']);
-		
-		$log = false;
-		while ($query->have_posts()) {
-			$query->the_post();
-			$post = get_post();
-			$log = $Tainacan_Logs->get_entity_by_post($post);
-		}
-		
-		$pending = $log->get_value();
-		
-		$this->assertEquals('TestValuesSuggestion_metadado', $pending->get_value());
-		
-		wp_set_current_user($this->user_id);
-		
-		$request  = new \WP_REST_Request('POST', $this->namespace . '/logs/' . $log->get_id() . '/approve' );
-		$response = $this->server->dispatch($request);
-		
-		$this->assertEquals(200, $response->get_status());
-		
-		$request  = new \WP_REST_Request('GET', $this->namespace . '/item/' . $item->get_id() . '/metadata/'. $metadatum->get_id()  );
-		$response = $this->server->dispatch($request);
-		$this->assertEquals(200, $response->get_status());
-		$data = $response->get_data();
-		$this->assertEquals( 'TestValuesSuggestion_metadado', $data['value'] );
-		
-	}
-	
-	function test_create_anonymous_suggestion_item_metadata_in_a_collection() {
-		extract($this->create_meta_requirements());
-		
-		$item__metadata_json = json_encode([
-			'values'       => 'TestValues_metadado',
-		]);
-		
-		$request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $item->get_id() . '/metadata/' . $metadatum->get_id() );
-		$request->set_body($item__metadata_json);
-		
-		$response = $this->server->dispatch($request);
-		
-		$this->assertEquals(200, $response->get_status());
-		
-		// Test Anonymous Suggestion
-		wp_logout();
-		wp_set_current_user(0);
-		
-		$this->assertEquals(0, get_current_user_id());
-		
-		$item__metadata_json = json_encode([
-			'values'       => 'TestValuesAnonymousSuggestion_metadado',
-		]);
-		
-		$request  = new \WP_REST_Request('POST', $this->namespace . '/item/' . $item->get_id() . '/metadata/' . $metadatum->get_id() );
-		$request->set_body($item__metadata_json);
-		$response = $this->server->dispatch($request);
-		
-		$this->assertEquals(200, $response->get_status());
-		$data = $response->get_data();
-		$this->assertEquals( 'pending', $data['status'] );
-		$Tainacan_Logs = \Tainacan\Repositories\Logs::get_instance();
-		$query = $Tainacan_Logs->fetch(['post_status' => 'pending']);
-		
-		$log = false;
-		while ($query->have_posts()) {
-			$query->the_post();
-			$post = get_post();
-			$log = $Tainacan_Logs->get_entity_by_post($post);
-		}
-		
-		$pending = $log->get_value();
-		
-		$this->assertEquals('TestValuesAnonymousSuggestion_metadado', $pending->get_value());
-		
-		wp_set_current_user($this->user_id);
-		
-		$request  = new \WP_REST_Request('POST', $this->namespace . '/logs/' . $log->get_id() . '/approve' );
-		$response = $this->server->dispatch($request);
-		
-		$this->assertEquals(200, $response->get_status());
-		
-		$request  = new \WP_REST_Request('GET', $this->namespace . '/item/' . $item->get_id() . '/metadata/'. $metadatum->get_id()  );
-		$response = $this->server->dispatch($request);
-		$this->assertEquals(200, $response->get_status());
-		$data = $response->get_data();
-		$this->assertEquals( 'TestValuesAnonymousSuggestion_metadado', $data['value'] );
-		
-	}
-
-	
-}
-
-?>
\ No newline at end of file
diff --git a/tests/test-api-items.php b/tests/test-api-items.php
index f9a1f93c2..cec2ec805 100644
--- a/tests/test-api-items.php
+++ b/tests/test-api-items.php
@@ -13,6 +13,7 @@ class TAINACAN_REST_Items_Controller extends TAINACAN_UnitApiTestCase {
 			array(
 				'name'        => 'Javascript Frameworks',
 				'description' => 'The best framework to javascript',
+				'status' => 'publish'
 			),
 			true
 		);
@@ -72,7 +73,6 @@ class TAINACAN_REST_Items_Controller extends TAINACAN_UnitApiTestCase {
 
 		$this->assertEquals(200, $response->get_status());
 		$data = $response->get_data()['items'];
-
 		$items_titles = [$data[0]['title'], $data[1]['title']];
 
 		$this->assertContains($item1->get_title(), $items_titles);
@@ -155,7 +155,11 @@ class TAINACAN_REST_Items_Controller extends TAINACAN_UnitApiTestCase {
 	}
 
 	public function test_update_item(){
-		$collection = $this->tainacan_entity_factory->create_entity('collection', '', true);
+		$collection = $this->tainacan_entity_factory->create_entity('collection', array(
+			'name'        => 'Agile',
+			'description' => 'Agile methods',
+			'status'      => 'publish'
+		), true);
 
 		$item = $this->tainacan_entity_factory->create_entity(
 			'item',
@@ -163,6 +167,7 @@ class TAINACAN_REST_Items_Controller extends TAINACAN_UnitApiTestCase {
 				'title'       => 'SCRUM e PMBOK',
 				'description' => 'Unidos no Gerenciamento de Projetos',
 				'collection'  => $collection,
+				'status' => 'publish'
 			),
 			true
 		);
@@ -181,7 +186,6 @@ class TAINACAN_REST_Items_Controller extends TAINACAN_UnitApiTestCase {
 		$response = $this->server->dispatch($request);
 
 		$data = $response->get_data();
-
 		$this->assertNotEquals($item->get_title(), $data['title']);
 		$this->assertEquals('SCRUM e XP', $data['title']);
 	}
diff --git a/tests/test-api-metadata.php b/tests/test-api-metadata.php
index 8f43b1001..d098984e1 100644
--- a/tests/test-api-metadata.php
+++ b/tests/test-api-metadata.php
@@ -149,7 +149,8 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 			'collection',
 			array(
 				'name'        => 'Statement',
-				'description' => 'No Statement'
+				'description' => 'No Statement',
+				'status' => 'publish'
 			),
 			true
 		);
@@ -222,7 +223,8 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 			'collection',
 			array(
 				'name'        => 'Statement',
-				'description' => 'No Statement'
+				'description' => 'No Statement',
+				'status' => 'publish'
 			),
 			true
 		);
@@ -403,129 +405,176 @@ class TAINACAN_REST_Metadata_Controller extends TAINACAN_UnitApiTestCase {
 		$this->assertEquals($metadatum->get_id(), $data['id']);
 		$this->assertEquals('No name', $data['name']);
 	}
+	
+	public function test_return_metadata_type_options_in_get_item() {
+		
+		$collection1 = $this->tainacan_entity_factory->create_entity(
+			'collection',
+			array(
+				'name'   => 'test_col',
+				'status' => 'publish'
+			),
+			true
+		);
+		
+		$collection2 = $this->tainacan_entity_factory->create_entity(
+			'collection',
+			array(
+				'name'   => 'test_col',
+				'status' => 'publish'
+			),
+			true
+		);
+		
+		$core1 = $collection1->get_core_title_metadatum();
+		
+		$meta_relationship = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
+			array(
+				'name'   => 'relationship',
+				'status' => 'publish',
+				'collection' => $collection2,
+				'metadata_type'  => 'Tainacan\Metadata_Types\Relationship',
+				'metadata_type_options' => [
+					'repeated' => 'yes',
+					'collection_id' => $collection1->get_id(),
+					'search' => $core1->get_id()
+				]
+			),
+			true
+		);
+		
+		$request = new \WP_REST_Request(
+			'GET',
+			$this->namespace . '/metadata/' . $meta_relationship->get_id()
+		);
+
+		$response = $this->server->dispatch($request);
+
+		$data = $response->get_data();
+
+		$this->assertEquals($meta_relationship->get_id(), $data['id']);
+		$this->assertEquals('relationship', $data['name']);
+		$this->assertEquals('yes', $data['metadata_type_options']['repeated']);
+		$this->assertEquals($collection1->get_id(), $data['metadata_type_options']['collection_id']);
+		$this->assertEquals($core1->get_id(), $data['metadata_type_options']['search']);
+		
+	}
+	
+	public function test_return_metadata_type_options_in_get_items() {
+		
+		$collection1 = $this->tainacan_entity_factory->create_entity(
+			'collection',
+			array(
+				'name'   => 'test_col',
+				'status' => 'publish'
+			),
+			true
+		);
+		
+		$collection2 = $this->tainacan_entity_factory->create_entity(
+			'collection',
+			array(
+				'name'   => 'test_col',
+				'status' => 'publish'
+			),
+			true
+		);
+		
+		$core1 = $collection1->get_core_title_metadatum();
+		
+		$meta_relationship = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
+			array(
+				'name'   => 'relationship',
+				'status' => 'publish',
+				'collection' => $collection2,
+				'metadata_type'  => 'Tainacan\Metadata_Types\Relationship',
+				'metadata_type_options' => [
+					'repeated' => 'yes',
+					'collection_id' => $collection1->get_id(),
+					'search' => $core1->get_id()
+				]
+			),
+			true
+		);
+		
+		$request = new \WP_REST_Request(
+			'GET',
+			$this->namespace . '/collection/' . $collection2->get_id() . '/metadata'
+		);
+
+		$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'] == $meta_relationship->get_id()) {
+				$meta = $d;
+				break;
+			}
+		}
+		
+		$this->assertEquals($meta_relationship->get_id(), $meta['id']);
+		$this->assertEquals('relationship', $meta['name']);
+		$this->assertEquals('yes', $meta['metadata_type_options']['repeated']);
+		$this->assertEquals($collection1->get_id(), $meta['metadata_type_options']['collection_id']);
+		$this->assertEquals($core1->get_id(), $meta['metadata_type_options']['search']);
+		
+	}
+	
+	public function test_return_metadata_type_options_in_get_item_default_option() {
+		
+		$collection1 = $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' => [$collection1],
+				'status' => 'publish'
+			),
+			true
+		);
+		
+		$meta = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
+			array(
+				'name'   => 'tax',
+				'status' => 'publish',
+				'collection' => $collection1,
+				'metadata_type'  => 'Tainacan\Metadata_Types\Taxonomy',
+				'metadata_type_options' => [
+					'taxonomy_id' => $tax->get_id(),
+				]
+			),
+			true
+		);
+		
+		$request = new \WP_REST_Request(
+			'GET',
+			$this->namespace . '/metadata/' . $meta->get_id()
+		);
+
+		$response = $this->server->dispatch($request);
+
+		$data = $response->get_data();
+
+		$this->assertEquals($meta->get_id(), $data['id']);
+		$this->assertEquals('tax', $data['name']);
+		$this->assertEquals($tax->get_id(), $data['metadata_type_options']['taxonomy_id']);
+		$this->assertEquals('no', $data['metadata_type_options']['allow_new_terms']);
+		
+	}
 
-	// public function test_fetch_all_metadatum_values(){
-	// 	$Tainacan_Item_Metadata = \Tainacan\Repositories\Item_Metadata::get_instance();
-	// 
-	// 	$collection = $this->tainacan_entity_factory->create_entity(
-	// 		'collection',
-	// 		array(
-	// 			'name'        => 'Statement',
-	// 			'description' => 'No Statement',
-	// 			'status'      => 'publish'
-	// 		),
-	// 		true
-	// 	);
-	// 
-	// 	$item1 = $this->tainacan_entity_factory->create_entity(
-	// 		'item',
-	// 		array(
-	// 			'title'       => 'No name1',
-	// 			'description' => 'No description1',
-	// 			'status'      => 'publish',
-	// 			'collection'  => $collection
-	// 		),
-	// 		true
-	// 	);
-	// 
-	// 	$item2 = $this->tainacan_entity_factory->create_entity(
-	// 		'item',
-	// 		array(
-	// 			'title'       => 'No name2',
-	// 			'description' => 'No description2',
-	// 			'status'      => 'private',
-	// 			'collection'  => $collection
-	// 		),
-	// 		true
-	// 	);
-	// 
-	// 	$item3 = $this->tainacan_entity_factory->create_entity(
-	// 		'item',
-	// 		array(
-	// 			'title'       => 'No name3',
-	// 			'description' => 'No description3',
-	// 			'status'      => 'private',
-	// 			'collection'  => $collection
-	// 		),
-	// 		true
-	// 	);
-	// 
-	// 	$metadatum = $this->tainacan_entity_factory->create_entity(
-	// 		'metadatum',
-	// 		array(
-	// 			'name'        => 'Data',
-	// 			'description' => 'Descreve valor do campo data.',
-	// 			'collection'  => $collection,
-	// 			'status'      => 'publish',
-	// 			'metadata_type'  => 'Tainacan\Metadata_Types\Text',
-	// 		),
-	// 		true
-	// 	);
-	// 
-	// 	$item_metadata1 = new \Tainacan\Entities\Item_Metadata_Entity($item1, $metadatum);
-	// 	$item_metadata1->set_value('12/12/2017');
-	// 
-	// 	$item_metadata1->validate();
-	// 	$Tainacan_Item_Metadata->insert($item_metadata1);
-	// 
-	// 	$item_metadata2 = new \Tainacan\Entities\Item_Metadata_Entity($item2, $metadatum);
-	// 	$item_metadata2->set_value('02/03/2018');
-	// 
-	// 	$item_metadata2->validate();
-	// 	$Tainacan_Item_Metadata->insert($item_metadata2);
-	// 
-	// 	// Is repeated for test return of duplicates
-	// 	$item_metadata3 = new \Tainacan\Entities\Item_Metadata_Entity($item3, $metadatum);
-	// 	$item_metadata3->set_value('12/12/2017');
-	// 
-	// 	$item_metadata3->validate();
-	// 	$Tainacan_Item_Metadata->insert($item_metadata3);
-	// 
-	// 	//=======================
-	// 
-	// 	$request = new \WP_REST_Request(
-	// 		'GET',
-	// 		$this->namespace . '/collection/' . $collection->get_id() . '/facets/' . $metadatum->get_id()
-	// 	);
-	// 
-	// 	//=======================
-	// 
-	// 	// Set no one user
-	// 	wp_set_current_user(0);
-	// 
-	// 	$response1 = $this->server->dispatch($request);
-	// 
-	// 	$data1 = $response1->get_data();
-	// 
-	// 	$this->assertCount(1, $data1);
-	// 	$this->assertEquals('12/12/2017', $data1[0]['value']);
-	// 
-	// 	//=======================
-	// 
-	// 	$new_user1 = $this->factory()->user->create(array( 'role' => 'subscriber' ));
-	// 	wp_set_current_user($new_user1);
-	// 
-	// 	$response1 = $this->server->dispatch($request);
-	// 
-	// 	$data1 = $response1->get_data();
-	// 
-	// 	$this->assertCount(1, $data1);
-	// 	$this->assertEquals('12/12/2017', $data1[0]['value']);
-	// 
-	// 	//=======================
-	// 
-	// 	$new_user2 = $this->factory()->user->create(array( 'role' => 'administrator' ));
-	// 	wp_set_current_user($new_user2);
-	// 
-	// 	$response2 = $this->server->dispatch($request);
-	// 
-	// 	$data2 = $response2->get_data();
-	// 
-	// 	// Only two without duplicates
-	// 	//$this->assertCount(2, $data2);
-	// 	//$this->assertEquals('12/12/2017', $data2[0]['value']);
-	// 	//$this->assertEquals('02/03/2018', $data2[1]['value']);
-	// }
 }
 
 ?>
\ No newline at end of file
diff --git a/tests/test-api-terms.php b/tests/test-api-terms.php
index f69fecfe1..29947489d 100644
--- a/tests/test-api-terms.php
+++ b/tests/test-api-terms.php
@@ -130,7 +130,7 @@ class TAINACAN_REST_Terms extends TAINACAN_UnitApiTestCase {
 			true
 		);
 
-		$this->tainacan_entity_factory->create_entity(
+		$term1 = $this->tainacan_entity_factory->create_entity(
 			'term',
 			array(
 				'taxonomy' => $taxonomy->get_db_identifier(),
@@ -178,6 +178,28 @@ class TAINACAN_REST_Terms extends TAINACAN_UnitApiTestCase {
 		$data = $response->get_data();
 
 		$this->assertEquals('Trap', $data['name']);
+
+		$request = new \WP_REST_Request(
+			'GET', $this->namespace . '/taxonomy/' . $taxonomy->get_id() . '/terms'
+		);
+		$request->set_query_params([
+			'hideempty' => false,
+			'include' => [$term2->get_term_id()]
+		]);
+		$response = $this->server->dispatch($request);
+		$data = $response->get_data();
+		$this->assertEquals(1, sizeof($data));
+
+		$request = new \WP_REST_Request(
+			'GET', $this->namespace . '/taxonomy/' . $taxonomy->get_id() . '/terms'
+		);
+		$request->set_query_params([
+			'hideempty' => false,
+			'include' => [$term1->get_term_id(), $term2->get_term_id()]
+		]);
+		$response = $this->server->dispatch($request);
+		$data = $response->get_data();
+		$this->assertEquals(2, sizeof($data));
 	}
 	
 	
diff --git a/tests/test-collections.php b/tests/test-collections.php
index 1cc82dc6b..7e4b3e99f 100644
--- a/tests/test-collections.php
+++ b/tests/test-collections.php
@@ -318,34 +318,6 @@ class Collections extends TAINACAN_UnitTestCase {
     	$this->assertTrue(has_action('init', array($Tainacan_Collections, 'register_post_type')) !== false, 'Collections Init is not registred!');
     }
     
-    /**
-     * @group diff
-     */
-    function test_diff() {
-    	$x = $this->tainacan_entity_factory->create_entity(
-    		'collection',
-    		array(
-    			'name'				=> 'testeDiff',
-    			'description'		=> 'adasdasdsa',
-    			'default_order' 	=> 'DESC',
-    			'moderators_ids'	=> [1,2,3]
-    		),
-    		true
-    	);
-    	
-    	$x->set_name('OtherValue');
-    	$x->set_description('testeDiff2');
-    	$x->set_moderators_ids([3,4,5]);
-    	
-    	$diff = $x->diff();
-    	$this->assertEquals(3, count($diff));
-    	$this->assertEquals($diff['name']['new'][0], 'OtherValue');
-    	$this->assertEquals($diff['name']['old'], 'testeDiff');
-    	$this->assertEquals($diff['description']['new'][0], 'testeDiff2');
-    	$this->assertEquals($diff['description']['old'], 'adasdasdsa');
-    	$this->assertEquals([1 => 4, 2 => 5, 0 => 3], $diff['moderators_ids']['diff_with_index']);
-    	
-    }
 	
 	function test_create_child_collection() {
 		
diff --git a/tests/test-core-metadatum-types.php b/tests/test-core-metadatum-types.php
index de4472fb1..3615d0e5f 100644
--- a/tests/test-core-metadatum-types.php
+++ b/tests/test-core-metadatum-types.php
@@ -100,6 +100,7 @@ class CoreMetadatumTypes extends TAINACAN_UnitTestCase {
             'collection',
             array(
                 'name'   => 'test',
+                'status' => 'publish'
             ),
             true
         );
diff --git a/tests/test-facets.php b/tests/test-facets.php
index 5dcb5584c..3c30a9b5d 100644
--- a/tests/test-facets.php
+++ b/tests/test-facets.php
@@ -381,7 +381,7 @@ class Facets extends TAINACAN_UnitApiTestCase {
 				'metadata_type_options' => [
 					'allow_new_terms' => 'yes',
 					'collection_id' => $collection1->get_id(),
-					'search' => []
+					'search' => ''
 				]
 		    ),
 		    true
diff --git a/tests/test-filters.php b/tests/test-filters.php
index a27b62591..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( 9, 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,12 +173,12 @@ class Filters extends TAINACAN_UnitTestCase {
 	        ),
 	        true
         );
-		
+
 		$this->tainacan_entity_factory->create_entity(
         	'filter',
 	        array(
 	        	'name'              => 'filter default',
-		        'collection_id'     => 'filter_in_repository',
+		        'collection_id'     => 'default',
 		        'filter_type'  => 'Tainacan\Filter_Types\Selectbox',
 				'metadatum_id'    => $meta_repo->get_id(),
 		        'status'            => 'publish'
@@ -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,13 +449,106 @@ class Filters extends TAINACAN_UnitTestCase {
 			),
 			true
 		);
-		
+
 		$Tainacan_Metadata->trash($metadatum2);
-		
+
 		$x = $Tainacan_Filters->fetch( $filter->get_id() );
-		
+
 		$this->assertEquals('trash', $x->get_status());
-		
+
 	}
-	
-}
\ No newline at end of file
+
+	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(
+				'name'        => 'Collection filtered',
+				'description' => 'Is filtered',
+			),
+			true
+		);
+
+		$metadatum2 = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
+			array(
+				'name'          => 'Other filtered',
+				'description'   => 'Is filtered',
+				'metadata_type'    => 'Tainacan\Metadata_Types\Text',
+				'status' => 'private',
+				'collection_id' => $collection->get_id()
+			),
+			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(
+				'name'        => 'Collection filtered',
+				'description' => 'Is filtered',
+			),
+			true
+		);
+
+		$metadatum2 = $this->tainacan_entity_factory->create_entity(
+			'metadatum',
+			array(
+				'name'          => 'Other filtered',
+				'description'   => 'Is filtered',
+				'metadata_type'    => 'Tainacan\Metadata_Types\Text',
+				'status' => 'publish',
+				'collection_id' => $collection->get_id()
+			),
+			true
+		);
+
+		$filter = $this->tainacan_entity_factory->create_entity(
+			'filter',
+			array(
+				'name'        => 'filtro',
+				'collection'  => $collection,
+				'description' => 'descricao',
+				'metadatum'       => $metadatum2,
+				'status' => 'publish',
+				'filter_type' => 'Tainacan\Filter_Types\Autocomplete'
+			),
+			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());
+
+	}
+
+
+}
diff --git a/tests/test-importer.php b/tests/test-importer.php
index 10a44b1e2..175318a13 100644
--- a/tests/test-importer.php
+++ b/tests/test-importer.php
@@ -143,7 +143,9 @@ class ImporterTests extends TAINACAN_UnitTestCase {
         $Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
         $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
         $file_name = 'demosaved.csv';
-        $csv_importer = new Importer\CSV();
+        global $Tainacan_Importer_Handler;
+        $csv_importer = $Tainacan_Importer_Handler->initialize_importer('csv');
+        $Tainacan_Importer_Handler->save_importer_instance($csv_importer);
         $id = $csv_importer->get_id();
 
         // open the file "demosaved.csv" for writing
@@ -169,16 +171,17 @@ class ImporterTests extends TAINACAN_UnitTestCase {
         // Close the file
         fclose($file);
 
-        $_SESSION['tainacan_importer'][$id]->set_tmp_file( $file_name );
+        $importer_instance = $Tainacan_Importer_Handler->get_importer_instance_by_session_id($id); 
+        $importer_instance->set_tmp_file( $file_name );
 		
         // file isset on importer
-        $this->assertTrue( !empty( $_SESSION['tainacan_importer'][$id]->get_tmp_file() ) );
+        $this->assertTrue( !empty( $importer_instance->get_tmp_file() ) );
 
         // count size of csv
-        $this->assertEquals( 5, $_SESSION['tainacan_importer'][$id]->get_source_number_of_items() );
+        $this->assertEquals( 5, $importer_instance->get_source_number_of_items() );
 
         // get metadata to mapping
-        $headers =  $_SESSION['tainacan_importer'][$id]->get_source_metadata();
+        $headers =  $importer_instance->get_source_metadata();
         $this->assertEquals( $headers[4], 'Column 5' );
 
         // inserting the collection
@@ -195,7 +198,7 @@ class ImporterTests extends TAINACAN_UnitTestCase {
 		
 		$collection_definition = [
 			'id' => $collection->get_id(),
-			'total_items' => $_SESSION['tainacan_importer'][$id]->get_source_number_of_items(),
+			'total_items' => $importer_instance->get_source_number_of_items(),
 		];
 		
         // get collection metadata to map
@@ -210,19 +213,19 @@ class ImporterTests extends TAINACAN_UnitTestCase {
 		$collection_definition['mapping'] = $map;
 
         // add the collection
-        $_SESSION['tainacan_importer'][$id]->add_collection( $collection_definition );
+        $importer_instance->add_collection( $collection_definition );
 
         //execute the process
-		$this->assertEquals(1, $_SESSION['tainacan_importer'][$id]->run(), 'first step should import 1 item');
-		$this->assertEquals(2, $_SESSION['tainacan_importer'][$id]->run(), 'second step should import 2 items');
-		$this->assertEquals(3, $_SESSION['tainacan_importer'][$id]->run(), 'third step should import 3 items');
-		$this->assertEquals(4, $_SESSION['tainacan_importer'][$id]->run(), 'third step should import 4 items');
-		$this->assertEquals(false, $_SESSION['tainacan_importer'][$id]->run(), '5 items and return false because its finished');
-		$this->assertEquals(false, $_SESSION['tainacan_importer'][$id]->run(), 'if call run again after finish, do nothing');
+		$this->assertEquals(1, $importer_instance->run(), 'first step should import 1 item');
+		$this->assertEquals(2, $importer_instance->run(), 'second step should import 2 items');
+		$this->assertEquals(3, $importer_instance->run(), 'third step should import 3 items');
+		$this->assertEquals(4, $importer_instance->run(), 'third step should import 4 items');
+		$this->assertEquals(false, $importer_instance->run(), '5 items and return false because its finished');
+		$this->assertEquals(false, $importer_instance->run(), 'if call run again after finish, do nothing');
 
         $items = $Tainacan_Items->fetch( [], $collection, 'OBJECT' );
 
-        $this->assertEquals( $_SESSION['tainacan_importer'][$id]->get_source_number_of_items(), count( $items ) );
+        $this->assertEquals( $importer_instance->get_source_number_of_items(), count( $items ) );
     }
 
     /**
@@ -250,8 +253,11 @@ class ImporterTests extends TAINACAN_UnitTestCase {
         $Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
         $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
         $file_name = 'demosaved.csv';
-        $csv_importer = new Importer\CSV();
+        global $Tainacan_Importer_Handler;
+        $csv_importer = $Tainacan_Importer_Handler->initialize_importer('csv');
+        $Tainacan_Importer_Handler->save_importer_instance($csv_importer);
         $id = $csv_importer->get_id();
+        $importer_instance = $Tainacan_Importer_Handler->get_importer_instance_by_session_id($id);
 
         // open the file "demosaved.csv" for writing
         $file = fopen($file_name, 'w');
@@ -280,16 +286,16 @@ class ImporterTests extends TAINACAN_UnitTestCase {
         // Close the file
         fclose($file);
 
-        $_SESSION['tainacan_importer'][$id]->set_tmp_file( $file_name );
+        $importer_instance->set_tmp_file( $file_name );
 		
         // file isset on importer
-        $this->assertTrue( !empty( $_SESSION['tainacan_importer'][$id]->get_tmp_file() ) );
+        $this->assertTrue( !empty( $importer_instance->get_tmp_file() ) );
 
         // count size of csv
-        $this->assertEquals( 5, $_SESSION['tainacan_importer'][$id]->get_source_number_of_items() );
+        $this->assertEquals( 5, $importer_instance->get_source_number_of_items() );
 
         // get metadata to mapping
-        $headers =  $_SESSION['tainacan_importer'][$id]->get_source_metadata();
+        $headers =  $importer_instance->get_source_metadata();
         $this->assertEquals( $headers[4], 'Column 5' );
 
         // inserting the collection
@@ -354,7 +360,7 @@ class ImporterTests extends TAINACAN_UnitTestCase {
 		
 		$collection_definition = [
 			'id' => $collection->get_id(),
-			'total_items' => $_SESSION['tainacan_importer'][$id]->get_source_number_of_items(),
+			'total_items' => $importer_instance->get_source_number_of_items(),
 		];
 		
         // get collection metadata to map
@@ -374,21 +380,20 @@ class ImporterTests extends TAINACAN_UnitTestCase {
 		$collection_definition['mapping'] = $map;
 
         // add the collection
-        $_SESSION['tainacan_importer'][$id]->add_collection( $collection_definition );
-        $_SESSION['tainacan_importer'][$id]->set_option('encode','iso88591');
-        //$_SESSION['tainacan_importer'][$id]->set_option('encode','utf8');
+        $importer_instance->add_collection( $collection_definition );
+        $importer_instance->set_option('encode','iso88591');
 
         //execute the process
-		$this->assertEquals(1, $_SESSION['tainacan_importer'][$id]->run(), 'first step should import 1 item');
-		$this->assertEquals(2, $_SESSION['tainacan_importer'][$id]->run(), 'second step should import 2 items');
-		$this->assertEquals(3, $_SESSION['tainacan_importer'][$id]->run(), 'third step should import 3 items');
-		$this->assertEquals(4, $_SESSION['tainacan_importer'][$id]->run(), 'third step should import 4 items');
-		$this->assertEquals(false, $_SESSION['tainacan_importer'][$id]->run(), '5 items and return false because its finished');
-		$this->assertEquals(false, $_SESSION['tainacan_importer'][$id]->run(), 'if call run again after finish, do nothing');
+		$this->assertEquals(1, $importer_instance->run(), 'first step should import 1 item');
+		$this->assertEquals(2, $importer_instance->run(), 'second step should import 2 items');
+		$this->assertEquals(3, $importer_instance->run(), 'third step should import 3 items');
+		$this->assertEquals(4, $importer_instance->run(), 'third step should import 4 items');
+		$this->assertEquals(false, $importer_instance->run(), '5 items and return false because its finished');
+		$this->assertEquals(false, $importer_instance->run(), 'if call run again after finish, do nothing');
 
         $items = $Tainacan_Items->fetch( ['order'=> 'ASC','orderby' => 'date'], $collection, 'OBJECT' );
 
-        $this->assertEquals( $_SESSION['tainacan_importer'][$id]->get_source_number_of_items(), count( $items ) );
+        $this->assertEquals( $importer_instance->get_source_number_of_items(), count( $items ) );
     }
 
     /**
@@ -409,8 +414,11 @@ class ImporterTests extends TAINACAN_UnitTestCase {
         $Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
         $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
         $file_name = 'demosaved.csv';
-        $csv_importer = new Importer\CSV();
+        global $Tainacan_Importer_Handler;
+        $csv_importer = $Tainacan_Importer_Handler->initialize_importer('csv');
+        $Tainacan_Importer_Handler->save_importer_instance($csv_importer);
         $id = $csv_importer->get_id();
+        $importer_instance = $Tainacan_Importer_Handler->get_importer_instance_by_session_id($id);
 
         // open the file "demosaved.csv" for writing
         $file = fopen($file_name, 'w');
@@ -440,20 +448,20 @@ class ImporterTests extends TAINACAN_UnitTestCase {
         // Close the file
         fclose($file);
 
-        $_SESSION['tainacan_importer'][$id]->set_tmp_file( $file_name );
+        $importer_instance->set_tmp_file( $file_name );
 		
         // file isset on importer
-        $this->assertTrue( !empty( $_SESSION['tainacan_importer'][$id]->get_tmp_file() ) );
+        $this->assertTrue( !empty( $importer_instance->get_tmp_file() ) );
 
         // count total items
-        $this->assertEquals( 5, $_SESSION['tainacan_importer'][$id]->get_source_number_of_items() );
+        $this->assertEquals( 5, $importer_instance->get_source_number_of_items() );
 
         // get metadata to mapping AVOIDING special fields
-        $headers =  $_SESSION['tainacan_importer'][$id]->get_source_metadata();
+        $headers =  $importer_instance->get_source_metadata();
         $this->assertEquals( $headers[1], 'Column 3' );
 
-        $this->assertEquals( $_SESSION['tainacan_importer'][$id]->get_option('attachment_index'), 3 );
-        $this->assertEquals( $_SESSION['tainacan_importer'][$id]->get_option('document_index'), 4 );
+        $this->assertEquals( $importer_instance->get_option('attachment_index'), 3 );
+        $this->assertEquals( $importer_instance->get_option('document_index'), 4 );
 
         // inserting the collection
         $collection = $this->tainacan_entity_factory->create_entity(
@@ -495,7 +503,7 @@ class ImporterTests extends TAINACAN_UnitTestCase {
 		
 		$collection_definition = [
 			'id' => $collection->get_id(),
-			'total_items' => $_SESSION['tainacan_importer'][$id]->get_source_number_of_items(),
+			'total_items' => $importer_instance->get_source_number_of_items(),
         ];
         
         // get collection metadata to map
@@ -511,16 +519,16 @@ class ImporterTests extends TAINACAN_UnitTestCase {
         $collection_definition['mapping'] = $map;
 
         // add the collection
-        $_SESSION['tainacan_importer'][$id]->add_collection( $collection_definition );
-        $_SESSION['tainacan_importer'][$id]->set_option('encode','iso88591');
-
-        while($_SESSION['tainacan_importer'][$id]->run()){
+        $importer_instance->add_collection( $collection_definition );
+        $importer_instance->set_option('encode','iso88591');
+        
+        while($importer_instance->run()) {
             continue;
         }
 
         $items = $Tainacan_Items->fetch( ['order'=> 'ASC', 'orderby' => 'ID'], $collection, 'OBJECT' );
 
-        $this->assertEquals( $_SESSION['tainacan_importer'][$id]->get_source_number_of_items(), count( $items ) );
+        $this->assertEquals( $importer_instance->get_source_number_of_items(), count( $items ) );
 
         // test rows
         $document_id = $items[0]->get_document();
@@ -549,12 +557,14 @@ class ImporterTests extends TAINACAN_UnitTestCase {
      * @group importer_csv_special_fields
      */
     public function test_special_fields_status_and_id(){
+        global $Tainacan_Importer_Handler;
         $Tainacan_Items = \Tainacan\Repositories\Items::get_instance();
         $Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
         $file_name = 'demosaved.csv';
-        $csv_importer = new Importer\CSV();
+        $csv_importer = $Tainacan_Importer_Handler->initialize_importer('csv');
+        $Tainacan_Importer_Handler->save_importer_instance($csv_importer);
         $id = $csv_importer->get_id();
-
+        $importer_instance = $Tainacan_Importer_Handler->get_importer_instance_by_session_id($id);
         // open the file "demosaved.csv" for writing
         $file = fopen($file_name, 'w');
 
@@ -578,19 +588,19 @@ class ImporterTests extends TAINACAN_UnitTestCase {
         // Close the file
         fclose($file);
 
-        $_SESSION['tainacan_importer'][$id]->set_tmp_file( $file_name );
+        $importer_instance->set_tmp_file( $file_name );
 		
         // file isset on importer
-        $this->assertTrue( !empty( $_SESSION['tainacan_importer'][$id]->get_tmp_file() ) );
+        $this->assertTrue( !empty( $importer_instance->get_tmp_file() ) );
 
         // count total items
-        $this->assertEquals( 5, $_SESSION['tainacan_importer'][$id]->get_source_number_of_items() );
+        $this->assertEquals( 5, $importer_instance->get_source_number_of_items() );
   
         // get metadata to mapping AVOIDING special fields
-        $headers =  $_SESSION['tainacan_importer'][$id]->get_source_metadata();
+        $headers =  $importer_instance->get_source_metadata();
         $this->assertEquals( $headers[1], 'Unknow Column' );
   
-        $this->assertEquals( $_SESSION['tainacan_importer'][$id]->get_option('item_status_index'), 1 );
+        $this->assertEquals( $importer_instance->get_option('item_status_index'), 1 );
   
         // inserting the collection
         $collection = $this->tainacan_entity_factory->create_entity(
@@ -632,7 +642,7 @@ class ImporterTests extends TAINACAN_UnitTestCase {
           
           $collection_definition = [
               'id' => $collection->get_id(),
-              'total_items' => $_SESSION['tainacan_importer'][$id]->get_source_number_of_items(),
+              'total_items' => $importer_instance->get_source_number_of_items(),
           ];
 
           // get collection metadata to map
@@ -648,9 +658,9 @@ class ImporterTests extends TAINACAN_UnitTestCase {
         $collection_definition['mapping'] = $map;
 
         // add the collection
-        $_SESSION['tainacan_importer'][$id]->add_collection( $collection_definition );
+        $importer_instance->add_collection( $collection_definition );
 
-        while($_SESSION['tainacan_importer'][$id]->run()){
+        while($importer_instance->run()){
             continue;
         }
 
diff --git a/tests/test-logs.php b/tests/test-logs.php
deleted file mode 100644
index 695a3143e..000000000
--- a/tests/test-logs.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace Tainacan\Tests;
-
-use Tainacan\Entities\Collection;
-use Tainacan\Entities\Log;
-
-/**
- * Class TestCollections
- *
- * @package Test_Tainacan
- */
-
-/**
- * Sample test case.
- */
-class Logs extends TAINACAN_UnitTestCase {
-
-
-	/**
-	 * Teste da insercao de um log simples apenas se criar o dado bruto
-	 */
-	function test_add() {
-		$Tainacan_Logs = \Tainacan\Repositories\Logs::get_instance();
-
-		$log = $this->tainacan_entity_factory->create_entity(
-			'log',
-			array(
-				'title'       => 'blame someone',
-				'description' => 'someone did that'
-			),
-			true
-		);
-
-		$user_id = get_current_user_id();
-		$blog_id = get_current_blog_id();
-
-		//retorna a taxonomia
-		$test = $Tainacan_Logs->fetch( $log->get_id() );
-
-		$this->assertEquals( 'blame someone', $test->get_title() );
-		$this->assertEquals( 'someone did that', $test->get_description() );
-		$this->assertEquals( $user_id, $test->get_user_id() );
-		$this->assertEquals( $blog_id, $test->get_blog_id() );
-	}
-
-	public function test_log_diff() {
-		$Tainacan_Logs    = \Tainacan\Repositories\Logs::get_instance();
-		$Tainacan_Filters = \Tainacan\Repositories\Filters::get_instance();
-
-		$filter = $this->tainacan_entity_factory->create_entity(
-			'filter',
-			array(
-				'name'        => 'No name',
-			),
-			true
-		);
-
-		// Modify filter name
-		$filter->set_name( 'With name' );
-
-		$Tainacan_Filters->update( $filter );
-
-		$log = $Tainacan_Logs->fetch_last();
-
-		$diff = $log->get_log_diffs();
-
-		$this->assertEquals( 'With name', "{$diff['name']['new'][0]} {$diff['name']['new'][1]}" );
-		$this->assertEquals( 'No name', $diff['name']['old'] );
-		$this->assertEquals( 'With', $diff['name']['diff_with_index'][0] );
-	}
-}
\ No newline at end of file
diff --git a/tests/test-metadata.php b/tests/test-metadata.php
index 5b967ce1d..24bfd643c 100644
--- a/tests/test-metadata.php
+++ b/tests/test-metadata.php
@@ -455,7 +455,7 @@ class Metadata extends TAINACAN_UnitTestCase {
 				'status'	 => 'publish',
 				'metadata_type_options' => [
 					'collection_id' => $collection2->get_id(),
-					'search' => [$collection2->get_core_title_metadatum()->get_id()]
+					'search' => $collection2->get_core_title_metadatum()->get_id()
 					]
 				),
 				true
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);
+	}
+
+}
diff --git a/webpack.config.js b/webpack.config.js
index 29b336d26..8e5f21324 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -27,7 +27,11 @@ module.exports = {
         gutenberg_carousel_collections_list_theme: './src/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list-theme.js',
         
         gutenberg_facets_list: './src/gutenberg-blocks/tainacan-facets/facets-list/index.js',
-        gutenberg_facets_list_theme: './src/gutenberg-blocks/tainacan-facets/facets-list/facets-list-theme.js'
+        gutenberg_facets_list_theme: './src/gutenberg-blocks/tainacan-facets/facets-list/facets-list-theme.js',
+                
+        gutenberg_carousel_terms_list: './src/gutenberg-blocks/tainacan-terms/carousel-terms-list/index.js',
+        gutenberg_carousel_terms_list_theme: './src/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list-theme.js'
+
     },
     output: {
         path: path.resolve(__dirname, './src/assets/'),