diff --git a/.gitignore b/.gitignore
index 18877a840..e9c4dc086 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ last-package-build.md5
 src/admin/scss/.sass-cache
 src/assets/css/tainacan-admin.css
 src/assets/css/tainacan-admin.css.map
+src/assets/report.html
 cypress/videos
 cypress/screenshots
 .vscode
diff --git a/build.sh b/build.sh
index 656f1da16..ecf40587b 100755
--- a/build.sh
+++ b/build.sh
@@ -13,12 +13,12 @@ current_OS=`uname`
 # For macOS (Darwin)
 if [ $current_OS == "Darwin" ]; then
     find src ./webpack.config.js -type f \( -name "*.js" -or -name "*.vue" -or -name "webpack.config.js" \) -exec md5 {} \; | sort -k 2 | md5 > last-js-build.md5
-    find ./src/scss/ ./src/admin/scss/ ./src/gutenberg-blocks/ ./src/gutenberg-blocks/tainacan-collections/collections-list  ./src/gutenberg-blocks/tainacan-items/dynamic-items-list ./src/gutenberg-blocks/tainacan-items/items-list ./src/gutenberg-blocks/tainacan-terms/terms-list -type f \( -name "*.scss" \) -exec md5 {} \; | sort -k 2 | md5 > last-sass-build.md5
+    find ./src/scss/ ./src/admin/scss/ ./src/gutenberg-blocks/ ./src/gutenberg-blocks/tainacan-collections/collections-list ./src/gutenberg-blocks/tainacan-facets/facets-list ./src/gutenberg-blocks/tainacan-items/dynamic-items-list ./src/gutenberg-blocks/tainacan-items/items-list ./src/gutenberg-blocks/tainacan-terms/terms-list -type f \( -name "*.scss" \) -exec md5 {} \; | sort -k 2 | md5 > last-sass-build.md5
     find ./composer.json -type f \( -name "composer.json" \) -exec md5 {} \; | sort -k 2 | md5 > last-composer-build.md5
     find ./package.json -type f \( -name "package.json" -or -name "package-lock.json" \) -exec md5 {} \; | sort -k 2 | md5 > last-package-build.md5
 else
     find src ./webpack.config.js -type f \( -name "*.js" -or -name "*.vue" -or -name "webpack.config.js" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-js-build.md5
-    find ./src/scss/ ./src/admin/scss/ ./src/gutenberg-blocks ./src/gutenberg-blocks/tainacan-collections/collections-list  ./src/gutenberg-blocks/tainacan-items/dynamic-items-list ./src/gutenberg-blocks/tainacan-items/items-list ./src/gutenberg-blocks/tainacan-terms/terms-list -type f \( -name "*.scss" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-sass-build.md5
+    find ./src/scss/ ./src/admin/scss/ ./src/gutenberg-blocks ./src/gutenberg-blocks/tainacan-collections/collections-list ./src/gutenberg-blocks/tainacan-facets/facets-list ./src/gutenberg-blocks/tainacan-items/dynamic-items-list ./src/gutenberg-blocks/tainacan-items/items-list ./src/gutenberg-blocks/tainacan-terms/terms-list -type f \( -name "*.scss" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-sass-build.md5
     find ./composer.json -type f \( -name "composer.json" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-composer-build.md5
     find ./package.json -type f \( -name "package.json" -or -name "package-lock.json" \) -exec md5sum {} \; | sort -k 2 | md5sum > last-package-build.md5
 fi
@@ -27,7 +27,7 @@ new_md5_package=$(<last-package-build.md5)
 if [ "$current_md5_package" != "$new_md5_package" ]
 then
     ## Install js dependencies
-    npm install
+    npm ci
 fi
 
 new_md5_composer=$(<last-composer-build.md5)
@@ -68,7 +68,9 @@ rm -rf $wp_plugin_dir
 mkdir $wp_plugin_dir
 
 rsync -axz --exclude='vendor/bin/phpc*' --exclude='vendor/squizlabs' --exclude='vendor/wimg' \
- --exclude='vendor/respect/validation/.git' --exclude='vendor/symfony/polyfill-mbstring/.git' --exclude='pdf-viewer/pdfjs-dist/web/compressed.tracemonkey-pldi-09.pdf' \
+ --exclude='vendor/respect/validation/.git' --exclude='vendor/symfony/polyfill-mbstring/.git' \
+ --exclude='vendor/respect/validation/docs' --exclude='vendor/respect/validation/tests' \
+ --exclude='pdf-viewer/pdfjs-dist/web/compressed.tracemonkey-pldi-09.pdf' \
   src/* $wp_plugin_dir/
 
 rm -rf $wp_plugin_dir/scss
diff --git a/compile-sass.sh b/compile-sass.sh
index ba15bca8b..69defc36b 100644
--- a/compile-sass.sh
+++ b/compile-sass.sh
@@ -21,5 +21,7 @@ sass -E 'UTF-8' --cache-location .tmp/sass-cache-5 src/gutenberg-blocks/tainacan
 
 sass -E 'UTF-8' --cache-location .tmp/sass-cache-6 src/gutenberg-blocks/tainacan-terms/terms-list/terms-list.scss:src/assets/css/tainacan-gutenberg-block-terms-list.css
 
+sass -E 'UTF-8' --cache-location .tmp/sass-cache-7 src/gutenberg-blocks/tainacan-facets/facets-list/facets-list.scss:src/assets/css/tainacan-gutenberg-block-facets-list.css
+
 echo "Compilação do Sass Concluído!"
 exit 0
diff --git a/docs/csv-importer.md b/docs/csv-importer.md
index c3d348bf5..df82b2fbf 100644
--- a/docs/csv-importer.md
+++ b/docs/csv-importer.md
@@ -23,9 +23,18 @@ The special columns that can be used are:
 * **special_item_id** - Inform the item ID in the Tainacan database. This is useful when re-importing items and let the user decide wether to update existing items or ignore them and only add new items.
 * **special_document** - let the user inform the item document. See "Importing files and attachments"
 * **special_attachments** - let the user inform the attachments. See "Importing files and attachments"
+* **special_comment_status** - Inform if the item is open for comments. Possible values are open or closed. Default is closed.
 
+Example:
 
-## Importing files and attachments
+```
+name, special_item_status, special_comment_status
+item uno, draft,   closed
+item due, private, closed
+item tre, publish, open
+```
+
+### Importing files and attachments
 
 If you also have files you want to import, that are related to the items in your CSV, you can use some special columns in your csv to do so.
 
@@ -55,6 +64,7 @@ Many images,http://example.com/image.jpg||http://example.com/image2.jpg||http://
 Images uploaded via FTP,myfolder/image.jpg||myfolder/image2.jpg
 ```
 
+
 ## Creating metadata on the fly
 
 When the user maps the columns found in the CSV file to the metadata present in the collection, he/she has can choose the "Create metadatum" option, so the importer will automatically create the metadata as it process the file.
diff --git a/docs/exposers.md b/docs/exposers.md
index bda0d4b05..febc52f32 100644
--- a/docs/exposers.md
+++ b/docs/exposers.md
@@ -126,8 +126,8 @@ It will give you all the items it received, in the way they were about to be ser
 It receives 3 parameters:
 
 * $response: an instance of the `\WP_REST_Response` object 
-* $response: an instance of the `\WP_REST_Server` object 
-* $response: an instance of the `\WP_REST_Request` object 
+* $handler: an instance of the `\WP_REST_Server` object 
+* $request: an instance of the `\WP_REST_Request` object 
 
 This method have to return the modified version of the `\WP_REST_Response` object.
 
@@ -257,4 +257,4 @@ function myNewExposer($exposers) {
 	
 }
 add_action('init', 'myNewExposer');
-```
\ No newline at end of file
+```
diff --git a/docs/release.md b/docs/release.md
index 515ad1ece..c27d8bbd5 100644
--- a/docs/release.md
+++ b/docs/release.md
@@ -42,12 +42,11 @@ Also increase the `Tested Up` version, if applicable.
 
 Edit `webpack.config.js` to set production mode.
 
-### Build and cleanup 
+### Build
 
 ```
 ./build.sh
 cd $BUILD_PATH
-rm -r admin/scss/.sass-cache
 ```
 ### Set build to development mode
 
@@ -92,12 +91,11 @@ Commit and push.
 
 Edit `webpack.config.js` to set production mode.
 
-### Build and cleanup 
+### Build
 
 ```
 ./build.sh
 cd $BUILD_PATH
-rm -r admin/scss/.sass-cache
 ```
 ### Set build to development mode
 
@@ -129,8 +127,10 @@ cp $GIT_PATH/wp-repo-assets/* $SVN_PATH/assets/
 Create tag folder
 
 ```
-mkdir $SVN_PATH/tags/$NEW_VERSION
-cp -R $SVN_PATH/trunk/* $SVN_PATH/tags/$NEW_VERSION/
+cd $SVN_PATH
+mkdir tags/$NEW_VERSION
+cp -R trunk/* tags/$NEW_VERSION/
+svn add tags/$NEW_VERSION
 ```
 
 ### Finish and commit
diff --git a/docs/setup-local.md b/docs/setup-local.md
index 9fafe5fb8..79b9acc18 100644
--- a/docs/setup-local.md
+++ b/docs/setup-local.md
@@ -25,7 +25,7 @@ You wil also need:
 * `Sass` to compile sass into css files
 * `WP-Cli` to configure the test environment
 * `Phpunit` to run unit tests
-* `Node` to handle dependencies and vuild the JS application
+* `Node` to handle dependencies and vuild the JS application (at least version 5.7.0)
 
 ```
 sudo apt-get install phpunit composer ruby ruby-dev nodejs npm
diff --git a/package-lock.json b/package-lock.json
index 1c75c5343..50dc5697b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "7.0.0"
+        "@babel/highlight": "^7.0.0"
       }
     },
     "@babel/core": {
@@ -18,20 +18,20 @@
       "integrity": "sha512-IFeSSnjXdhDaoysIlev//UzHZbdEmm7D0EIH2qtse9xK7mXEZQpYjs2P00XlP1qYsYvid79p+Zgg6tz1mp6iVw==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "7.0.0",
-        "@babel/generator": "7.1.3",
-        "@babel/helpers": "7.1.2",
-        "@babel/parser": "7.1.3",
-        "@babel/template": "7.1.2",
-        "@babel/traverse": "7.1.0",
-        "@babel/types": "7.1.3",
-        "convert-source-map": "1.6.0",
-        "debug": "3.2.5",
-        "json5": "0.5.1",
-        "lodash": "4.17.11",
-        "resolve": "1.8.1",
-        "semver": "5.4.1",
-        "source-map": "0.5.7"
+        "@babel/code-frame": "^7.0.0",
+        "@babel/generator": "^7.1.2",
+        "@babel/helpers": "^7.1.2",
+        "@babel/parser": "^7.1.2",
+        "@babel/template": "^7.1.2",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.1.2",
+        "convert-source-map": "^1.1.0",
+        "debug": "^3.1.0",
+        "json5": "^0.5.0",
+        "lodash": "^4.17.10",
+        "resolve": "^1.3.2",
+        "semver": "^5.4.1",
+        "source-map": "^0.5.0"
       },
       "dependencies": {
         "@babel/generator": {
@@ -40,11 +40,11 @@
           "integrity": "sha512-ZoCZGcfIJFJuZBqxcY9OjC1KW2lWK64qrX1o4UYL3yshVhwKFYgzpWZ0vvtGMNJdTlvkw0W+HR1VnYN8q3QPFQ==",
           "dev": true,
           "requires": {
-            "@babel/types": "7.1.3",
-            "jsesc": "2.5.1",
-            "lodash": "4.17.11",
-            "source-map": "0.5.7",
-            "trim-right": "1.0.1"
+            "@babel/types": "^7.1.3",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.10",
+            "source-map": "^0.5.0",
+            "trim-right": "^1.0.1"
           }
         },
         "@babel/parser": {
@@ -59,9 +59,9 @@
           "integrity": "sha512-SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "7.0.0",
-            "@babel/parser": "7.1.3",
-            "@babel/types": "7.1.3"
+            "@babel/code-frame": "^7.0.0",
+            "@babel/parser": "^7.1.2",
+            "@babel/types": "^7.1.2"
           }
         },
         "@babel/types": {
@@ -70,9 +70,9 @@
           "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==",
           "dev": true,
           "requires": {
-            "esutils": "2.0.2",
-            "lodash": "4.17.11",
-            "to-fast-properties": "2.0.0"
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.10",
+            "to-fast-properties": "^2.0.0"
           }
         },
         "lodash": {
@@ -89,11 +89,11 @@
       "integrity": "sha512-/BM2vupkpbZXq22l1ALO7MqXJZH2k8bKVv8Y+pABFnzWdztDB/ZLveP5At21vLz5c2YtSE6p7j2FZEsqafMz5Q==",
       "dev": true,
       "requires": {
-        "@babel/types": "7.0.0",
-        "jsesc": "2.5.1",
-        "lodash": "4.17.11",
-        "source-map": "0.5.7",
-        "trim-right": "1.0.1"
+        "@babel/types": "^7.0.0",
+        "jsesc": "^2.5.1",
+        "lodash": "^4.17.10",
+        "source-map": "^0.5.0",
+        "trim-right": "^1.0.1"
       },
       "dependencies": {
         "lodash": {
@@ -110,7 +110,7 @@
       "integrity": "sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==",
       "dev": true,
       "requires": {
-        "@babel/types": "7.0.0"
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
@@ -119,8 +119,8 @@
       "integrity": "sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==",
       "dev": true,
       "requires": {
-        "@babel/helper-explode-assignable-expression": "7.1.0",
-        "@babel/types": "7.0.0"
+        "@babel/helper-explode-assignable-expression": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-builder-react-jsx": {
@@ -129,8 +129,8 @@
       "integrity": "sha512-ebJ2JM6NAKW0fQEqN8hOLxK84RbRz9OkUhGS/Xd5u56ejMfVbayJ4+LykERZCOUM6faa6Fp3SZNX3fcT16MKHw==",
       "dev": true,
       "requires": {
-        "@babel/types": "7.0.0",
-        "esutils": "2.0.2"
+        "@babel/types": "^7.0.0",
+        "esutils": "^2.0.0"
       }
     },
     "@babel/helper-call-delegate": {
@@ -139,9 +139,9 @@
       "integrity": "sha512-YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "7.0.0",
-        "@babel/traverse": "7.1.0",
-        "@babel/types": "7.0.0"
+        "@babel/helper-hoist-variables": "^7.0.0",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-define-map": {
@@ -150,9 +150,9 @@
       "integrity": "sha512-yPPcW8dc3gZLN+U1mhYV91QU3n5uTbx7DUdf8NnPbjS0RMwBuHi9Xt2MUgppmNz7CJxTBWsGczTiEp1CSOTPRg==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "7.1.0",
-        "@babel/types": "7.0.0",
-        "lodash": "4.17.11"
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/types": "^7.0.0",
+        "lodash": "^4.17.10"
       },
       "dependencies": {
         "lodash": {
@@ -169,8 +169,8 @@
       "integrity": "sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==",
       "dev": true,
       "requires": {
-        "@babel/traverse": "7.1.0",
-        "@babel/types": "7.0.0"
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-function-name": {
@@ -179,9 +179,9 @@
       "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "7.0.0",
-        "@babel/template": "7.1.0",
-        "@babel/types": "7.0.0"
+        "@babel/helper-get-function-arity": "^7.0.0",
+        "@babel/template": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-get-function-arity": {
@@ -190,7 +190,7 @@
       "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "7.0.0"
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-hoist-variables": {
@@ -199,7 +199,7 @@
       "integrity": "sha512-Ggv5sldXUeSKsuzLkddtyhyHe2YantsxWKNi7A+7LeD12ExRDWTRk29JCXpaHPAbMaIPZSil7n+lq78WY2VY7w==",
       "dev": true,
       "requires": {
-        "@babel/types": "7.0.0"
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-member-expression-to-functions": {
@@ -208,7 +208,7 @@
       "integrity": "sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==",
       "dev": true,
       "requires": {
-        "@babel/types": "7.0.0"
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-module-imports": {
@@ -217,7 +217,7 @@
       "integrity": "sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==",
       "dev": true,
       "requires": {
-        "@babel/types": "7.0.0"
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-module-transforms": {
@@ -226,12 +226,12 @@
       "integrity": "sha512-0JZRd2yhawo79Rcm4w0LwSMILFmFXjugG3yqf+P/UsKsRS1mJCmMwwlHDlMg7Avr9LrvSpp4ZSULO9r8jpCzcw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "7.0.0",
-        "@babel/helper-simple-access": "7.1.0",
-        "@babel/helper-split-export-declaration": "7.0.0",
-        "@babel/template": "7.1.0",
-        "@babel/types": "7.0.0",
-        "lodash": "4.17.11"
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-simple-access": "^7.1.0",
+        "@babel/helper-split-export-declaration": "^7.0.0",
+        "@babel/template": "^7.1.0",
+        "@babel/types": "^7.0.0",
+        "lodash": "^4.17.10"
       },
       "dependencies": {
         "lodash": {
@@ -248,7 +248,7 @@
       "integrity": "sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==",
       "dev": true,
       "requires": {
-        "@babel/types": "7.0.0"
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-plugin-utils": {
@@ -263,7 +263,7 @@
       "integrity": "sha512-TR0/N0NDCcUIUEbqV6dCO+LptmmSQFQ7q70lfcEB4URsjD0E1HzicrwUH+ap6BAQ2jhCX9Q4UqZy4wilujWlkg==",
       "dev": true,
       "requires": {
-        "lodash": "4.17.11"
+        "lodash": "^4.17.10"
       },
       "dependencies": {
         "lodash": {
@@ -280,11 +280,11 @@
       "integrity": "sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "7.0.0",
-        "@babel/helper-wrap-function": "7.1.0",
-        "@babel/template": "7.1.0",
-        "@babel/traverse": "7.1.0",
-        "@babel/types": "7.0.0"
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-wrap-function": "^7.1.0",
+        "@babel/template": "^7.1.0",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-replace-supers": {
@@ -293,10 +293,10 @@
       "integrity": "sha512-BvcDWYZRWVuDeXTYZWxekQNO5D4kO55aArwZOTFXw6rlLQA8ZaDicJR1sO47h+HrnCiDFiww0fSPV0d713KBGQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-member-expression-to-functions": "7.0.0",
-        "@babel/helper-optimise-call-expression": "7.0.0",
-        "@babel/traverse": "7.1.0",
-        "@babel/types": "7.0.0"
+        "@babel/helper-member-expression-to-functions": "^7.0.0",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-simple-access": {
@@ -305,8 +305,8 @@
       "integrity": "sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==",
       "dev": true,
       "requires": {
-        "@babel/template": "7.1.0",
-        "@babel/types": "7.0.0"
+        "@babel/template": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-split-export-declaration": {
@@ -315,7 +315,7 @@
       "integrity": "sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==",
       "dev": true,
       "requires": {
-        "@babel/types": "7.0.0"
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-wrap-function": {
@@ -324,10 +324,10 @@
       "integrity": "sha512-R6HU3dete+rwsdAfrOzTlE9Mcpk4RjU3aX3gi9grtmugQY0u79X7eogUvfXA5sI81Mfq1cn6AgxihfN33STjJA==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "7.1.0",
-        "@babel/template": "7.1.0",
-        "@babel/traverse": "7.1.0",
-        "@babel/types": "7.0.0"
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/template": "^7.1.0",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helpers": {
@@ -336,9 +336,9 @@
       "integrity": "sha512-Myc3pUE8eswD73aWcartxB16K6CGmHDv9KxOmD2CeOs/FaEAQodr3VYGmlvOmog60vNQ2w8QbatuahepZwrHiA==",
       "dev": true,
       "requires": {
-        "@babel/template": "7.1.2",
-        "@babel/traverse": "7.1.0",
-        "@babel/types": "7.1.3"
+        "@babel/template": "^7.1.2",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.1.2"
       },
       "dependencies": {
         "@babel/parser": {
@@ -353,9 +353,9 @@
           "integrity": "sha512-SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "7.0.0",
-            "@babel/parser": "7.1.3",
-            "@babel/types": "7.1.3"
+            "@babel/code-frame": "^7.0.0",
+            "@babel/parser": "^7.1.2",
+            "@babel/types": "^7.1.2"
           }
         },
         "@babel/types": {
@@ -364,9 +364,9 @@
           "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==",
           "dev": true,
           "requires": {
-            "esutils": "2.0.2",
-            "lodash": "4.17.11",
-            "to-fast-properties": "2.0.0"
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.10",
+            "to-fast-properties": "^2.0.0"
           }
         },
         "lodash": {
@@ -383,9 +383,9 @@
       "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.1",
-        "esutils": "2.0.2",
-        "js-tokens": "4.0.0"
+        "chalk": "^2.0.0",
+        "esutils": "^2.0.2",
+        "js-tokens": "^4.0.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -394,7 +394,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
@@ -403,9 +403,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.5.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "js-tokens": {
@@ -420,7 +420,7 @@
           "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -437,9 +437,9 @@
       "integrity": "sha512-Fq803F3Jcxo20MXUSDdmZZXrPe6BWyGcWBPPNB/M7WaUYESKDeKMOGIxEzQOjGSmW/NWb6UaPZrtTB2ekhB/ew==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-remap-async-to-generator": "7.1.0",
-        "@babel/plugin-syntax-async-generators": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-remap-async-to-generator": "^7.1.0",
+        "@babel/plugin-syntax-async-generators": "^7.0.0"
       }
     },
     "@babel/plugin-proposal-json-strings": {
@@ -448,8 +448,8 @@
       "integrity": "sha512-kfVdUkIAGJIVmHmtS/40i/fg/AGnw/rsZBCaapY5yjeO5RA9m165Xbw9KMOu2nqXP5dTFjEjHdfNdoVcHv133Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/plugin-syntax-json-strings": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-json-strings": "^7.0.0"
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
@@ -458,8 +458,8 @@
       "integrity": "sha512-14fhfoPcNu7itSen7Py1iGN0gEm87hX/B+8nZPqkdmANyyYWYMY2pjA3r8WXbWVKMzfnSNS0xY8GVS0IjXi/iw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/plugin-syntax-object-rest-spread": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.0.0"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
@@ -468,8 +468,8 @@
       "integrity": "sha512-JPqAvLG1s13B/AuoBjdBYvn38RqW6n1TzrQO839/sIpqLpbnXKacsAgpZHzLD83Sm8SDXMkkrAvEnJ25+0yIpw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/plugin-syntax-optional-catch-binding": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.0.0"
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
@@ -478,9 +478,9 @@
       "integrity": "sha512-tM3icA6GhC3ch2SkmSxv7J/hCWKISzwycub6eGsDrFDgukD4dZ/I+x81XgW0YslS6mzNuQ1Cbzh5osjIMgepPQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-regex": "7.0.0",
-        "regexpu-core": "4.2.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.0.0",
+        "regexpu-core": "^4.2.0"
       }
     },
     "@babel/plugin-syntax-async-generators": {
@@ -489,7 +489,7 @@
       "integrity": "sha512-im7ged00ddGKAjcZgewXmp1vxSZQQywuQXe2B1A7kajjZmDeY/ekMPmWr9zJgveSaQH0k7BcGrojQhcK06l0zA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-syntax-json-strings": {
@@ -498,7 +498,7 @@
       "integrity": "sha512-UlSfNydC+XLj4bw7ijpldc1uZ/HB84vw+U6BTuqMdIEmz/LDe63w/GHtpQMdXWdqQZFeAI9PjnHe/vDhwirhKA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-syntax-jsx": {
@@ -507,7 +507,7 @@
       "integrity": "sha512-PdmL2AoPsCLWxhIr3kG2+F9v4WH06Q3z+NoGVpQgnUNGcagXHq5sB3OXxkSahKq9TLdNMN/AJzFYSOo8UKDMHg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-syntax-object-rest-spread": {
@@ -516,7 +516,7 @@
       "integrity": "sha512-5A0n4p6bIiVe5OvQPxBnesezsgFJdHhSs3uFSvaPdMqtsovajLZ+G2vZyvNe10EzJBWWo3AcHGKhAFUxqwp2dw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-syntax-optional-catch-binding": {
@@ -525,7 +525,7 @@
       "integrity": "sha512-Wc+HVvwjcq5qBg1w5RG9o9RVzmCaAg/Vp0erHCKpAYV8La6I94o4GQAmFYNmkzoMO6gzoOSulpKeSSz6mPEoZw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-arrow-functions": {
@@ -534,7 +534,7 @@
       "integrity": "sha512-2EZDBl1WIO/q4DIkIp4s86sdp4ZifL51MoIviLY/gG/mLSuOIEg7J8o6mhbxOTvUJkaN50n+8u41FVsr5KLy/w==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
@@ -543,9 +543,9 @@
       "integrity": "sha512-rNmcmoQ78IrvNCIt/R9U+cixUHeYAzgusTFgIAv+wQb9HJU4szhpDD6e5GCACmj/JP5KxuCwM96bX3L9v4ZN/g==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "7.0.0",
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-remap-async-to-generator": "7.1.0"
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-remap-async-to-generator": "^7.1.0"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
@@ -554,7 +554,7 @@
       "integrity": "sha512-AOBiyUp7vYTqz2Jibe1UaAWL0Hl9JUXEgjFvvvcSc9MVDItv46ViXFw2F7SVt1B5k+KWjl44eeXOAk3UDEaJjQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-block-scoping": {
@@ -563,8 +563,8 @@
       "integrity": "sha512-GWEMCrmHQcYWISilUrk9GDqH4enf3UmhOEbNbNrlNAX1ssH3MsS1xLOS6rdjRVPgA7XXVPn87tRkdTEoA/dxEg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "lodash": "4.17.11"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "lodash": "^4.17.10"
       },
       "dependencies": {
         "lodash": {
@@ -581,14 +581,14 @@
       "integrity": "sha512-rNaqoD+4OCBZjM7VaskladgqnZ1LO6o2UxuWSDzljzW21pN1KXkB7BstAVweZdxQkHAujps5QMNOTWesBciKFg==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "7.0.0",
-        "@babel/helper-define-map": "7.1.0",
-        "@babel/helper-function-name": "7.1.0",
-        "@babel/helper-optimise-call-expression": "7.0.0",
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-replace-supers": "7.1.0",
-        "@babel/helper-split-export-declaration": "7.0.0",
-        "globals": "11.7.0"
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-define-map": "^7.1.0",
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.1.0",
+        "@babel/helper-split-export-declaration": "^7.0.0",
+        "globals": "^11.1.0"
       }
     },
     "@babel/plugin-transform-computed-properties": {
@@ -597,7 +597,7 @@
       "integrity": "sha512-ubouZdChNAv4AAWAgU7QKbB93NU5sHwInEWfp+/OzJKA02E6Woh9RVoX4sZrbRwtybky/d7baTUqwFx+HgbvMA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-destructuring": {
@@ -606,7 +606,7 @@
       "integrity": "sha512-Fr2GtF8YJSXGTyFPakPFB4ODaEKGU04bPsAllAIabwoXdFrPxL0LVXQX5dQWoxOjjgozarJcC9eWGsj0fD6Zsg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
@@ -615,9 +615,9 @@
       "integrity": "sha512-00THs8eJxOJUFVx1w8i1MBF4XH4PsAjKjQ1eqN/uCH3YKwP21GCKfrn6YZFZswbOk9+0cw1zGQPHVc1KBlSxig==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-regex": "7.0.0",
-        "regexpu-core": "4.2.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.0.0",
+        "regexpu-core": "^4.1.3"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
@@ -626,7 +626,7 @@
       "integrity": "sha512-w2vfPkMqRkdxx+C71ATLJG30PpwtTpW7DDdLqYt2acXU7YjztzeWW2Jk1T6hKqCLYCcEA5UQM/+xTAm+QCSnuQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
@@ -635,8 +635,8 @@
       "integrity": "sha512-uZt9kD1Pp/JubkukOGQml9tqAeI8NkE98oZnHZ2qHRElmeKCodbTZgOEUtujSCSLhHSBWbzNiFSDIMC4/RBTLQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "7.1.0",
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-for-of": {
@@ -645,7 +645,7 @@
       "integrity": "sha512-TlxKecN20X2tt2UEr2LNE6aqA0oPeMT1Y3cgz8k4Dn1j5ObT8M3nl9aA37LLklx0PBZKETC9ZAf9n/6SujTuXA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-function-name": {
@@ -654,8 +654,8 @@
       "integrity": "sha512-VxOa1TMlFMtqPW2IDYZQaHsFrq/dDoIjgN098NowhexhZcz3UGlvPgZXuE1jEvNygyWyxRacqDpCZt+par1FNg==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "7.1.0",
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-literals": {
@@ -664,7 +664,7 @@
       "integrity": "sha512-1NTDBWkeNXgpUcyoVFxbr9hS57EpZYXpje92zv0SUzjdu3enaRwF/l3cmyRnXLtIdyJASyiS6PtybK+CgKf7jA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-modules-amd": {
@@ -673,8 +673,8 @@
       "integrity": "sha512-wt8P+xQ85rrnGNr2x1iV3DW32W8zrB6ctuBkYBbf5/ZzJY99Ob4MFgsZDFgczNU76iy9PWsy4EuxOliDjdKw6A==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "7.1.0",
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-module-transforms": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
@@ -683,9 +683,9 @@
       "integrity": "sha512-wtNwtMjn1XGwM0AXPspQgvmE6msSJP15CX2RVfpTSTNPLhKhaOjaIfBaVfj4iUZ/VrFSodcFedwtPg/NxwQlPA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "7.1.0",
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-simple-access": "7.1.0"
+        "@babel/helper-module-transforms": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-simple-access": "^7.1.0"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
@@ -694,8 +694,8 @@
       "integrity": "sha512-8EDKMAsitLkiF/D4Zhe9CHEE2XLh4bfLbb9/Zf3FgXYQOZyZYyg7EAel/aT2A7bHv62jwHf09q2KU/oEexr83g==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "7.0.0",
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-hoist-variables": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-modules-umd": {
@@ -704,8 +704,8 @@
       "integrity": "sha512-enrRtn5TfRhMmbRwm7F8qOj0qEYByqUvTttPEGimcBH4CJHphjyK1Vg7sdU7JjeEmgSpM890IT/efS2nMHwYig==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "7.1.0",
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-module-transforms": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-new-target": {
@@ -714,7 +714,7 @@
       "integrity": "sha512-yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-object-super": {
@@ -723,8 +723,8 @@
       "integrity": "sha512-/O02Je1CRTSk2SSJaq0xjwQ8hG4zhZGNjE8psTsSNPXyLRCODv7/PBozqT5AmQMzp7MI3ndvMhGdqp9c96tTEw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-replace-supers": "7.1.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.1.0"
       }
     },
     "@babel/plugin-transform-parameters": {
@@ -733,9 +733,9 @@
       "integrity": "sha512-vHV7oxkEJ8IHxTfRr3hNGzV446GAb+0hgbA7o/0Jd76s+YzccdWuTU296FOCOl/xweU4t/Ya4g41yWz80RFCRw==",
       "dev": true,
       "requires": {
-        "@babel/helper-call-delegate": "7.1.0",
-        "@babel/helper-get-function-arity": "7.0.0",
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-call-delegate": "^7.1.0",
+        "@babel/helper-get-function-arity": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-react-display-name": {
@@ -744,7 +744,7 @@
       "integrity": "sha512-BX8xKuQTO0HzINxT6j/GiCwoJB0AOMs0HmLbEnAvcte8U8rSkNa/eSCAY+l1OA4JnCVq2jw2p6U8QQryy2fTPg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-react-jsx": {
@@ -753,9 +753,9 @@
       "integrity": "sha512-0TMP21hXsSUjIQJmu/r7RiVxeFrXRcMUigbKu0BLegJK9PkYodHstaszcig7zxXfaBji2LYUdtqIkHs+hgYkJQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-react-jsx": "7.0.0",
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/plugin-syntax-jsx": "7.0.0"
+        "@babel/helper-builder-react-jsx": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-jsx": "^7.0.0"
       }
     },
     "@babel/plugin-transform-react-jsx-self": {
@@ -764,8 +764,8 @@
       "integrity": "sha512-pymy+AK12WO4safW1HmBpwagUQRl9cevNX+82AIAtU1pIdugqcH+nuYP03Ja6B+N4gliAaKWAegIBL/ymALPHA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/plugin-syntax-jsx": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-jsx": "^7.0.0"
       }
     },
     "@babel/plugin-transform-react-jsx-source": {
@@ -774,8 +774,8 @@
       "integrity": "sha512-OSeEpFJEH5dw/TtxTg4nijl4nHBbhqbKL94Xo/Y17WKIf2qJWeIk/QeXACF19lG1vMezkxqruwnTjVizaW7u7w==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/plugin-syntax-jsx": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-jsx": "^7.0.0"
       }
     },
     "@babel/plugin-transform-regenerator": {
@@ -784,7 +784,7 @@
       "integrity": "sha512-sj2qzsEx8KDVv1QuJc/dEfilkg3RRPvPYx/VnKLtItVQRWt1Wqf5eVCOLZm29CiGFfYYsA3VPjfizTCV0S0Dlw==",
       "dev": true,
       "requires": {
-        "regenerator-transform": "0.13.3"
+        "regenerator-transform": "^0.13.3"
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
@@ -793,7 +793,7 @@
       "integrity": "sha512-g/99LI4vm5iOf5r1Gdxq5Xmu91zvjhEG5+yZDJW268AZELAu4J1EiFLnkSG3yuUsZyOipVOVUKoGPYwfsTymhw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-spread": {
@@ -802,7 +802,7 @@
       "integrity": "sha512-L702YFy2EvirrR4shTj0g2xQp7aNwZoWNCkNu2mcoU0uyzMl0XRwDSwzB/xp6DSUFiBmEXuyAyEN16LsgVqGGQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
@@ -811,8 +811,8 @@
       "integrity": "sha512-LFUToxiyS/WD+XEWpkx/XJBrUXKewSZpzX68s+yEOtIbdnsRjpryDw9U06gYc6klYEij/+KQVRnD3nz3AoKmjw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-regex": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.0.0"
       }
     },
     "@babel/plugin-transform-template-literals": {
@@ -821,8 +821,8 @@
       "integrity": "sha512-vA6rkTCabRZu7Nbl9DfLZE1imj4tzdWcg5vtdQGvj+OH9itNNB6hxuRMHuIY8SGnEt1T9g5foqs9LnrHzsqEFg==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "7.0.0",
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
@@ -831,7 +831,7 @@
       "integrity": "sha512-1r1X5DO78WnaAIvs5uC48t41LLckxsYklJrZjNKcevyz83sF2l4RHbw29qrCPr/6ksFsdfRpT/ZgxNWHXRnffg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
@@ -840,9 +840,9 @@
       "integrity": "sha512-uJBrJhBOEa3D033P95nPHu3nbFwFE9ZgXsfEitzoIXIwqAZWk7uXcg06yFKXz9FSxBH5ucgU/cYdX0IV8ldHKw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-regex": "7.0.0",
-        "regexpu-core": "4.2.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.0.0",
+        "regexpu-core": "^4.1.3"
       }
     },
     "@babel/preset-env": {
@@ -851,47 +851,47 @@
       "integrity": "sha512-ZLVSynfAoDHB/34A17/JCZbyrzbQj59QC1Anyueb4Bwjh373nVPq5/HMph0z+tCmcDjXDe+DlKQq9ywQuvWrQg==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "7.0.0",
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/plugin-proposal-async-generator-functions": "7.1.0",
-        "@babel/plugin-proposal-json-strings": "7.0.0",
-        "@babel/plugin-proposal-object-rest-spread": "7.0.0",
-        "@babel/plugin-proposal-optional-catch-binding": "7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "7.0.0",
-        "@babel/plugin-syntax-async-generators": "7.0.0",
-        "@babel/plugin-syntax-object-rest-spread": "7.0.0",
-        "@babel/plugin-syntax-optional-catch-binding": "7.0.0",
-        "@babel/plugin-transform-arrow-functions": "7.0.0",
-        "@babel/plugin-transform-async-to-generator": "7.1.0",
-        "@babel/plugin-transform-block-scoped-functions": "7.0.0",
-        "@babel/plugin-transform-block-scoping": "7.0.0",
-        "@babel/plugin-transform-classes": "7.1.0",
-        "@babel/plugin-transform-computed-properties": "7.0.0",
-        "@babel/plugin-transform-destructuring": "7.0.0",
-        "@babel/plugin-transform-dotall-regex": "7.0.0",
-        "@babel/plugin-transform-duplicate-keys": "7.0.0",
-        "@babel/plugin-transform-exponentiation-operator": "7.1.0",
-        "@babel/plugin-transform-for-of": "7.0.0",
-        "@babel/plugin-transform-function-name": "7.1.0",
-        "@babel/plugin-transform-literals": "7.0.0",
-        "@babel/plugin-transform-modules-amd": "7.1.0",
-        "@babel/plugin-transform-modules-commonjs": "7.1.0",
-        "@babel/plugin-transform-modules-systemjs": "7.0.0",
-        "@babel/plugin-transform-modules-umd": "7.1.0",
-        "@babel/plugin-transform-new-target": "7.0.0",
-        "@babel/plugin-transform-object-super": "7.1.0",
-        "@babel/plugin-transform-parameters": "7.1.0",
-        "@babel/plugin-transform-regenerator": "7.0.0",
-        "@babel/plugin-transform-shorthand-properties": "7.0.0",
-        "@babel/plugin-transform-spread": "7.0.0",
-        "@babel/plugin-transform-sticky-regex": "7.0.0",
-        "@babel/plugin-transform-template-literals": "7.0.0",
-        "@babel/plugin-transform-typeof-symbol": "7.0.0",
-        "@babel/plugin-transform-unicode-regex": "7.0.0",
-        "browserslist": "4.1.1",
-        "invariant": "2.2.4",
-        "js-levenshtein": "1.1.3",
-        "semver": "5.4.1"
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-async-generator-functions": "^7.1.0",
+        "@babel/plugin-proposal-json-strings": "^7.0.0",
+        "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.0.0",
+        "@babel/plugin-syntax-async-generators": "^7.0.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.0.0",
+        "@babel/plugin-transform-arrow-functions": "^7.0.0",
+        "@babel/plugin-transform-async-to-generator": "^7.1.0",
+        "@babel/plugin-transform-block-scoped-functions": "^7.0.0",
+        "@babel/plugin-transform-block-scoping": "^7.0.0",
+        "@babel/plugin-transform-classes": "^7.1.0",
+        "@babel/plugin-transform-computed-properties": "^7.0.0",
+        "@babel/plugin-transform-destructuring": "^7.0.0",
+        "@babel/plugin-transform-dotall-regex": "^7.0.0",
+        "@babel/plugin-transform-duplicate-keys": "^7.0.0",
+        "@babel/plugin-transform-exponentiation-operator": "^7.1.0",
+        "@babel/plugin-transform-for-of": "^7.0.0",
+        "@babel/plugin-transform-function-name": "^7.1.0",
+        "@babel/plugin-transform-literals": "^7.0.0",
+        "@babel/plugin-transform-modules-amd": "^7.1.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.1.0",
+        "@babel/plugin-transform-modules-systemjs": "^7.0.0",
+        "@babel/plugin-transform-modules-umd": "^7.1.0",
+        "@babel/plugin-transform-new-target": "^7.0.0",
+        "@babel/plugin-transform-object-super": "^7.1.0",
+        "@babel/plugin-transform-parameters": "^7.1.0",
+        "@babel/plugin-transform-regenerator": "^7.0.0",
+        "@babel/plugin-transform-shorthand-properties": "^7.0.0",
+        "@babel/plugin-transform-spread": "^7.0.0",
+        "@babel/plugin-transform-sticky-regex": "^7.0.0",
+        "@babel/plugin-transform-template-literals": "^7.0.0",
+        "@babel/plugin-transform-typeof-symbol": "^7.0.0",
+        "@babel/plugin-transform-unicode-regex": "^7.0.0",
+        "browserslist": "^4.1.0",
+        "invariant": "^2.2.2",
+        "js-levenshtein": "^1.1.3",
+        "semver": "^5.3.0"
       }
     },
     "@babel/preset-react": {
@@ -900,11 +900,11 @@
       "integrity": "sha512-oayxyPS4Zj+hF6Et11BwuBkmpgT/zMxyuZgFrMeZID6Hdh3dGlk4sHCAhdBCpuCKW2ppBfl2uCCetlrUIJRY3w==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/plugin-transform-react-display-name": "7.0.0",
-        "@babel/plugin-transform-react-jsx": "7.0.0",
-        "@babel/plugin-transform-react-jsx-self": "7.0.0",
-        "@babel/plugin-transform-react-jsx-source": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-transform-react-display-name": "^7.0.0",
+        "@babel/plugin-transform-react-jsx": "^7.0.0",
+        "@babel/plugin-transform-react-jsx-self": "^7.0.0",
+        "@babel/plugin-transform-react-jsx-source": "^7.0.0"
       }
     },
     "@babel/template": {
@@ -913,9 +913,9 @@
       "integrity": "sha512-yZ948B/pJrwWGY6VxG6XRFsVTee3IQ7bihq9zFpM00Vydu6z5Xwg0C3J644kxI9WOTzd+62xcIsQ+AT1MGhqhA==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "7.0.0",
-        "@babel/parser": "7.1.0",
-        "@babel/types": "7.0.0"
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/traverse": {
@@ -924,15 +924,15 @@
       "integrity": "sha512-bwgln0FsMoxm3pLOgrrnGaXk18sSM9JNf1/nHC/FksmNGFbYnPWY4GYCfLxyP1KRmfsxqkRpfoa6xr6VuuSxdw==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "7.0.0",
-        "@babel/generator": "7.0.0",
-        "@babel/helper-function-name": "7.1.0",
-        "@babel/helper-split-export-declaration": "7.0.0",
-        "@babel/parser": "7.1.0",
-        "@babel/types": "7.0.0",
-        "debug": "3.2.5",
-        "globals": "11.7.0",
-        "lodash": "4.17.11"
+        "@babel/code-frame": "^7.0.0",
+        "@babel/generator": "^7.0.0",
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-split-export-declaration": "^7.0.0",
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0",
+        "debug": "^3.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.10"
       },
       "dependencies": {
         "lodash": {
@@ -949,9 +949,9 @@
       "integrity": "sha512-5tPDap4bGKTLPtci2SUl/B7Gv8RnuJFuQoWx26RJobS0fFrz4reUA3JnwIM+HVHEmWE0C1mzKhDtTp8NsWY02Q==",
       "dev": true,
       "requires": {
-        "esutils": "2.0.2",
-        "lodash": "4.17.11",
-        "to-fast-properties": "2.0.0"
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.10",
+        "to-fast-properties": "^2.0.0"
       },
       "dependencies": {
         "lodash": {
@@ -968,15 +968,15 @@
       "integrity": "sha512-pS4zlcdD7BvedyB+IfiTfrbi6C977UMIfulSk8r6uL0BU46ZE2+fUj/zbSNSfVxeaj9ElmnSni5OMwF9np+b+w==",
       "dev": true,
       "requires": {
-        "consolidate": "0.15.1",
-        "hash-sum": "1.0.2",
-        "lru-cache": "4.1.3",
-        "merge-source-map": "1.1.0",
-        "postcss": "6.0.21",
-        "postcss-selector-parser": "3.1.1",
+        "consolidate": "^0.15.1",
+        "hash-sum": "^1.0.2",
+        "lru-cache": "^4.1.2",
+        "merge-source-map": "^1.1.0",
+        "postcss": "^6.0.20",
+        "postcss-selector-parser": "^3.1.1",
         "prettier": "1.13.7",
-        "source-map": "0.5.7",
-        "vue-template-es2015-compiler": "1.6.0"
+        "source-map": "^0.5.6",
+        "vue-template-es2015-compiler": "^1.6.0"
       },
       "dependencies": {
         "lru-cache": {
@@ -985,8 +985,8 @@
           "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
           "dev": true,
           "requires": {
-            "pseudomap": "1.0.2",
-            "yallist": "2.1.2"
+            "pseudomap": "^1.0.2",
+            "yallist": "^2.1.2"
           }
         }
       }
@@ -1065,7 +1065,7 @@
       "integrity": "sha512-tOarWChdG1a3y1yqCX0JMDKzrat5tQe4pV6K/TX19BcXsBLYxFQOL1DEDa5KG9syeyvCrvZ+i1+Mv1ExngvktQ==",
       "dev": true,
       "requires": {
-        "@xtuc/ieee754": "1.2.0"
+        "@xtuc/ieee754": "^1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
@@ -1186,7 +1186,7 @@
       "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
       "dev": true,
       "requires": {
-        "mime-types": "2.1.20",
+        "mime-types": "~2.1.18",
         "negotiator": "0.6.1"
       },
       "dependencies": {
@@ -1202,7 +1202,7 @@
           "integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==",
           "dev": true,
           "requires": {
-            "mime-db": "1.36.0"
+            "mime-db": "~1.36.0"
           }
         }
       }
@@ -1219,18 +1219,31 @@
       "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==",
       "dev": true,
       "requires": {
-        "acorn": "5.7.1"
+        "acorn": "^5.0.0"
       }
     },
+    "acorn-jsx": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz",
+      "integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==",
+      "dev": true
+    },
+    "acorn-walk": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz",
+      "integrity": "sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==",
+      "dev": true
+    },
     "ajv": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+      "version": "6.10.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+      "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
+      "dev": true,
       "requires": {
-        "co": "4.6.0",
-        "fast-deep-equal": "1.0.0",
-        "fast-json-stable-stringify": "2.0.0",
-        "json-schema-traverse": "0.3.1"
+        "fast-deep-equal": "^2.0.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
       }
     },
     "ajv-errors": {
@@ -1284,8 +1297,8 @@
       "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
       "dev": true,
       "requires": {
-        "micromatch": "3.1.10",
-        "normalize-path": "2.1.1"
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
       }
     },
     "aproba": {
@@ -1298,8 +1311,8 @@
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
       "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "requires": {
-        "delegates": "1.0.0",
-        "readable-stream": "2.3.3"
+        "delegates": "^1.0.0",
+        "readable-stream": "^2.0.6"
       }
     },
     "argparse": {
@@ -1308,7 +1321,7 @@
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
       "requires": {
-        "sprintf-js": "1.0.3"
+        "sprintf-js": "~1.0.2"
       }
     },
     "arr-diff": {
@@ -1346,7 +1359,7 @@
       "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
       "dev": true,
       "requires": {
-        "array-uniq": "1.0.3"
+        "array-uniq": "^1.0.1"
       }
     },
     "array-uniq": {
@@ -1366,7 +1379,7 @@
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
       "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
       "requires": {
-        "safer-buffer": "2.1.2"
+        "safer-buffer": "~2.1.0"
       }
     },
     "asn1.js": {
@@ -1375,9 +1388,9 @@
       "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.1"
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
       }
     },
     "assert": {
@@ -1417,6 +1430,12 @@
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
       "dev": true
     },
+    "astral-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+      "dev": true
+    },
     "async": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
@@ -1434,6 +1453,12 @@
       "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
       "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI="
     },
+    "async-limiter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
+      "dev": true
+    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -1451,12 +1476,12 @@
       "integrity": "sha512-qlK4GnZk8OXLK+8kBn9ttfzu2PkhRe8kVYoWcc9HsrZEMWiBkQuRYdXyJg9cIIKxfMzhh6UbvlJ1CsstMIzxwA==",
       "dev": true,
       "requires": {
-        "browserslist": "4.2.1",
-        "caniuse-lite": "1.0.30000892",
-        "normalize-range": "0.1.2",
-        "num2fraction": "1.2.2",
-        "postcss": "7.0.5",
-        "postcss-value-parser": "3.3.1"
+        "browserslist": "^4.2.1",
+        "caniuse-lite": "^1.0.30000892",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^7.0.5",
+        "postcss-value-parser": "^3.3.1"
       },
       "dependencies": {
         "ansi-styles": {
@@ -1465,7 +1490,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "^1.9.0"
           }
         },
         "browserslist": {
@@ -1474,9 +1499,9 @@
           "integrity": "sha512-1oO0c7Zhejwd+LXihS89WqtKionSbz298rJZKJgfrHIZhrV8AC15gw553VcB0lcEugja7IhWD7iAlrsamfYVPA==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "1.0.30000892",
-            "electron-to-chromium": "1.3.79",
-            "node-releases": "1.0.0-alpha.14"
+            "caniuse-lite": "^1.0.30000890",
+            "electron-to-chromium": "^1.3.79",
+            "node-releases": "^1.0.0-alpha.14"
           }
         },
         "chalk": {
@@ -1485,9 +1510,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.5.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "electron-to-chromium": {
@@ -1502,7 +1527,7 @@
           "integrity": "sha512-G8nnF9cP9QPP/jUmYWw/uUUhumHmkm+X/EarCugYFjYm2uXRMFeOD6CVT3RLdoyCvDUNy51nirGfUItKWs/S1g==",
           "dev": true,
           "requires": {
-            "semver": "5.4.1"
+            "semver": "^5.3.0"
           }
         },
         "postcss": {
@@ -1511,9 +1536,9 @@
           "integrity": "sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==",
           "dev": true,
           "requires": {
-            "chalk": "2.4.1",
-            "source-map": "0.6.1",
-            "supports-color": "5.5.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.5.0"
           }
         },
         "postcss-value-parser": {
@@ -1534,7 +1559,7 @@
           "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -1550,12 +1575,35 @@
       "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
     },
     "axios": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz",
-      "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=",
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz",
+      "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
       "requires": {
-        "follow-redirects": "1.4.1",
-        "is-buffer": "1.1.6"
+        "follow-redirects": "1.5.10",
+        "is-buffer": "^2.0.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "follow-redirects": {
+          "version": "1.5.10",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+          "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+          "requires": {
+            "debug": "=3.1.0"
+          }
+        },
+        "is-buffer": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
+          "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="
+        }
       }
     },
     "babel-code-frame": {
@@ -1564,9 +1612,9 @@
       "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
       "dev": true,
       "requires": {
-        "chalk": "1.1.3",
-        "esutils": "2.0.2",
-        "js-tokens": "3.0.2"
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
       }
     },
     "babel-loader": {
@@ -1575,10 +1623,10 @@
       "integrity": "sha512-fhBhNkUToJcW9nV46v8w87AJOwAJDz84c1CL57n3Stj73FANM/b9TbCUK4YhdOwEyZ+OxhYpdeZDNzSI29Firw==",
       "dev": true,
       "requires": {
-        "find-cache-dir": "1.0.0",
-        "loader-utils": "1.1.0",
-        "mkdirp": "0.5.1",
-        "util.promisify": "1.0.0"
+        "find-cache-dir": "^1.0.0",
+        "loader-utils": "^1.0.2",
+        "mkdirp": "^0.5.1",
+        "util.promisify": "^1.0.0"
       }
     },
     "balanced-match": {
@@ -1592,13 +1640,13 @@
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
       "requires": {
-        "cache-base": "1.0.1",
-        "class-utils": "0.3.6",
-        "component-emitter": "1.2.1",
-        "define-property": "1.0.0",
-        "isobject": "3.0.1",
-        "mixin-deep": "1.3.1",
-        "pascalcase": "0.1.1"
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
       },
       "dependencies": {
         "define-property": {
@@ -1607,7 +1655,7 @@
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "1.0.2"
+            "is-descriptor": "^1.0.0"
           }
         },
         "is-accessor-descriptor": {
@@ -1616,7 +1664,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-data-descriptor": {
@@ -1625,7 +1673,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-descriptor": {
@@ -1634,9 +1682,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "1.0.0",
-            "is-data-descriptor": "1.0.0",
-            "kind-of": "6.0.2"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         }
       }
@@ -1658,7 +1706,19 @@
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
       "requires": {
-        "tweetnacl": "0.14.5"
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "bfj": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.1.tgz",
+      "integrity": "sha512-+GUNvzHR4nRyGybQc2WpNJL4MJazMuvf92ueIyA0bIkPRwhhQu3IfZQ2PSoVPpCBJfmoSdOxu5rnotfFLlvYRQ==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.5.1",
+        "check-types": "^7.3.0",
+        "hoopy": "^0.1.2",
+        "tryer": "^1.0.0"
       }
     },
     "big.js": {
@@ -1678,7 +1738,7 @@
       "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
       "requires": {
-        "inherits": "2.0.3"
+        "inherits": "~2.0.0"
       }
     },
     "bluebird": {
@@ -1700,15 +1760,15 @@
       "dev": true,
       "requires": {
         "bytes": "3.0.0",
-        "content-type": "1.0.4",
+        "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "1.1.2",
-        "http-errors": "1.6.3",
+        "depd": "~1.1.1",
+        "http-errors": "~1.6.2",
         "iconv-lite": "0.4.19",
-        "on-finished": "2.3.0",
+        "on-finished": "~2.3.0",
         "qs": "6.5.1",
         "raw-body": "2.3.2",
-        "type-is": "1.6.16"
+        "type-is": "~1.6.15"
       },
       "dependencies": {
         "debug": {
@@ -1740,12 +1800,12 @@
       "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
       "dev": true,
       "requires": {
-        "array-flatten": "2.1.1",
-        "deep-equal": "1.0.1",
-        "dns-equal": "1.0.0",
-        "dns-txt": "2.0.2",
-        "multicast-dns": "6.2.3",
-        "multicast-dns-service-types": "1.1.0"
+        "array-flatten": "^2.1.0",
+        "deep-equal": "^1.0.1",
+        "dns-equal": "^1.0.0",
+        "dns-txt": "^2.0.2",
+        "multicast-dns": "^6.0.1",
+        "multicast-dns-service-types": "^1.1.0"
       }
     },
     "brace-expansion": {
@@ -1753,7 +1813,7 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
       "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
       "requires": {
-        "balanced-match": "1.0.0",
+        "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
@@ -1763,16 +1823,16 @@
       "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "dev": true,
       "requires": {
-        "arr-flatten": "1.1.0",
-        "array-unique": "0.3.2",
-        "extend-shallow": "2.0.1",
-        "fill-range": "4.0.0",
-        "isobject": "3.0.1",
-        "repeat-element": "1.1.3",
-        "snapdragon": "0.8.2",
-        "snapdragon-node": "2.1.1",
-        "split-string": "3.1.0",
-        "to-regex": "3.0.2"
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
       },
       "dependencies": {
         "extend-shallow": {
@@ -1781,7 +1841,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
@@ -1798,12 +1858,12 @@
       "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
       "dev": true,
       "requires": {
-        "buffer-xor": "1.0.3",
-        "cipher-base": "1.0.4",
-        "create-hash": "1.2.0",
-        "evp_bytestokey": "1.0.3",
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.1"
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
     "browserify-cipher": {
@@ -1812,9 +1872,9 @@
       "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
       "dev": true,
       "requires": {
-        "browserify-aes": "1.2.0",
-        "browserify-des": "1.0.2",
-        "evp_bytestokey": "1.0.3"
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
       }
     },
     "browserify-des": {
@@ -1823,10 +1883,10 @@
       "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
       "dev": true,
       "requires": {
-        "cipher-base": "1.0.4",
-        "des.js": "1.0.0",
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.2"
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
       },
       "dependencies": {
         "safe-buffer": {
@@ -1843,8 +1903,8 @@
       "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "randombytes": "2.0.6"
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
       }
     },
     "browserify-sign": {
@@ -1853,13 +1913,13 @@
       "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "browserify-rsa": "4.0.1",
-        "create-hash": "1.2.0",
-        "create-hmac": "1.1.7",
-        "elliptic": "6.4.1",
-        "inherits": "2.0.3",
-        "parse-asn1": "5.1.1"
+        "bn.js": "^4.1.1",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.2",
+        "elliptic": "^6.0.0",
+        "inherits": "^2.0.1",
+        "parse-asn1": "^5.0.0"
       }
     },
     "browserify-zlib": {
@@ -1868,7 +1928,7 @@
       "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
       "dev": true,
       "requires": {
-        "pako": "1.0.6"
+        "pako": "~1.0.5"
       }
     },
     "browserslist": {
@@ -1877,9 +1937,9 @@
       "integrity": "sha512-VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "1.0.30000884",
-        "electron-to-chromium": "1.3.62",
-        "node-releases": "1.0.0-alpha.11"
+        "caniuse-lite": "^1.0.30000884",
+        "electron-to-chromium": "^1.3.62",
+        "node-releases": "^1.0.0-alpha.11"
       },
       "dependencies": {
         "caniuse-lite": {
@@ -1891,11 +1951,11 @@
       }
     },
     "buefy": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/buefy/-/buefy-0.7.5.tgz",
-      "integrity": "sha512-p6yz4XKbfXZd4f9d5rLHXCZWl9Y+8bN7gTaFQ4VdLXh7bdo4WYkPYyFyUFE+fIXhx/VEzSh2TeCEYqn/e8xY8w==",
+      "version": "0.7.8",
+      "resolved": "https://registry.npmjs.org/buefy/-/buefy-0.7.8.tgz",
+      "integrity": "sha512-ygOY/83spIkjRtqFd9I8ibPcvmVUotwljBqyHaQGhePXWkTFOnkIwDQZeMMAiB1FGWP5omFZ49e0yUXvbLK37A==",
       "requires": {
-        "bulma": "0.7.4"
+        "bulma": "0.7.5"
       }
     },
     "buffer": {
@@ -1904,9 +1964,9 @@
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
       "dev": true,
       "requires": {
-        "base64-js": "1.3.0",
-        "ieee754": "1.1.12",
-        "isarray": "1.0.0"
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
       }
     },
     "buffer-from": {
@@ -1927,11 +1987,6 @@
       "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
       "dev": true
     },
-    "builtin-modules": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
-    },
     "builtin-status-codes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
@@ -1939,9 +1994,9 @@
       "dev": true
     },
     "bulma": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.7.4.tgz",
-      "integrity": "sha512-krG2rP6eAX1WE0sf6O0SC/FUVSOBX4m1PBC2+GKLpb2pX0qanaDqcv9U2nu75egFrsHkI0zdWYuk/oGwoszVWg=="
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.7.5.tgz",
+      "integrity": "sha512-cX98TIn0I6sKba/DhW0FBjtaDpxTelU166pf7ICXpCCuplHWyu6C9LYZmL5PEsnePIeJaiorsTEzzNk3Tsm1hw=="
     },
     "bytes": {
       "version": "3.0.0",
@@ -1955,20 +2010,20 @@
       "integrity": "sha512-IFWl6lfK6wSeYCHUXh+N1lY72UDrpyrYQJNIVQf48paDuWbv5RbAtJYf/4gUQFObTCHZwdZ5sI8Iw7nqwP6nlQ==",
       "dev": true,
       "requires": {
-        "bluebird": "3.5.2",
-        "chownr": "1.1.1",
-        "figgy-pudding": "3.5.1",
-        "glob": "7.1.2",
-        "graceful-fs": "4.1.11",
-        "lru-cache": "4.1.3",
-        "mississippi": "3.0.0",
-        "mkdirp": "0.5.1",
-        "move-concurrently": "1.0.1",
-        "promise-inflight": "1.0.1",
-        "rimraf": "2.6.2",
-        "ssri": "6.0.1",
-        "unique-filename": "1.1.0",
-        "y18n": "4.0.0"
+        "bluebird": "^3.5.1",
+        "chownr": "^1.0.1",
+        "figgy-pudding": "^3.1.0",
+        "glob": "^7.1.2",
+        "graceful-fs": "^4.1.11",
+        "lru-cache": "^4.1.3",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.2",
+        "ssri": "^6.0.0",
+        "unique-filename": "^1.1.0",
+        "y18n": "^4.0.0"
       },
       "dependencies": {
         "lru-cache": {
@@ -1977,8 +2032,8 @@
           "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
           "dev": true,
           "requires": {
-            "pseudomap": "1.0.2",
-            "yallist": "2.1.2"
+            "pseudomap": "^1.0.2",
+            "yallist": "^2.1.2"
           }
         },
         "y18n": {
@@ -1995,33 +2050,22 @@
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
       "requires": {
-        "collection-visit": "1.0.0",
-        "component-emitter": "1.2.1",
-        "get-value": "2.0.6",
-        "has-value": "1.0.0",
-        "isobject": "3.0.1",
-        "set-value": "2.0.0",
-        "to-object-path": "0.3.0",
-        "union-value": "1.0.0",
-        "unset-value": "1.0.0"
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
       }
     },
-    "caller-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
-      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-      "dev": true,
-      "requires": {
-        "callsites": "0.2.0"
-      },
-      "dependencies": {
-        "callsites": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
-          "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
-          "dev": true
-        }
-      }
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
     },
     "camelcase": {
       "version": "4.1.0",
@@ -2034,8 +2078,8 @@
       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "requires": {
-        "camelcase": "2.1.1",
-        "map-obj": "1.0.1"
+        "camelcase": "^2.0.0",
+        "map-obj": "^1.0.0"
       },
       "dependencies": {
         "camelcase": {
@@ -2061,31 +2105,44 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
       "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
       "requires": {
-        "ansi-styles": "2.2.1",
-        "escape-string-regexp": "1.0.5",
-        "has-ansi": "2.0.0",
-        "strip-ansi": "3.0.1",
-        "supports-color": "2.0.0"
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
       }
     },
+    "chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "dev": true
+    },
+    "check-types": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/check-types/-/check-types-7.4.0.tgz",
+      "integrity": "sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==",
+      "dev": true
+    },
     "chokidar": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
       "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
       "dev": true,
       "requires": {
-        "anymatch": "2.0.0",
-        "async-each": "1.0.1",
-        "braces": "2.3.2",
-        "glob-parent": "3.1.0",
-        "inherits": "2.0.3",
-        "is-binary-path": "1.0.1",
-        "is-glob": "4.0.0",
-        "lodash.debounce": "4.0.8",
-        "normalize-path": "2.1.1",
-        "path-is-absolute": "1.0.1",
-        "readdirp": "2.2.1",
-        "upath": "1.1.0"
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.0",
+        "braces": "^2.3.0",
+        "fsevents": "^1.2.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.1",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "lodash.debounce": "^4.0.8",
+        "normalize-path": "^2.1.1",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.0.0",
+        "upath": "^1.0.5"
       }
     },
     "chownr": {
@@ -2100,7 +2157,7 @@
       "integrity": "sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==",
       "dev": true,
       "requires": {
-        "tslib": "1.9.3"
+        "tslib": "^1.9.0"
       }
     },
     "cipher-base": {
@@ -2109,26 +2166,20 @@
       "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.1"
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
-    "circular-json": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
-      "dev": true
-    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
       "requires": {
-        "arr-union": "3.1.0",
-        "define-property": "0.2.5",
-        "isobject": "3.0.1",
-        "static-extend": "0.1.2"
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
       },
       "dependencies": {
         "define-property": {
@@ -2137,7 +2188,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "0.1.6"
+            "is-descriptor": "^0.1.0"
           }
         }
       }
@@ -2148,7 +2199,7 @@
       "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
       "dev": true,
       "requires": {
-        "restore-cursor": "2.0.0"
+        "restore-cursor": "^2.0.0"
       }
     },
     "cli-width": {
@@ -2162,9 +2213,9 @@
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
       "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
       "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wrap-ansi": "2.1.0"
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
       }
     },
     "clone-deep": {
@@ -2173,17 +2224,12 @@
       "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
       "dev": true,
       "requires": {
-        "for-own": "1.0.0",
-        "is-plain-object": "2.0.4",
-        "kind-of": "6.0.2",
-        "shallow-clone": "1.0.0"
+        "for-own": "^1.0.0",
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.0",
+        "shallow-clone": "^1.0.0"
       }
     },
-    "co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
-    },
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -2195,8 +2241,8 @@
       "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
       "dev": true,
       "requires": {
-        "map-visit": "1.0.0",
-        "object-visit": "1.0.1"
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
       }
     },
     "color-convert": {
@@ -2205,7 +2251,7 @@
       "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
       "dev": true,
       "requires": {
-        "color-name": "1.1.3"
+        "color-name": "^1.1.1"
       }
     },
     "color-name": {
@@ -2215,11 +2261,11 @@
       "dev": true
     },
     "combined-stream": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz",
-      "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "requires": {
-        "delayed-stream": "1.0.0"
+        "delayed-stream": "~1.0.0"
       }
     },
     "commander": {
@@ -2246,7 +2292,7 @@
       "integrity": "sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==",
       "dev": true,
       "requires": {
-        "mime-db": "1.36.0"
+        "mime-db": ">= 1.36.0 < 2"
       },
       "dependencies": {
         "mime-db": {
@@ -2263,13 +2309,13 @@
       "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
       "dev": true,
       "requires": {
-        "accepts": "1.3.5",
+        "accepts": "~1.3.5",
         "bytes": "3.0.0",
-        "compressible": "2.0.15",
+        "compressible": "~2.0.14",
         "debug": "2.6.9",
-        "on-headers": "1.0.1",
+        "on-headers": "~1.0.1",
         "safe-buffer": "5.1.2",
-        "vary": "1.1.2"
+        "vary": "~1.1.2"
       },
       "dependencies": {
         "debug": {
@@ -2300,10 +2346,10 @@
       "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
       "dev": true,
       "requires": {
-        "buffer-from": "1.1.1",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3",
-        "typedarray": "0.0.6"
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
       }
     },
     "connect-history-api-fallback": {
@@ -2318,7 +2364,7 @@
       "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
       "dev": true,
       "requires": {
-        "date-now": "0.1.4"
+        "date-now": "^0.1.4"
       }
     },
     "console-control-strings": {
@@ -2332,7 +2378,7 @@
       "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
       "dev": true,
       "requires": {
-        "bluebird": "3.5.2"
+        "bluebird": "^3.1.1"
       }
     },
     "constants-browserify": {
@@ -2359,7 +2405,7 @@
       "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
       "dev": true,
       "requires": {
-        "safe-buffer": "5.1.1"
+        "safe-buffer": "~5.1.1"
       }
     },
     "cookie": {
@@ -2380,12 +2426,12 @@
       "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
       "dev": true,
       "requires": {
-        "aproba": "1.2.0",
-        "fs-write-stream-atomic": "1.0.10",
-        "iferr": "0.1.5",
-        "mkdirp": "0.5.1",
-        "rimraf": "2.6.2",
-        "run-queue": "1.0.3"
+        "aproba": "^1.1.1",
+        "fs-write-stream-atomic": "^1.0.8",
+        "iferr": "^0.1.5",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.0"
       }
     },
     "copy-descriptor": {
@@ -2405,10 +2451,10 @@
       "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
       "dev": true,
       "requires": {
-        "is-directory": "0.3.1",
-        "js-yaml": "3.12.0",
-        "parse-json": "4.0.0",
-        "require-from-string": "2.0.2"
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.9.0",
+        "parse-json": "^4.0.0",
+        "require-from-string": "^2.0.1"
       },
       "dependencies": {
         "parse-json": {
@@ -2417,8 +2463,8 @@
           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
-            "error-ex": "1.3.1",
-            "json-parse-better-errors": "1.0.2"
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
           }
         }
       }
@@ -2429,8 +2475,8 @@
       "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "elliptic": "6.4.1"
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.0.0"
       }
     },
     "create-hash": {
@@ -2439,11 +2485,11 @@
       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
       "dev": true,
       "requires": {
-        "cipher-base": "1.0.4",
-        "inherits": "2.0.3",
-        "md5.js": "1.3.5",
-        "ripemd160": "2.0.2",
-        "sha.js": "2.4.11"
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
       }
     },
     "create-hmac": {
@@ -2452,12 +2498,12 @@
       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
       "dev": true,
       "requires": {
-        "cipher-base": "1.0.4",
-        "create-hash": "1.2.0",
-        "inherits": "2.0.3",
-        "ripemd160": "2.0.2",
-        "safe-buffer": "5.1.1",
-        "sha.js": "2.4.11"
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
       }
     },
     "cross-env": {
@@ -2466,8 +2512,8 @@
       "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==",
       "dev": true,
       "requires": {
-        "cross-spawn": "6.0.5",
-        "is-windows": "1.0.2"
+        "cross-spawn": "^6.0.5",
+        "is-windows": "^1.0.0"
       },
       "dependencies": {
         "cross-spawn": {
@@ -2476,11 +2522,11 @@
           "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
           "dev": true,
           "requires": {
-            "nice-try": "1.0.4",
-            "path-key": "2.0.1",
-            "semver": "5.5.0",
-            "shebang-command": "1.2.0",
-            "which": "1.3.0"
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
           }
         },
         "semver": {
@@ -2497,11 +2543,11 @@
       "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
       "dev": true,
       "requires": {
-        "nice-try": "1.0.4",
-        "path-key": "2.0.1",
-        "semver": "5.5.1",
-        "shebang-command": "1.2.0",
-        "which": "1.3.0"
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
       },
       "dependencies": {
         "semver": {
@@ -2518,17 +2564,17 @@
       "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
       "dev": true,
       "requires": {
-        "browserify-cipher": "1.0.1",
-        "browserify-sign": "4.0.4",
-        "create-ecdh": "4.0.3",
-        "create-hash": "1.2.0",
-        "create-hmac": "1.1.7",
-        "diffie-hellman": "5.0.3",
-        "inherits": "2.0.3",
-        "pbkdf2": "3.0.17",
-        "public-encrypt": "4.0.3",
-        "randombytes": "2.0.6",
-        "randomfill": "1.0.4"
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
       }
     },
     "css-loader": {
@@ -2537,18 +2583,18 @@
       "integrity": "sha512-tMXlTYf3mIMt3b0dDCOQFJiVvxbocJ5Ho577WiGPYPZcqVEO218L2iU22pDXzkTZCLDE+9AmGSUkWxeh/nZReA==",
       "dev": true,
       "requires": {
-        "babel-code-frame": "6.26.0",
-        "css-selector-tokenizer": "0.7.0",
-        "icss-utils": "2.1.0",
-        "loader-utils": "1.1.0",
-        "lodash.camelcase": "4.3.0",
-        "postcss": "6.0.23",
-        "postcss-modules-extract-imports": "1.2.0",
-        "postcss-modules-local-by-default": "1.2.0",
-        "postcss-modules-scope": "1.1.0",
-        "postcss-modules-values": "1.3.0",
-        "postcss-value-parser": "3.3.0",
-        "source-list-map": "2.0.0"
+        "babel-code-frame": "^6.26.0",
+        "css-selector-tokenizer": "^0.7.0",
+        "icss-utils": "^2.1.0",
+        "loader-utils": "^1.0.2",
+        "lodash.camelcase": "^4.3.0",
+        "postcss": "^6.0.23",
+        "postcss-modules-extract-imports": "^1.2.0",
+        "postcss-modules-local-by-default": "^1.2.0",
+        "postcss-modules-scope": "^1.1.0",
+        "postcss-modules-values": "^1.3.0",
+        "postcss-value-parser": "^3.3.0",
+        "source-list-map": "^2.0.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -2557,7 +2603,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
@@ -2566,9 +2612,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.4.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "postcss": {
@@ -2577,9 +2623,9 @@
           "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "2.4.1",
-            "source-map": "0.6.1",
-            "supports-color": "5.4.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         },
         "source-map": {
@@ -2594,7 +2640,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -2605,9 +2651,9 @@
       "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=",
       "dev": true,
       "requires": {
-        "cssesc": "0.1.0",
-        "fastparse": "1.1.1",
-        "regexpu-core": "1.0.0"
+        "cssesc": "^0.1.0",
+        "fastparse": "^1.1.1",
+        "regexpu-core": "^1.0.0"
       },
       "dependencies": {
         "regexpu-core": {
@@ -2616,9 +2662,9 @@
           "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
           "dev": true,
           "requires": {
-            "regenerate": "1.3.3",
-            "regjsgen": "0.2.0",
-            "regjsparser": "0.1.5"
+            "regenerate": "^1.2.1",
+            "regjsgen": "^0.2.0",
+            "regjsparser": "^0.1.4"
           }
         }
       }
@@ -2634,7 +2680,7 @@
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
       "requires": {
-        "array-find-index": "1.0.2"
+        "array-find-index": "^1.0.1"
       }
     },
     "cyclist": {
@@ -2648,7 +2694,7 @@
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
       "requires": {
-        "assert-plus": "1.0.0"
+        "assert-plus": "^1.0.0"
       }
     },
     "date-now": {
@@ -2669,7 +2715,7 @@
       "integrity": "sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==",
       "dev": true,
       "requires": {
-        "ms": "2.1.1"
+        "ms": "^2.1.1"
       },
       "dependencies": {
         "ms": {
@@ -2709,7 +2755,7 @@
       "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
       "dev": true,
       "requires": {
-        "object-keys": "1.0.12"
+        "object-keys": "^1.0.12"
       }
     },
     "define-property": {
@@ -2718,8 +2764,8 @@
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
       "requires": {
-        "is-descriptor": "1.0.2",
-        "isobject": "3.0.1"
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
       },
       "dependencies": {
         "is-accessor-descriptor": {
@@ -2728,7 +2774,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-data-descriptor": {
@@ -2737,7 +2783,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-descriptor": {
@@ -2746,9 +2792,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "1.0.0",
-            "is-data-descriptor": "1.0.0",
-            "kind-of": "6.0.2"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         }
       }
@@ -2759,12 +2805,12 @@
       "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
       "dev": true,
       "requires": {
-        "globby": "6.1.0",
-        "is-path-cwd": "1.0.0",
-        "is-path-in-cwd": "1.0.1",
-        "p-map": "1.2.0",
-        "pify": "3.0.0",
-        "rimraf": "2.6.2"
+        "globby": "^6.1.0",
+        "is-path-cwd": "^1.0.0",
+        "is-path-in-cwd": "^1.0.0",
+        "p-map": "^1.1.1",
+        "pify": "^3.0.0",
+        "rimraf": "^2.2.8"
       },
       "dependencies": {
         "pify": {
@@ -2797,8 +2843,8 @@
       "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.1"
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
       }
     },
     "destroy": {
@@ -2819,9 +2865,9 @@
       "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "miller-rabin": "4.0.1",
-        "randombytes": "2.0.6"
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
       }
     },
     "dns-equal": {
@@ -2836,8 +2882,8 @@
       "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
       "dev": true,
       "requires": {
-        "ip": "1.1.5",
-        "safe-buffer": "5.1.1"
+        "ip": "^1.1.0",
+        "safe-buffer": "^5.0.1"
       }
     },
     "dns-txt": {
@@ -2846,7 +2892,16 @@
       "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
       "dev": true,
       "requires": {
-        "buffer-indexof": "1.1.1"
+        "buffer-indexof": "^1.0.0"
+      }
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
       }
     },
     "dom7": {
@@ -2854,7 +2909,7 @@
       "resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.2.tgz",
       "integrity": "sha512-cGwWtpu7KY3JnbREGqG4EGC/u+1hyLfWVMqrqRjmwiO8d5i4B+0imLZAQ/cJbiXnjbs0pdIUzcUyeI9BbnyKNg==",
       "requires": {
-        "ssr-window": "1.0.1"
+        "ssr-window": "^1.0.1"
       }
     },
     "domain-browser": {
@@ -2869,19 +2924,25 @@
       "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
       "dev": true,
       "requires": {
-        "is-obj": "1.0.1"
+        "is-obj": "^1.0.0"
       }
     },
+    "duplexer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
+      "dev": true
+    },
     "duplexify": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz",
       "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==",
       "dev": true,
       "requires": {
-        "end-of-stream": "1.4.1",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3",
-        "stream-shift": "1.0.0"
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
       }
     },
     "ecc-jsbn": {
@@ -2889,8 +2950,8 @@
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
       "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
       "requires": {
-        "jsbn": "0.1.1",
-        "safer-buffer": "2.1.2"
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
       }
     },
     "ee-first": {
@@ -2899,6 +2960,12 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
       "dev": true
     },
+    "ejs": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz",
+      "integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==",
+      "dev": true
+    },
     "electron-to-chromium": {
       "version": "1.3.62",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.62.tgz",
@@ -2911,15 +2978,21 @@
       "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "brorand": "1.1.0",
-        "hash.js": "1.1.5",
-        "hmac-drbg": "1.0.1",
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.1",
-        "minimalistic-crypto-utils": "1.0.1"
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
       }
     },
+    "emoji-regex": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+      "dev": true
+    },
     "emojis-list": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
@@ -2938,7 +3011,7 @@
       "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
       "dev": true,
       "requires": {
-        "once": "1.4.0"
+        "once": "^1.4.0"
       }
     },
     "enhanced-resolve": {
@@ -2947,9 +3020,9 @@
       "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "memory-fs": "0.4.1",
-        "tapable": "1.1.0"
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.4.0",
+        "tapable": "^1.0.0"
       }
     },
     "errno": {
@@ -2958,7 +3031,7 @@
       "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
       "dev": true,
       "requires": {
-        "prr": "1.0.1"
+        "prr": "~1.0.1"
       }
     },
     "error-ex": {
@@ -2966,7 +3039,7 @@
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
       "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
       "requires": {
-        "is-arrayish": "0.2.1"
+        "is-arrayish": "^0.2.1"
       }
     },
     "es-abstract": {
@@ -2975,11 +3048,11 @@
       "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
       "dev": true,
       "requires": {
-        "es-to-primitive": "1.2.0",
-        "function-bind": "1.1.1",
-        "has": "1.0.3",
-        "is-callable": "1.1.4",
-        "is-regex": "1.0.4"
+        "es-to-primitive": "^1.1.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.1",
+        "is-callable": "^1.1.3",
+        "is-regex": "^1.0.4"
       }
     },
     "es-to-primitive": {
@@ -2988,9 +3061,9 @@
       "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
       "dev": true,
       "requires": {
-        "is-callable": "1.1.4",
-        "is-date-object": "1.0.1",
-        "is-symbol": "1.0.2"
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
       }
     },
     "escape-html": {
@@ -3005,74 +3078,49 @@
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "eslint": {
-      "version": "4.19.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
-      "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
+      "version": "5.16.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz",
+      "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
       "dev": true,
       "requires": {
-        "ajv": "5.5.2",
-        "babel-code-frame": "6.26.0",
-        "chalk": "2.4.2",
-        "concat-stream": "1.6.2",
-        "cross-spawn": "5.1.0",
-        "debug": "3.2.5",
-        "doctrine": "2.1.0",
-        "eslint-scope": "3.7.3",
-        "eslint-visitor-keys": "1.0.0",
-        "espree": "3.5.4",
-        "esquery": "1.0.1",
-        "esutils": "2.0.2",
-        "file-entry-cache": "2.0.0",
-        "functional-red-black-tree": "1.0.1",
-        "glob": "7.1.2",
-        "globals": "11.7.0",
-        "ignore": "3.3.10",
-        "imurmurhash": "0.1.4",
-        "inquirer": "3.3.0",
-        "is-resolvable": "1.1.0",
-        "js-yaml": "3.12.0",
-        "json-stable-stringify-without-jsonify": "1.0.1",
-        "levn": "0.3.0",
-        "lodash": "4.17.5",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
-        "natural-compare": "1.4.0",
-        "optionator": "0.8.2",
-        "path-is-inside": "1.0.2",
-        "pluralize": "7.0.0",
-        "progress": "2.0.3",
-        "regexpp": "1.1.0",
-        "require-uncached": "1.0.3",
-        "semver": "5.4.1",
-        "strip-ansi": "4.0.0",
-        "strip-json-comments": "2.0.1",
-        "table": "4.0.2",
-        "text-table": "0.2.0"
+        "@babel/code-frame": "^7.0.0",
+        "ajv": "^6.9.1",
+        "chalk": "^2.1.0",
+        "cross-spawn": "^6.0.5",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "eslint-scope": "^4.0.3",
+        "eslint-utils": "^1.3.1",
+        "eslint-visitor-keys": "^1.0.0",
+        "espree": "^5.0.1",
+        "esquery": "^1.0.1",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^5.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob": "^7.1.2",
+        "globals": "^11.7.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^6.2.2",
+        "js-yaml": "^3.13.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.11",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.2",
+        "path-is-inside": "^1.0.2",
+        "progress": "^2.0.0",
+        "regexpp": "^2.0.1",
+        "semver": "^5.5.1",
+        "strip-ansi": "^4.0.0",
+        "strip-json-comments": "^2.0.1",
+        "table": "^5.2.3",
+        "text-table": "^0.2.0"
       },
       "dependencies": {
-        "acorn-jsx": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
-          "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
-          "dev": true,
-          "requires": {
-            "acorn": "3.3.0"
-          },
-          "dependencies": {
-            "acorn": {
-              "version": "3.3.0",
-              "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
-              "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
-              "dev": true
-            }
-          }
-        },
-        "ajv-keywords": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
-          "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
-          "dev": true
-        },
         "ansi-regex": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
@@ -3085,7 +3133,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
@@ -3094,156 +3142,65 @@
           "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.5.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
-        "chardet": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
-          "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
-          "dev": true
-        },
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "lru-cache": "4.1.1",
-            "shebang-command": "1.2.0",
-            "which": "1.3.0"
-          }
-        },
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "requires": {
-            "esutils": "2.0.2"
+            "ms": "^2.1.1"
           }
         },
         "eslint-scope": {
-          "version": "3.7.3",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz",
-          "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+          "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
           "dev": true,
           "requires": {
-            "esrecurse": "4.2.1",
-            "estraverse": "4.2.0"
+            "esrecurse": "^4.1.0",
+            "estraverse": "^4.1.1"
           }
         },
-        "espree": {
-          "version": "3.5.4",
-          "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
-          "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
+        "js-yaml": {
+          "version": "3.13.1",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+          "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
           "dev": true,
           "requires": {
-            "acorn": "5.7.1",
-            "acorn-jsx": "3.0.1"
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
           }
         },
-        "external-editor": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
-          "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
-          "dev": true,
-          "requires": {
-            "chardet": "0.4.2",
-            "iconv-lite": "0.4.24",
-            "tmp": "0.0.33"
-          }
-        },
-        "file-entry-cache": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
-          "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
-          "dev": true,
-          "requires": {
-            "flat-cache": "1.3.4",
-            "object-assign": "4.1.1"
-          }
-        },
-        "flat-cache": {
-          "version": "1.3.4",
-          "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
-          "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
-          "dev": true,
-          "requires": {
-            "circular-json": "0.3.3",
-            "graceful-fs": "4.1.11",
-            "rimraf": "2.6.2",
-            "write": "0.2.1"
-          }
-        },
-        "ignore": {
-          "version": "3.3.10",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-          "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+        "lodash": {
+          "version": "4.17.11",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
           "dev": true
         },
-        "inquirer": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
-          "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
-          "dev": true,
-          "requires": {
-            "ansi-escapes": "3.2.0",
-            "chalk": "2.4.2",
-            "cli-cursor": "2.1.0",
-            "cli-width": "2.2.0",
-            "external-editor": "2.2.0",
-            "figures": "2.0.0",
-            "lodash": "4.17.5",
-            "mute-stream": "0.0.7",
-            "run-async": "2.3.0",
-            "rx-lite": "4.0.8",
-            "rx-lite-aggregates": "4.0.8",
-            "string-width": "2.1.1",
-            "strip-ansi": "4.0.0",
-            "through": "2.3.8"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
-        "regexpp": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
-          "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==",
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
           "dev": true
         },
-        "slice-ansi": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-          "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0"
-          }
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          }
-        },
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         },
         "supports-color": {
@@ -3252,30 +3209,7 @@
           "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
-          }
-        },
-        "table": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
-          "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
-          "dev": true,
-          "requires": {
-            "ajv": "5.5.2",
-            "ajv-keywords": "2.1.1",
-            "chalk": "2.4.2",
-            "lodash": "4.17.5",
-            "slice-ansi": "1.0.0",
-            "string-width": "2.1.1"
-          }
-        },
-        "write": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
-          "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
-          "dev": true,
-          "requires": {
-            "mkdirp": "0.5.1"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -3286,11 +3220,11 @@
       "integrity": "sha512-1GrJFfSevQdYpoDzx8mEE2TDWsb/zmFuY09l6hURg1AeFIKQOvZ+vH0UPjzmd1CZIbfTV5HUkMeBmFiDBkgIsQ==",
       "dev": true,
       "requires": {
-        "loader-fs-cache": "1.0.1",
-        "loader-utils": "1.1.0",
-        "object-assign": "4.1.1",
-        "object-hash": "1.3.0",
-        "rimraf": "2.6.2"
+        "loader-fs-cache": "^1.0.0",
+        "loader-utils": "^1.0.2",
+        "object-assign": "^4.0.1",
+        "object-hash": "^1.1.4",
+        "rimraf": "^2.6.1"
       }
     },
     "eslint-plugin-vue": {
@@ -3299,7 +3233,7 @@
       "integrity": "sha512-esETKhVMI7Vdli70Wt4bvAwnZBJeM0pxVX9Yb0wWKxdCJc2EADalVYK/q2FzMw8oKN0wPMdqVCKS8kmR89recA==",
       "dev": true,
       "requires": {
-        "vue-eslint-parser": "2.0.3"
+        "vue-eslint-parser": "^2.0.3"
       }
     },
     "eslint-scope": {
@@ -3308,16 +3242,41 @@
       "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
       "dev": true,
       "requires": {
-        "esrecurse": "4.2.1",
-        "estraverse": "4.2.0"
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
       }
     },
+    "eslint-utils": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
+      "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
+      "dev": true
+    },
     "eslint-visitor-keys": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
       "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
       "dev": true
     },
+    "espree": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
+      "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
+      "dev": true,
+      "requires": {
+        "acorn": "^6.0.7",
+        "acorn-jsx": "^5.0.0",
+        "eslint-visitor-keys": "^1.0.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
+          "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
+          "dev": true
+        }
+      }
+    },
     "esprima": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
@@ -3330,7 +3289,7 @@
       "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
       "dev": true,
       "requires": {
-        "estraverse": "4.2.0"
+        "estraverse": "^4.0.0"
       }
     },
     "esrecurse": {
@@ -3339,7 +3298,7 @@
       "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
       "dev": true,
       "requires": {
-        "estraverse": "4.2.0"
+        "estraverse": "^4.1.0"
       }
     },
     "estraverse": {
@@ -3378,8 +3337,8 @@
       "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
       "dev": true,
       "requires": {
-        "md5.js": "1.3.5",
-        "safe-buffer": "5.1.1"
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
       }
     },
     "execa": {
@@ -3388,13 +3347,13 @@
       "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
       "dev": true,
       "requires": {
-        "cross-spawn": "6.0.5",
-        "get-stream": "3.0.0",
-        "is-stream": "1.1.0",
-        "npm-run-path": "2.0.2",
-        "p-finally": "1.0.0",
-        "signal-exit": "3.0.2",
-        "strip-eof": "1.0.0"
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^3.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
       }
     },
     "expand-brackets": {
@@ -3403,13 +3362,13 @@
       "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "dev": true,
       "requires": {
-        "debug": "2.6.9",
-        "define-property": "0.2.5",
-        "extend-shallow": "2.0.1",
-        "posix-character-classes": "0.1.1",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       },
       "dependencies": {
         "debug": {
@@ -3427,7 +3386,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "0.1.6"
+            "is-descriptor": "^0.1.0"
           }
         },
         "extend-shallow": {
@@ -3436,7 +3395,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
@@ -3447,36 +3406,36 @@
       "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=",
       "dev": true,
       "requires": {
-        "accepts": "1.3.5",
+        "accepts": "~1.3.5",
         "array-flatten": "1.1.1",
         "body-parser": "1.18.2",
         "content-disposition": "0.5.2",
-        "content-type": "1.0.4",
+        "content-type": "~1.0.4",
         "cookie": "0.3.1",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "1.1.2",
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "etag": "1.8.1",
+        "depd": "~1.1.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
         "finalhandler": "1.1.1",
         "fresh": "0.5.2",
         "merge-descriptors": "1.0.1",
-        "methods": "1.1.2",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.2",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.2",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "2.0.4",
+        "proxy-addr": "~2.0.3",
         "qs": "6.5.1",
-        "range-parser": "1.2.0",
+        "range-parser": "~1.2.0",
         "safe-buffer": "5.1.1",
         "send": "0.16.2",
         "serve-static": "1.13.2",
         "setprototypeof": "1.1.0",
-        "statuses": "1.4.0",
-        "type-is": "1.6.16",
+        "statuses": "~1.4.0",
+        "type-is": "~1.6.16",
         "utils-merge": "1.0.1",
-        "vary": "1.1.2"
+        "vary": "~1.1.2"
       },
       "dependencies": {
         "array-flatten": {
@@ -3513,8 +3472,8 @@
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "dev": true,
       "requires": {
-        "assign-symbols": "1.0.0",
-        "is-extendable": "1.0.1"
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
       },
       "dependencies": {
         "is-extendable": {
@@ -3523,25 +3482,36 @@
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
-            "is-plain-object": "2.0.4"
+            "is-plain-object": "^2.0.4"
           }
         }
       }
     },
+    "external-editor": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
+      "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
+      "dev": true,
+      "requires": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      }
+    },
     "extglob": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
       "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "dev": true,
       "requires": {
-        "array-unique": "0.3.2",
-        "define-property": "1.0.0",
-        "expand-brackets": "2.1.4",
-        "extend-shallow": "2.0.1",
-        "fragment-cache": "0.2.1",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       },
       "dependencies": {
         "define-property": {
@@ -3550,7 +3520,7 @@
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "1.0.2"
+            "is-descriptor": "^1.0.0"
           }
         },
         "extend-shallow": {
@@ -3559,7 +3529,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         },
         "is-accessor-descriptor": {
@@ -3568,7 +3538,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-data-descriptor": {
@@ -3577,7 +3547,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-descriptor": {
@@ -3586,9 +3556,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "1.0.0",
-            "is-data-descriptor": "1.0.0",
-            "kind-of": "6.0.2"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         }
       }
@@ -3599,9 +3569,10 @@
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "fast-deep-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
-      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "dev": true
     },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
@@ -3626,7 +3597,7 @@
       "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
       "dev": true,
       "requires": {
-        "websocket-driver": "0.7.0"
+        "websocket-driver": ">=0.5.1"
       }
     },
     "figgy-pudding": {
@@ -3641,7 +3612,16 @@
       "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "1.0.5"
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "file-entry-cache": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^2.0.1"
       }
     },
     "file-loader": {
@@ -3650,8 +3630,8 @@
       "integrity": "sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.1.0",
-        "schema-utils": "1.0.0"
+        "loader-utils": "^1.0.2",
+        "schema-utils": "^1.0.0"
       },
       "dependencies": {
         "ajv": {
@@ -3660,10 +3640,10 @@
           "integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "2.0.1",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.4.1",
-            "uri-js": "4.2.2"
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
         "fast-deep-equal": {
@@ -3690,9 +3670,9 @@
           "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
           "dev": true,
           "requires": {
-            "ajv": "6.5.3",
-            "ajv-errors": "1.0.0",
-            "ajv-keywords": "3.2.0"
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
           }
         },
         "uri-js": {
@@ -3701,21 +3681,27 @@
           "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
           "dev": true,
           "requires": {
-            "punycode": "2.1.1"
+            "punycode": "^2.1.0"
           }
         }
       }
     },
+    "filesize": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
+      "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==",
+      "dev": true
+    },
     "fill-range": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
       "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "dev": true,
       "requires": {
-        "extend-shallow": "2.0.1",
-        "is-number": "3.0.0",
-        "repeat-string": "1.6.1",
-        "to-regex-range": "2.1.1"
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
       },
       "dependencies": {
         "extend-shallow": {
@@ -3724,7 +3710,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
@@ -3736,12 +3722,12 @@
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.2",
-        "statuses": "1.4.0",
-        "unpipe": "1.0.0"
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.2",
+        "statuses": "~1.4.0",
+        "unpipe": "~1.0.0"
       },
       "dependencies": {
         "debug": {
@@ -3761,9 +3747,9 @@
       "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
       "dev": true,
       "requires": {
-        "commondir": "1.0.1",
-        "make-dir": "1.1.0",
-        "pkg-dir": "2.0.0"
+        "commondir": "^1.0.1",
+        "make-dir": "^1.0.0",
+        "pkg-dir": "^2.0.0"
       }
     },
     "find-up": {
@@ -3771,32 +3757,76 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
       "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
       "requires": {
-        "path-exists": "2.1.0",
-        "pinkie-promise": "2.0.1"
+        "path-exists": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       }
     },
+    "flat-cache": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+      "dev": true,
+      "requires": {
+        "flatted": "^2.0.0",
+        "rimraf": "2.6.3",
+        "write": "1.0.3"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
+    "flatted": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.0.tgz",
+      "integrity": "sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==",
+      "dev": true
+    },
     "flush-write-stream": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
       "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3"
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.4"
       }
     },
     "follow-redirects": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.4.1.tgz",
       "integrity": "sha512-uxYePVPogtya1ktGnAAXOacnbIuRMB4dkvqeNz2qTtTQsuzSfbDolV+wMMKxAmCx0bLgAKLbBOkjItMbbkR1vg==",
+      "dev": true,
       "requires": {
-        "debug": "3.1.0"
+        "debug": "^3.1.0"
       },
       "dependencies": {
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
           "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
@@ -3815,7 +3845,7 @@
       "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
       "dev": true,
       "requires": {
-        "for-in": "1.0.2"
+        "for-in": "^1.0.1"
       }
     },
     "forever-agent": {
@@ -3828,9 +3858,9 @@
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
       "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
       "requires": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.7",
-        "mime-types": "2.1.17"
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
       }
     },
     "forwarded": {
@@ -3845,7 +3875,7 @@
       "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
       "dev": true,
       "requires": {
-        "map-cache": "0.2.2"
+        "map-cache": "^0.2.2"
       }
     },
     "fresh": {
@@ -3860,8 +3890,8 @@
       "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3"
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
       }
     },
     "fs-write-stream-atomic": {
@@ -3870,10 +3900,10 @@
       "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "iferr": "0.1.5",
-        "imurmurhash": "0.1.4",
-        "readable-stream": "2.3.3"
+        "graceful-fs": "^4.1.2",
+        "iferr": "^0.1.5",
+        "imurmurhash": "^0.1.4",
+        "readable-stream": "1 || 2"
       }
     },
     "fs.realpath": {
@@ -3881,15 +3911,563 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
-    "fstream": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+    "fsevents": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
+      "dev": true,
+      "optional": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "inherits": "2.0.3",
-        "mkdirp": "0.5.1",
-        "rimraf": "2.6.2"
+        "nan": "^2.12.1",
+        "node-pre-gyp": "^0.12.0"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aproba": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
+          }
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "balanced-match": "^1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "chownr": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "debug": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "deep-extend": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "fs-minipass": {
+          "version": "1.2.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
+        "ignore-walk": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimatch": "^3.0.4"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "once": "^1.3.0",
+            "wrappy": "1"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ini": {
+          "version": "1.3.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "minipass": {
+          "version": "2.3.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.0"
+          }
+        },
+        "minizlib": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "needle": {
+          "version": "2.3.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "^4.1.0",
+            "iconv-lite": "^0.4.4",
+            "sax": "^1.2.4"
+          }
+        },
+        "node-pre-gyp": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "^1.0.2",
+            "mkdirp": "^0.5.1",
+            "needle": "^2.2.1",
+            "nopt": "^4.0.1",
+            "npm-packlist": "^1.1.6",
+            "npmlog": "^4.0.2",
+            "rc": "^1.2.7",
+            "rimraf": "^2.6.1",
+            "semver": "^5.3.0",
+            "tar": "^4"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1",
+            "osenv": "^0.1.4"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "npm-packlist": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ignore-walk": "^3.0.1",
+            "npm-bundled": "^1.0.1"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "wrappy": "1"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "^0.6.0",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sax": {
+          "version": "1.2.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "semver": {
+          "version": "5.7.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "4.4.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chownr": "^1.1.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.3.4",
+            "minizlib": "^1.1.1",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "wide-align": {
+          "version": "1.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "^1.0.2 || 2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "yallist": {
+          "version": "3.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "fstream": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
       }
     },
     "function-bind": {
@@ -3909,14 +4487,14 @@
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "requires": {
-        "aproba": "1.2.0",
-        "console-control-strings": "1.1.0",
-        "has-unicode": "2.0.1",
-        "object-assign": "4.1.1",
-        "signal-exit": "3.0.2",
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wide-align": "1.1.3"
+        "aproba": "^1.0.3",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.0",
+        "object-assign": "^4.1.0",
+        "signal-exit": "^3.0.0",
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wide-align": "^1.1.0"
       }
     },
     "gaze": {
@@ -3924,7 +4502,7 @@
       "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
       "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
       "requires": {
-        "globule": "1.2.1"
+        "globule": "^1.0.0"
       }
     },
     "get-caller-file": {
@@ -3954,7 +4532,7 @@
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
       "requires": {
-        "assert-plus": "1.0.0"
+        "assert-plus": "^1.0.0"
       }
     },
     "glob": {
@@ -3962,12 +4540,12 @@
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
       "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
       "requires": {
-        "fs.realpath": "1.0.0",
-        "inflight": "1.0.6",
-        "inherits": "2.0.3",
-        "minimatch": "3.0.4",
-        "once": "1.4.0",
-        "path-is-absolute": "1.0.1"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       }
     },
     "glob-parent": {
@@ -3976,8 +4554,8 @@
       "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
       "dev": true,
       "requires": {
-        "is-glob": "3.1.0",
-        "path-dirname": "1.0.2"
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
       },
       "dependencies": {
         "is-glob": {
@@ -3986,7 +4564,7 @@
           "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
           "dev": true,
           "requires": {
-            "is-extglob": "2.1.1"
+            "is-extglob": "^2.1.0"
           }
         }
       }
@@ -4009,11 +4587,11 @@
       "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
       "dev": true,
       "requires": {
-        "array-union": "1.0.2",
-        "glob": "7.1.2",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
+        "array-union": "^1.0.1",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       }
     },
     "globule": {
@@ -4021,9 +4599,9 @@
       "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
       "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
       "requires": {
-        "glob": "7.1.2",
-        "lodash": "4.17.11",
-        "minimatch": "3.0.4"
+        "glob": "~7.1.1",
+        "lodash": "~4.17.10",
+        "minimatch": "~3.0.2"
       },
       "dependencies": {
         "lodash": {
@@ -4038,18 +4616,59 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
     },
+    "gzip-size": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
+      "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
+      "dev": true,
+      "requires": {
+        "duplexer": "^0.1.1",
+        "pify": "^4.0.1"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        }
+      }
+    },
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
       "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz",
-      "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
       "requires": {
-        "ajv": "5.5.2",
-        "har-schema": "2.0.0"
+        "ajv": "^6.5.5",
+        "har-schema": "^2.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+        }
       }
     },
     "has": {
@@ -4058,7 +4677,7 @@
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "dev": true,
       "requires": {
-        "function-bind": "1.1.1"
+        "function-bind": "^1.1.1"
       }
     },
     "has-ansi": {
@@ -4066,7 +4685,7 @@
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
       "requires": {
-        "ansi-regex": "2.1.1"
+        "ansi-regex": "^2.0.0"
       }
     },
     "has-flag": {
@@ -4092,9 +4711,9 @@
       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
       "dev": true,
       "requires": {
-        "get-value": "2.0.6",
-        "has-values": "1.0.0",
-        "isobject": "3.0.1"
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
       }
     },
     "has-values": {
@@ -4103,8 +4722,8 @@
       "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
       "dev": true,
       "requires": {
-        "is-number": "3.0.0",
-        "kind-of": "4.0.0"
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
       },
       "dependencies": {
         "kind-of": {
@@ -4113,7 +4732,7 @@
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -4124,8 +4743,8 @@
       "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.1"
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
     "hash-sum": {
@@ -4140,8 +4759,8 @@
       "integrity": "sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.1"
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
       }
     },
     "he": {
@@ -4156,11 +4775,17 @@
       "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
       "dev": true,
       "requires": {
-        "hash.js": "1.1.5",
-        "minimalistic-assert": "1.0.1",
-        "minimalistic-crypto-utils": "1.0.1"
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
       }
     },
+    "hoopy": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
+      "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
+      "dev": true
+    },
     "hosted-git-info": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
@@ -4172,10 +4797,10 @@
       "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "obuf": "1.1.2",
-        "readable-stream": "2.3.3",
-        "wbuf": "1.7.3"
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
       }
     },
     "html-entities": {
@@ -4196,10 +4821,10 @@
       "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
       "dev": true,
       "requires": {
-        "depd": "1.1.2",
+        "depd": "~1.1.2",
         "inherits": "2.0.3",
         "setprototypeof": "1.1.0",
-        "statuses": "1.4.0"
+        "statuses": ">= 1.4.0 < 2"
       }
     },
     "http-parser-js": {
@@ -4214,9 +4839,9 @@
       "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
       "dev": true,
       "requires": {
-        "eventemitter3": "3.1.0",
-        "follow-redirects": "1.4.1",
-        "requires-port": "1.0.0"
+        "eventemitter3": "^3.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
       }
     },
     "http-signature": {
@@ -4224,9 +4849,9 @@
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
       "requires": {
-        "assert-plus": "1.0.0",
-        "jsprim": "1.4.1",
-        "sshpk": "1.15.1"
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
       }
     },
     "https-browserify": {
@@ -4241,7 +4866,7 @@
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "dev": true,
       "requires": {
-        "safer-buffer": "2.1.2"
+        "safer-buffer": ">= 2.1.2 < 3"
       }
     },
     "icss-replace-symbols": {
@@ -4256,7 +4881,7 @@
       "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.21"
+        "postcss": "^6.0.1"
       }
     },
     "ieee754": {
@@ -4271,13 +4896,37 @@
       "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
       "dev": true
     },
+    "ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true
+    },
     "import-cwd": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
       "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
       "dev": true,
       "requires": {
-        "import-from": "2.1.0"
+        "import-from": "^2.1.0"
+      }
+    },
+    "import-fresh": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.0.0.tgz",
+      "integrity": "sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==",
+      "dev": true,
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+          "dev": true
+        }
       }
     },
     "import-from": {
@@ -4286,7 +4935,7 @@
       "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
       "dev": true,
       "requires": {
-        "resolve-from": "3.0.0"
+        "resolve-from": "^3.0.0"
       }
     },
     "import-local": {
@@ -4295,8 +4944,8 @@
       "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
       "dev": true,
       "requires": {
-        "pkg-dir": "3.0.0",
-        "resolve-cwd": "2.0.0"
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
       },
       "dependencies": {
         "find-up": {
@@ -4305,7 +4954,7 @@
           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "locate-path": "3.0.0"
+            "locate-path": "^3.0.0"
           }
         },
         "locate-path": {
@@ -4314,8 +4963,8 @@
           "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "dev": true,
           "requires": {
-            "p-locate": "3.0.0",
-            "path-exists": "3.0.0"
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
           }
         },
         "p-limit": {
@@ -4324,7 +4973,7 @@
           "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
           "dev": true,
           "requires": {
-            "p-try": "2.0.0"
+            "p-try": "^2.0.0"
           }
         },
         "p-locate": {
@@ -4333,7 +4982,7 @@
           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
-            "p-limit": "2.0.0"
+            "p-limit": "^2.0.0"
           }
         },
         "p-try": {
@@ -4354,7 +5003,7 @@
           "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
           "dev": true,
           "requires": {
-            "find-up": "3.0.0"
+            "find-up": "^3.0.0"
           }
         }
       }
@@ -4375,7 +5024,7 @@
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
       "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
       "requires": {
-        "repeating": "2.0.1"
+        "repeating": "^2.0.0"
       }
     },
     "indexes-of": {
@@ -4395,8 +5044,8 @@
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "requires": {
-        "once": "1.4.0",
-        "wrappy": "1.0.2"
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
     "inherits": {
@@ -4404,6 +5053,114 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
+    "inquirer": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.3.1.tgz",
+      "integrity": "sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^3.2.0",
+        "chalk": "^2.4.2",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^2.0.0",
+        "lodash": "^4.17.11",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rxjs": "^6.4.0",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^5.1.0",
+        "through": "^2.3.6"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "lodash": {
+          "version": "4.17.11",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^3.0.0"
+              }
+            }
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+              "dev": true
+            }
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
     "interpret": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
@@ -4416,7 +5173,7 @@
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "dev": true,
       "requires": {
-        "loose-envify": "1.4.0"
+        "loose-envify": "^1.0.0"
       }
     },
     "invert-kv": {
@@ -4448,7 +5205,7 @@
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
@@ -4457,7 +5214,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -4473,21 +5230,14 @@
       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
       "dev": true,
       "requires": {
-        "binary-extensions": "1.12.0"
+        "binary-extensions": "^1.0.0"
       }
     },
     "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-    },
-    "is-builtin-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-      "requires": {
-        "builtin-modules": "1.1.1"
-      }
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
     },
     "is-callable": {
       "version": "1.1.4",
@@ -4501,7 +5251,7 @@
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
@@ -4510,7 +5260,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -4527,9 +5277,9 @@
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
       "requires": {
-        "is-accessor-descriptor": "0.1.6",
-        "is-data-descriptor": "0.1.4",
-        "kind-of": "5.1.0"
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
       },
       "dependencies": {
         "kind-of": {
@@ -4563,7 +5313,7 @@
       "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
       "requires": {
-        "number-is-nan": "1.0.1"
+        "number-is-nan": "^1.0.0"
       }
     },
     "is-fullwidth-code-point": {
@@ -4571,7 +5321,7 @@
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
       "requires": {
-        "number-is-nan": "1.0.1"
+        "number-is-nan": "^1.0.0"
       }
     },
     "is-glob": {
@@ -4580,7 +5330,7 @@
       "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
       "dev": true,
       "requires": {
-        "is-extglob": "2.1.1"
+        "is-extglob": "^2.1.1"
       }
     },
     "is-number": {
@@ -4589,7 +5339,7 @@
       "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
@@ -4598,7 +5348,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -4621,7 +5371,7 @@
       "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
       "dev": true,
       "requires": {
-        "is-path-inside": "1.0.1"
+        "is-path-inside": "^1.0.0"
       }
     },
     "is-path-inside": {
@@ -4630,7 +5380,7 @@
       "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
       "dev": true,
       "requires": {
-        "path-is-inside": "1.0.2"
+        "path-is-inside": "^1.0.1"
       }
     },
     "is-plain-object": {
@@ -4639,7 +5389,7 @@
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
       "requires": {
-        "isobject": "3.0.1"
+        "isobject": "^3.0.1"
       }
     },
     "is-promise": {
@@ -4654,15 +5404,9 @@
       "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
       "dev": true,
       "requires": {
-        "has": "1.0.3"
+        "has": "^1.0.1"
       }
     },
-    "is-resolvable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
-      "dev": true
-    },
     "is-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
@@ -4675,7 +5419,7 @@
       "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
       "dev": true,
       "requires": {
-        "has-symbols": "1.0.0"
+        "has-symbols": "^1.0.0"
       }
     },
     "is-typedarray": {
@@ -4722,9 +5466,9 @@
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "js-base64": {
-      "version": "2.4.9",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.9.tgz",
-      "integrity": "sha512-xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ=="
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
+      "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="
     },
     "js-levenshtein": {
       "version": "1.1.3",
@@ -4738,13 +5482,13 @@
       "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
     },
     "js-yaml": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
-      "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
       "dev": true,
       "requires": {
-        "argparse": "1.0.10",
-        "esprima": "4.0.0"
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
       }
     },
     "jsbn": {
@@ -4770,9 +5514,10 @@
       "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
     "json-schema-traverse": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -4825,7 +5570,7 @@
       "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
       "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
       "requires": {
-        "invert-kv": "1.0.0"
+        "invert-kv": "^1.0.0"
       }
     },
     "levn": {
@@ -4834,8 +5579,8 @@
       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
       "dev": true,
       "requires": {
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2"
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
       }
     },
     "load-json-file": {
@@ -4843,11 +5588,11 @@
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "requires": {
-        "graceful-fs": "4.1.11",
-        "parse-json": "2.2.0",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1",
-        "strip-bom": "2.0.0"
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
       }
     },
     "loader-fs-cache": {
@@ -4856,7 +5601,7 @@
       "integrity": "sha1-VuC/CL2XCLJqdltoUJhAyN7J/bw=",
       "dev": true,
       "requires": {
-        "find-cache-dir": "0.1.1",
+        "find-cache-dir": "^0.1.1",
         "mkdirp": "0.5.1"
       },
       "dependencies": {
@@ -4866,9 +5611,9 @@
           "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
           "dev": true,
           "requires": {
-            "commondir": "1.0.1",
-            "mkdirp": "0.5.1",
-            "pkg-dir": "1.0.0"
+            "commondir": "^1.0.1",
+            "mkdirp": "^0.5.1",
+            "pkg-dir": "^1.0.0"
           }
         },
         "pkg-dir": {
@@ -4877,7 +5622,7 @@
           "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
           "dev": true,
           "requires": {
-            "find-up": "1.1.2"
+            "find-up": "^1.0.0"
           }
         }
       }
@@ -4894,9 +5639,9 @@
       "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
       "dev": true,
       "requires": {
-        "big.js": "3.2.0",
-        "emojis-list": "2.1.0",
-        "json5": "0.5.1"
+        "big.js": "^3.1.3",
+        "emojis-list": "^2.0.0",
+        "json5": "^0.5.0"
       }
     },
     "locate-path": {
@@ -4905,8 +5650,8 @@
       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
       "dev": true,
       "requires": {
-        "p-locate": "2.0.0",
-        "path-exists": "3.0.0"
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
       },
       "dependencies": {
         "path-exists": {
@@ -4918,14 +5663,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.5",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz",
-      "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw=="
-    },
-    "lodash.assign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
+      "version": "4.17.11",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
     },
     "lodash.camelcase": {
       "version": "4.3.0",
@@ -4933,11 +5673,6 @@
       "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
       "dev": true
     },
-    "lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
-    },
     "lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
@@ -4949,11 +5684,6 @@
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
       "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ=="
     },
-    "lodash.mergewith": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
-      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ=="
-    },
     "lodash.tail": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
@@ -4971,7 +5701,7 @@
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "requires": {
-        "js-tokens": "3.0.2"
+        "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
     "loud-rejection": {
@@ -4979,8 +5709,8 @@
       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
       "requires": {
-        "currently-unhandled": "0.4.1",
-        "signal-exit": "3.0.2"
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.0"
       }
     },
     "lru-cache": {
@@ -4988,8 +5718,8 @@
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
       "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
       "requires": {
-        "pseudomap": "1.0.2",
-        "yallist": "2.1.2"
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
       }
     },
     "make-dir": {
@@ -4998,7 +5728,7 @@
       "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==",
       "dev": true,
       "requires": {
-        "pify": "3.0.0"
+        "pify": "^3.0.0"
       },
       "dependencies": {
         "pify": {
@@ -5015,7 +5745,7 @@
       "integrity": "sha512-UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==",
       "dev": true,
       "requires": {
-        "p-defer": "1.0.0"
+        "p-defer": "^1.0.0"
       }
     },
     "map-cache": {
@@ -5035,7 +5765,7 @@
       "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
       "dev": true,
       "requires": {
-        "object-visit": "1.0.1"
+        "object-visit": "^1.0.0"
       }
     },
     "md5.js": {
@@ -5044,9 +5774,9 @@
       "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
       "dev": true,
       "requires": {
-        "hash-base": "3.0.4",
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.2"
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
       },
       "dependencies": {
         "safe-buffer": {
@@ -5074,9 +5804,9 @@
       "integrity": "sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==",
       "dev": true,
       "requires": {
-        "map-age-cleaner": "0.1.2",
-        "mimic-fn": "1.1.0",
-        "p-is-promise": "1.1.0"
+        "map-age-cleaner": "^0.1.1",
+        "mimic-fn": "^1.0.0",
+        "p-is-promise": "^1.1.0"
       }
     },
     "memory-fs": {
@@ -5085,8 +5815,8 @@
       "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
       "dev": true,
       "requires": {
-        "errno": "0.1.7",
-        "readable-stream": "2.3.3"
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
       }
     },
     "meow": {
@@ -5094,16 +5824,16 @@
       "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "requires": {
-        "camelcase-keys": "2.1.0",
-        "decamelize": "1.2.0",
-        "loud-rejection": "1.6.0",
-        "map-obj": "1.0.1",
-        "minimist": "1.2.0",
-        "normalize-package-data": "2.4.0",
-        "object-assign": "4.1.1",
-        "read-pkg-up": "1.0.1",
-        "redent": "1.0.0",
-        "trim-newlines": "1.0.0"
+        "camelcase-keys": "^2.0.0",
+        "decamelize": "^1.1.2",
+        "loud-rejection": "^1.0.0",
+        "map-obj": "^1.0.1",
+        "minimist": "^1.1.3",
+        "normalize-package-data": "^2.3.4",
+        "object-assign": "^4.0.1",
+        "read-pkg-up": "^1.0.1",
+        "redent": "^1.0.0",
+        "trim-newlines": "^1.0.0"
       },
       "dependencies": {
         "minimist": {
@@ -5125,7 +5855,7 @@
       "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
       "dev": true,
       "requires": {
-        "source-map": "0.6.1"
+        "source-map": "^0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -5148,19 +5878,19 @@
       "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "dev": true,
       "requires": {
-        "arr-diff": "4.0.0",
-        "array-unique": "0.3.2",
-        "braces": "2.3.2",
-        "define-property": "2.0.2",
-        "extend-shallow": "3.0.2",
-        "extglob": "2.0.4",
-        "fragment-cache": "0.2.1",
-        "kind-of": "6.0.2",
-        "nanomatch": "1.2.13",
-        "object.pick": "1.3.0",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
       }
     },
     "miller-rabin": {
@@ -5169,8 +5899,8 @@
       "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "brorand": "1.1.0"
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
       }
     },
     "mime": {
@@ -5189,7 +5919,7 @@
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
       "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
       "requires": {
-        "mime-db": "1.30.0"
+        "mime-db": "~1.30.0"
       }
     },
     "mimic-fn": {
@@ -5215,7 +5945,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "requires": {
-        "brace-expansion": "1.1.8"
+        "brace-expansion": "^1.1.7"
       }
     },
     "minimist": {
@@ -5229,16 +5959,16 @@
       "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
       "dev": true,
       "requires": {
-        "concat-stream": "1.6.2",
-        "duplexify": "3.6.0",
-        "end-of-stream": "1.4.1",
-        "flush-write-stream": "1.0.3",
-        "from2": "2.3.0",
-        "parallel-transform": "1.1.0",
-        "pump": "3.0.0",
-        "pumpify": "1.5.1",
-        "stream-each": "1.2.3",
-        "through2": "2.0.3"
+        "concat-stream": "^1.5.0",
+        "duplexify": "^3.4.2",
+        "end-of-stream": "^1.1.0",
+        "flush-write-stream": "^1.0.0",
+        "from2": "^2.1.0",
+        "parallel-transform": "^1.1.0",
+        "pump": "^3.0.0",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
       }
     },
     "mixin-deep": {
@@ -5247,8 +5977,8 @@
       "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
       "dev": true,
       "requires": {
-        "for-in": "1.0.2",
-        "is-extendable": "1.0.1"
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
       },
       "dependencies": {
         "is-extendable": {
@@ -5257,7 +5987,7 @@
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
           "requires": {
-            "is-plain-object": "2.0.4"
+            "is-plain-object": "^2.0.4"
           }
         }
       }
@@ -5268,8 +5998,8 @@
       "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
       "dev": true,
       "requires": {
-        "for-in": "0.1.8",
-        "is-extendable": "0.1.1"
+        "for-in": "^0.1.3",
+        "is-extendable": "^0.1.1"
       },
       "dependencies": {
         "for-in": {
@@ -5299,12 +6029,12 @@
       "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
       "dev": true,
       "requires": {
-        "aproba": "1.2.0",
-        "copy-concurrently": "1.0.5",
-        "fs-write-stream-atomic": "1.0.10",
-        "mkdirp": "0.5.1",
-        "rimraf": "2.6.2",
-        "run-queue": "1.0.3"
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
       }
     },
     "ms": {
@@ -5318,8 +6048,8 @@
       "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
       "dev": true,
       "requires": {
-        "dns-packet": "1.3.1",
-        "thunky": "1.0.2"
+        "dns-packet": "^1.3.1",
+        "thunky": "^1.0.2"
       }
     },
     "multicast-dns-service-types": {
@@ -5335,9 +6065,9 @@
       "dev": true
     },
     "nan": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
-      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -5345,17 +6075,17 @@
       "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "dev": true,
       "requires": {
-        "arr-diff": "4.0.0",
-        "array-unique": "0.3.2",
-        "define-property": "2.0.2",
-        "extend-shallow": "3.0.2",
-        "fragment-cache": "0.2.1",
-        "is-windows": "1.0.2",
-        "kind-of": "6.0.2",
-        "object.pick": "1.3.0",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       }
     },
     "natural-compare": {
@@ -5393,18 +6123,18 @@
       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
       "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
       "requires": {
-        "fstream": "1.0.11",
-        "glob": "7.1.2",
-        "graceful-fs": "4.1.11",
-        "mkdirp": "0.5.1",
-        "nopt": "3.0.6",
-        "npmlog": "4.1.2",
-        "osenv": "0.1.5",
-        "request": "2.88.0",
-        "rimraf": "2.6.2",
-        "semver": "5.3.0",
-        "tar": "2.2.1",
-        "which": "1.3.0"
+        "fstream": "^1.0.0",
+        "glob": "^7.0.3",
+        "graceful-fs": "^4.1.2",
+        "mkdirp": "^0.5.0",
+        "nopt": "2 || 3",
+        "npmlog": "0 || 1 || 2 || 3 || 4",
+        "osenv": "0",
+        "request": "^2.87.0",
+        "rimraf": "2",
+        "semver": "~5.3.0",
+        "tar": "^2.0.0",
+        "which": "1"
       },
       "dependencies": {
         "semver": {
@@ -5420,28 +6150,28 @@
       "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==",
       "dev": true,
       "requires": {
-        "assert": "1.4.1",
-        "browserify-zlib": "0.2.0",
-        "buffer": "4.9.1",
-        "console-browserify": "1.1.0",
-        "constants-browserify": "1.0.0",
-        "crypto-browserify": "3.12.0",
-        "domain-browser": "1.2.0",
-        "events": "1.1.1",
-        "https-browserify": "1.0.0",
-        "os-browserify": "0.3.0",
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^1.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
         "path-browserify": "0.0.0",
-        "process": "0.11.10",
-        "punycode": "1.4.1",
-        "querystring-es3": "0.2.1",
-        "readable-stream": "2.3.3",
-        "stream-browserify": "2.0.1",
-        "stream-http": "2.8.3",
-        "string_decoder": "1.0.3",
-        "timers-browserify": "2.0.10",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
         "tty-browserify": "0.0.0",
-        "url": "0.11.0",
-        "util": "0.10.4",
+        "url": "^0.11.0",
+        "util": "^0.10.3",
         "vm-browserify": "0.0.4"
       }
     },
@@ -5451,33 +6181,31 @@
       "integrity": "sha512-CaViu+2FqTNYOYNihXa5uPS/zry92I3vPU4nCB6JB3OeZ2UGtOpF5gRwuN4+m3hbEcL47bOXyun1jX2iC+3uEQ==",
       "dev": true,
       "requires": {
-        "semver": "5.4.1"
+        "semver": "^5.3.0"
       }
     },
     "node-sass": {
-      "version": "4.9.4",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.4.tgz",
-      "integrity": "sha512-MXyurANsUoE4/6KmfMkwGcBzAnJQ5xJBGW7Ei6ea8KnUKuzHr/SguVBIi3uaUAHtZCPUYkvlJ3Ef5T5VAwVpaA==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",
+      "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
       "requires": {
-        "async-foreach": "0.1.3",
-        "chalk": "1.1.3",
-        "cross-spawn": "3.0.1",
-        "gaze": "1.1.3",
-        "get-stdin": "4.0.1",
-        "glob": "7.1.2",
-        "in-publish": "2.0.0",
-        "lodash.assign": "4.2.0",
-        "lodash.clonedeep": "4.5.0",
-        "lodash.mergewith": "4.6.1",
-        "meow": "3.7.0",
-        "mkdirp": "0.5.1",
-        "nan": "2.10.0",
-        "node-gyp": "3.8.0",
-        "npmlog": "4.1.2",
-        "request": "2.88.0",
-        "sass-graph": "2.2.4",
-        "stdout-stream": "1.4.1",
-        "true-case-path": "1.0.3"
+        "async-foreach": "^0.1.3",
+        "chalk": "^1.1.1",
+        "cross-spawn": "^3.0.0",
+        "gaze": "^1.0.0",
+        "get-stdin": "^4.0.1",
+        "glob": "^7.0.3",
+        "in-publish": "^2.0.0",
+        "lodash": "^4.17.11",
+        "meow": "^3.7.0",
+        "mkdirp": "^0.5.1",
+        "nan": "^2.13.2",
+        "node-gyp": "^3.8.0",
+        "npmlog": "^4.0.0",
+        "request": "^2.88.0",
+        "sass-graph": "^2.2.4",
+        "stdout-stream": "^1.4.0",
+        "true-case-path": "^1.0.2"
       },
       "dependencies": {
         "cross-spawn": {
@@ -5485,9 +6213,14 @@
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
           "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
           "requires": {
-            "lru-cache": "4.1.1",
-            "which": "1.3.0"
+            "lru-cache": "^4.0.1",
+            "which": "^1.2.9"
           }
+        },
+        "lodash": {
+          "version": "4.17.11",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
         }
       }
     },
@@ -5496,18 +6229,28 @@
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "requires": {
-        "abbrev": "1.1.1"
+        "abbrev": "1"
       }
     },
     "normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
       "requires": {
-        "hosted-git-info": "2.7.1",
-        "is-builtin-module": "1.0.0",
-        "semver": "5.4.1",
-        "validate-npm-package-license": "3.0.4"
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.11.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz",
+          "integrity": "sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==",
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        }
       }
     },
     "normalize-path": {
@@ -5516,7 +6259,7 @@
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
       "dev": true,
       "requires": {
-        "remove-trailing-separator": "1.1.0"
+        "remove-trailing-separator": "^1.0.1"
       }
     },
     "normalize-range": {
@@ -5531,7 +6274,7 @@
       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
       "dev": true,
       "requires": {
-        "path-key": "2.0.1"
+        "path-key": "^2.0.0"
       }
     },
     "npmlog": {
@@ -5539,10 +6282,10 @@
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
       "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "requires": {
-        "are-we-there-yet": "1.1.5",
-        "console-control-strings": "1.1.0",
-        "gauge": "2.7.4",
-        "set-blocking": "2.0.0"
+        "are-we-there-yet": "~1.1.2",
+        "console-control-strings": "~1.1.0",
+        "gauge": "~2.7.3",
+        "set-blocking": "~2.0.0"
       }
     },
     "num2fraction": {
@@ -5572,9 +6315,9 @@
       "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
       "dev": true,
       "requires": {
-        "copy-descriptor": "0.1.1",
-        "define-property": "0.2.5",
-        "kind-of": "3.2.2"
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
       },
       "dependencies": {
         "define-property": {
@@ -5583,7 +6326,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "0.1.6"
+            "is-descriptor": "^0.1.0"
           }
         },
         "kind-of": {
@@ -5592,7 +6335,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -5615,7 +6358,7 @@
       "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
       "dev": true,
       "requires": {
-        "isobject": "3.0.1"
+        "isobject": "^3.0.0"
       }
     },
     "object.getownpropertydescriptors": {
@@ -5624,8 +6367,8 @@
       "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
       "dev": true,
       "requires": {
-        "define-properties": "1.1.3",
-        "es-abstract": "1.12.0"
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.5.1"
       }
     },
     "object.pick": {
@@ -5634,7 +6377,7 @@
       "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
       "dev": true,
       "requires": {
-        "isobject": "3.0.1"
+        "isobject": "^3.0.1"
       }
     },
     "obuf": {
@@ -5663,7 +6406,7 @@
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "requires": {
-        "wrappy": "1.0.2"
+        "wrappy": "1"
       }
     },
     "onetime": {
@@ -5672,16 +6415,22 @@
       "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
       "dev": true,
       "requires": {
-        "mimic-fn": "1.1.0"
+        "mimic-fn": "^1.0.0"
       }
     },
+    "opener": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz",
+      "integrity": "sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==",
+      "dev": true
+    },
     "opn": {
       "version": "5.4.0",
       "resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
       "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
       "dev": true,
       "requires": {
-        "is-wsl": "1.1.0"
+        "is-wsl": "^1.1.0"
       }
     },
     "optionator": {
@@ -5690,12 +6439,12 @@
       "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
       "dev": true,
       "requires": {
-        "deep-is": "0.1.3",
-        "fast-levenshtein": "2.0.6",
-        "levn": "0.3.0",
-        "prelude-ls": "1.1.2",
-        "type-check": "0.3.2",
-        "wordwrap": "1.0.0"
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.4",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "wordwrap": "~1.0.0"
       }
     },
     "original": {
@@ -5704,7 +6453,7 @@
       "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
       "dev": true,
       "requires": {
-        "url-parse": "1.4.3"
+        "url-parse": "^1.4.3"
       }
     },
     "os-browserify": {
@@ -5723,7 +6472,7 @@
       "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "requires": {
-        "lcid": "1.0.0"
+        "lcid": "^1.0.0"
       }
     },
     "os-tmpdir": {
@@ -5736,8 +6485,8 @@
       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
       "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "requires": {
-        "os-homedir": "1.0.2",
-        "os-tmpdir": "1.0.2"
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
       }
     },
     "p-defer": {
@@ -5764,7 +6513,7 @@
       "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
       "dev": true,
       "requires": {
-        "p-try": "1.0.0"
+        "p-try": "^1.0.0"
       }
     },
     "p-locate": {
@@ -5773,7 +6522,7 @@
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "dev": true,
       "requires": {
-        "p-limit": "1.2.0"
+        "p-limit": "^1.1.0"
       }
     },
     "p-map": {
@@ -5800,9 +6549,18 @@
       "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
       "dev": true,
       "requires": {
-        "cyclist": "0.2.2",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3"
+        "cyclist": "~0.2.2",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
+      }
+    },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0"
       }
     },
     "parse-asn1": {
@@ -5811,11 +6569,11 @@
       "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
       "dev": true,
       "requires": {
-        "asn1.js": "4.10.1",
-        "browserify-aes": "1.2.0",
-        "create-hash": "1.2.0",
-        "evp_bytestokey": "1.0.3",
-        "pbkdf2": "3.0.17"
+        "asn1.js": "^4.0.0",
+        "browserify-aes": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3"
       }
     },
     "parse-json": {
@@ -5823,7 +6581,7 @@
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
       "requires": {
-        "error-ex": "1.3.1"
+        "error-ex": "^1.2.0"
       }
     },
     "parseurl": {
@@ -5855,7 +6613,7 @@
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
       "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
       "requires": {
-        "pinkie-promise": "2.0.1"
+        "pinkie-promise": "^2.0.0"
       }
     },
     "path-is-absolute": {
@@ -5878,8 +6636,7 @@
     "path-parse": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-      "dev": true
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
     },
     "path-to-regexp": {
       "version": "0.1.7",
@@ -5892,9 +6649,9 @@
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
       "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
       "requires": {
-        "graceful-fs": "4.1.11",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       }
     },
     "pbkdf2": {
@@ -5903,11 +6660,11 @@
       "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
       "dev": true,
       "requires": {
-        "create-hash": "1.2.0",
-        "create-hmac": "1.1.7",
-        "ripemd160": "2.0.2",
-        "safe-buffer": "5.1.1",
-        "sha.js": "2.4.11"
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
       }
     },
     "performance-now": {
@@ -5930,7 +6687,7 @@
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
       "requires": {
-        "pinkie": "2.0.4"
+        "pinkie": "^2.0.0"
       }
     },
     "pkg-dir": {
@@ -5939,7 +6696,7 @@
       "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
       "dev": true,
       "requires": {
-        "find-up": "2.1.0"
+        "find-up": "^2.1.0"
       },
       "dependencies": {
         "find-up": {
@@ -5948,17 +6705,11 @@
           "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
           "dev": true,
           "requires": {
-            "locate-path": "2.0.0"
+            "locate-path": "^2.0.0"
           }
         }
       }
     },
-    "pluralize": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
-      "dev": true
-    },
     "popper.js": {
       "version": "1.14.3",
       "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.3.tgz",
@@ -5970,9 +6721,9 @@
       "integrity": "sha512-syFcRIRzVI1BoEFOCaAiizwDolh1S1YXSodsVhncbhjzjZQulhczNRbqnUl9N31Q4dKGOXsNDqxC2BWBgSMqeQ==",
       "dev": true,
       "requires": {
-        "async": "1.5.2",
-        "debug": "2.6.9",
-        "mkdirp": "0.5.1"
+        "async": "^1.5.2",
+        "debug": "^2.2.0",
+        "mkdirp": "0.5.x"
       },
       "dependencies": {
         "debug": {
@@ -5998,9 +6749,9 @@
       "integrity": "sha512-y/bKfbQz2Nn/QBC08bwvYUxEFOVGfPIUOTsJ2CK5inzlXW9SdYR1x4pEsG9blRAF/PX+wRNdOah+gx/hv4q7dw==",
       "dev": true,
       "requires": {
-        "chalk": "2.3.2",
-        "source-map": "0.6.1",
-        "supports-color": "5.3.0"
+        "chalk": "^2.3.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.3.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -6009,7 +6760,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
@@ -6018,9 +6769,9 @@
           "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.3.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "source-map": {
@@ -6035,7 +6786,7 @@
           "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -6046,8 +6797,8 @@
       "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==",
       "dev": true,
       "requires": {
-        "cosmiconfig": "4.0.0",
-        "import-cwd": "2.1.0"
+        "cosmiconfig": "^4.0.0",
+        "import-cwd": "^2.0.0"
       }
     },
     "postcss-loader": {
@@ -6056,10 +6807,10 @@
       "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.1.0",
-        "postcss": "7.0.2",
-        "postcss-load-config": "2.0.0",
-        "schema-utils": "1.0.0"
+        "loader-utils": "^1.1.0",
+        "postcss": "^7.0.0",
+        "postcss-load-config": "^2.0.0",
+        "schema-utils": "^1.0.0"
       },
       "dependencies": {
         "ajv": {
@@ -6068,10 +6819,10 @@
           "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "2.0.1",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.4.1",
-            "uri-js": "4.2.2"
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.1"
           }
         },
         "ansi-styles": {
@@ -6080,7 +6831,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
@@ -6089,9 +6840,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.4.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "fast-deep-equal": {
@@ -6112,9 +6863,9 @@
           "integrity": "sha512-fmaUY5370keLUTx+CnwRxtGiuFTcNBLQBqr1oE3WZ/euIYmGAo0OAgOhVJ3ByDnVmOR3PK+0V9VebzfjRIUcqw==",
           "dev": true,
           "requires": {
-            "chalk": "2.4.1",
-            "source-map": "0.6.1",
-            "supports-color": "5.4.0"
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
           }
         },
         "punycode": {
@@ -6129,9 +6880,9 @@
           "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
           "dev": true,
           "requires": {
-            "ajv": "6.5.2",
-            "ajv-errors": "1.0.0",
-            "ajv-keywords": "3.2.0"
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
           }
         },
         "source-map": {
@@ -6146,7 +6897,7 @@
           "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         },
         "uri-js": {
@@ -6155,7 +6906,7 @@
           "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
           "dev": true,
           "requires": {
-            "punycode": "2.1.1"
+            "punycode": "^2.1.0"
           }
         }
       }
@@ -6166,7 +6917,7 @@
       "integrity": "sha1-ZhQOzs447wa/DT41XWm/WdFB6oU=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.21"
+        "postcss": "^6.0.1"
       }
     },
     "postcss-modules-local-by-default": {
@@ -6175,8 +6926,8 @@
       "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
       "dev": true,
       "requires": {
-        "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.21"
+        "css-selector-tokenizer": "^0.7.0",
+        "postcss": "^6.0.1"
       }
     },
     "postcss-modules-scope": {
@@ -6185,8 +6936,8 @@
       "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
       "dev": true,
       "requires": {
-        "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.21"
+        "css-selector-tokenizer": "^0.7.0",
+        "postcss": "^6.0.1"
       }
     },
     "postcss-modules-values": {
@@ -6195,8 +6946,8 @@
       "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
       "dev": true,
       "requires": {
-        "icss-replace-symbols": "1.1.0",
-        "postcss": "6.0.21"
+        "icss-replace-symbols": "^1.1.0",
+        "postcss": "^6.0.1"
       }
     },
     "postcss-selector-parser": {
@@ -6205,9 +6956,9 @@
       "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=",
       "dev": true,
       "requires": {
-        "dot-prop": "4.2.0",
-        "indexes-of": "1.0.1",
-        "uniq": "1.0.1"
+        "dot-prop": "^4.1.1",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
       }
     },
     "postcss-value-parser": {
@@ -6262,9 +7013,9 @@
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
       "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
       "requires": {
-        "loose-envify": "1.4.0",
-        "object-assign": "4.1.1",
-        "react-is": "16.8.4"
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.8.1"
       }
     },
     "proxy-addr": {
@@ -6273,7 +7024,7 @@
       "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
       "dev": true,
       "requires": {
-        "forwarded": "0.1.2",
+        "forwarded": "~0.1.2",
         "ipaddr.js": "1.8.0"
       }
     },
@@ -6289,9 +7040,9 @@
       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
     },
     "psl": {
-      "version": "1.1.29",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz",
-      "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ=="
+      "version": "1.1.32",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz",
+      "integrity": "sha512-MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g=="
     },
     "public-encrypt": {
       "version": "4.0.3",
@@ -6299,12 +7050,12 @@
       "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "browserify-rsa": "4.0.1",
-        "create-hash": "1.2.0",
-        "parse-asn1": "5.1.1",
-        "randombytes": "2.0.6",
-        "safe-buffer": "5.1.2"
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
       },
       "dependencies": {
         "safe-buffer": {
@@ -6321,8 +7072,8 @@
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
       "dev": true,
       "requires": {
-        "end-of-stream": "1.4.1",
-        "once": "1.4.0"
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
       }
     },
     "pumpify": {
@@ -6331,9 +7082,9 @@
       "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
       "dev": true,
       "requires": {
-        "duplexify": "3.6.0",
-        "inherits": "2.0.3",
-        "pump": "2.0.1"
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
       },
       "dependencies": {
         "pump": {
@@ -6342,8 +7093,8 @@
           "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
           "dev": true,
           "requires": {
-            "end-of-stream": "1.4.1",
-            "once": "1.4.0"
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
           }
         }
       }
@@ -6382,7 +7133,7 @@
       "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
       "dev": true,
       "requires": {
-        "safe-buffer": "5.1.1"
+        "safe-buffer": "^5.1.0"
       }
     },
     "randomfill": {
@@ -6391,8 +7142,8 @@
       "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
       "dev": true,
       "requires": {
-        "randombytes": "2.0.6",
-        "safe-buffer": "5.1.1"
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
       }
     },
     "range-parser": {
@@ -6428,7 +7179,7 @@
             "depd": "1.1.1",
             "inherits": "2.0.3",
             "setprototypeof": "1.0.3",
-            "statuses": "1.4.0"
+            "statuses": ">= 1.3.1 < 2"
           }
         },
         "iconv-lite": {
@@ -6450,10 +7201,10 @@
       "resolved": "https://registry.npmjs.org/react/-/react-16.8.4.tgz",
       "integrity": "sha512-0GQ6gFXfUH7aZcjGVymlPOASTuSjlQL4ZtVC5YKH+3JL6bBLCVO21DknzmaPlI90LN253ojj02nsapy+j7wIjg==",
       "requires": {
-        "loose-envify": "1.4.0",
-        "object-assign": "4.1.1",
-        "prop-types": "15.7.2",
-        "scheduler": "0.13.4"
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2",
+        "scheduler": "^0.13.4"
       }
     },
     "react-dom": {
@@ -6461,10 +7212,10 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.8.4.tgz",
       "integrity": "sha512-Ob2wK7XG2tUDt7ps7LtLzGYYB6DXMCLj0G5fO6WeEICtT4/HdpOi7W/xLzZnR6RCG1tYza60nMdqtxzA8FaPJQ==",
       "requires": {
-        "loose-envify": "1.4.0",
-        "object-assign": "4.1.1",
-        "prop-types": "15.7.2",
-        "scheduler": "0.13.4"
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.6.2",
+        "scheduler": "^0.13.4"
       }
     },
     "react-is": {
@@ -6477,9 +7228,9 @@
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
       "requires": {
-        "load-json-file": "1.1.0",
-        "normalize-package-data": "2.4.0",
-        "path-type": "1.1.0"
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
       }
     },
     "read-pkg-up": {
@@ -6487,8 +7238,8 @@
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "requires": {
-        "find-up": "1.1.2",
-        "read-pkg": "1.1.0"
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
       }
     },
     "readable-stream": {
@@ -6496,13 +7247,13 @@
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
       "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
       "requires": {
-        "core-util-is": "1.0.2",
-        "inherits": "2.0.3",
-        "isarray": "1.0.0",
-        "process-nextick-args": "1.0.7",
-        "safe-buffer": "5.1.1",
-        "string_decoder": "1.0.3",
-        "util-deprecate": "1.0.2"
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~1.0.6",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.0.3",
+        "util-deprecate": "~1.0.1"
       }
     },
     "readdirp": {
@@ -6511,9 +7262,9 @@
       "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.1.11",
-        "micromatch": "3.1.10",
-        "readable-stream": "2.3.3"
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
       }
     },
     "redent": {
@@ -6521,8 +7272,8 @@
       "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
       "requires": {
-        "indent-string": "2.1.0",
-        "strip-indent": "1.0.1"
+        "indent-string": "^2.1.0",
+        "strip-indent": "^1.0.1"
       }
     },
     "regenerate": {
@@ -6537,7 +7288,7 @@
       "integrity": "sha512-s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw==",
       "dev": true,
       "requires": {
-        "regenerate": "1.4.0"
+        "regenerate": "^1.4.0"
       },
       "dependencies": {
         "regenerate": {
@@ -6554,7 +7305,7 @@
       "integrity": "sha512-5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA==",
       "dev": true,
       "requires": {
-        "private": "0.1.8"
+        "private": "^0.1.6"
       }
     },
     "regex-not": {
@@ -6563,22 +7314,28 @@
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
       "requires": {
-        "extend-shallow": "3.0.2",
-        "safe-regex": "1.1.0"
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
       }
     },
+    "regexpp": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
+      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
+      "dev": true
+    },
     "regexpu-core": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.2.0.tgz",
       "integrity": "sha512-Z835VSnJJ46CNBttalHD/dB+Sj2ezmY6Xp38npwU87peK6mqOzOpV8eYktdkLTEkzzD+JsTcxd84ozd8I14+rw==",
       "dev": true,
       "requires": {
-        "regenerate": "1.4.0",
-        "regenerate-unicode-properties": "7.0.0",
-        "regjsgen": "0.4.0",
-        "regjsparser": "0.3.0",
-        "unicode-match-property-ecmascript": "1.0.4",
-        "unicode-match-property-value-ecmascript": "1.0.2"
+        "regenerate": "^1.4.0",
+        "regenerate-unicode-properties": "^7.0.0",
+        "regjsgen": "^0.4.0",
+        "regjsparser": "^0.3.0",
+        "unicode-match-property-ecmascript": "^1.0.4",
+        "unicode-match-property-value-ecmascript": "^1.0.2"
       },
       "dependencies": {
         "jsesc": {
@@ -6605,7 +7362,7 @@
           "integrity": "sha512-zza72oZBBHzt64G7DxdqrOo/30bhHkwMUoT0WqfGu98XLd7N+1tsy5MJ96Bk4MD0y74n629RhmrGW6XlnLLwCA==",
           "dev": true,
           "requires": {
-            "jsesc": "0.5.0"
+            "jsesc": "~0.5.0"
           }
         }
       }
@@ -6622,7 +7379,7 @@
       "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
       "dev": true,
       "requires": {
-        "jsesc": "0.5.0"
+        "jsesc": "~0.5.0"
       },
       "dependencies": {
         "jsesc": {
@@ -6656,7 +7413,7 @@
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
       "requires": {
-        "is-finite": "1.0.2"
+        "is-finite": "^1.0.0"
       }
     },
     "request": {
@@ -6664,39 +7421,39 @@
       "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
       "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
       "requires": {
-        "aws-sign2": "0.7.0",
-        "aws4": "1.8.0",
-        "caseless": "0.12.0",
-        "combined-stream": "1.0.7",
-        "extend": "3.0.2",
-        "forever-agent": "0.6.1",
-        "form-data": "2.3.3",
-        "har-validator": "5.1.0",
-        "http-signature": "1.2.0",
-        "is-typedarray": "1.0.0",
-        "isstream": "0.1.2",
-        "json-stringify-safe": "5.0.1",
-        "mime-types": "2.1.20",
-        "oauth-sign": "0.9.0",
-        "performance-now": "2.1.0",
-        "qs": "6.5.2",
-        "safe-buffer": "5.1.2",
-        "tough-cookie": "2.4.3",
-        "tunnel-agent": "0.6.0",
-        "uuid": "3.3.2"
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.0",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.4.3",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
       },
       "dependencies": {
         "mime-db": {
-          "version": "1.36.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz",
-          "integrity": "sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw=="
+          "version": "1.40.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+          "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
         },
         "mime-types": {
-          "version": "2.1.20",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.20.tgz",
-          "integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==",
+          "version": "2.1.24",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+          "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
           "requires": {
-            "mime-db": "1.36.0"
+            "mime-db": "1.40.0"
           }
         },
         "safe-buffer": {
@@ -6727,24 +7484,6 @@
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
       "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
     },
-    "require-uncached": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
-      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-      "dev": true,
-      "requires": {
-        "caller-path": "0.1.0",
-        "resolve-from": "1.0.1"
-      },
-      "dependencies": {
-        "resolve-from": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
-          "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
-          "dev": true
-        }
-      }
-    },
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
@@ -6757,7 +7496,7 @@
       "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==",
       "dev": true,
       "requires": {
-        "path-parse": "1.0.6"
+        "path-parse": "^1.0.5"
       }
     },
     "resolve-cwd": {
@@ -6766,7 +7505,7 @@
       "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
       "dev": true,
       "requires": {
-        "resolve-from": "3.0.0"
+        "resolve-from": "^3.0.0"
       }
     },
     "resolve-from": {
@@ -6787,8 +7526,8 @@
       "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
       "dev": true,
       "requires": {
-        "onetime": "2.0.1",
-        "signal-exit": "3.0.2"
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
       }
     },
     "ret": {
@@ -6802,7 +7541,7 @@
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
       "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
       "requires": {
-        "glob": "7.1.2"
+        "glob": "^7.0.5"
       }
     },
     "ripemd160": {
@@ -6811,8 +7550,8 @@
       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
       "dev": true,
       "requires": {
-        "hash-base": "3.0.4",
-        "inherits": "2.0.3"
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
       }
     },
     "run-async": {
@@ -6821,7 +7560,7 @@
       "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
       "dev": true,
       "requires": {
-        "is-promise": "2.1.0"
+        "is-promise": "^2.1.0"
       }
     },
     "run-queue": {
@@ -6830,22 +7569,16 @@
       "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
       "dev": true,
       "requires": {
-        "aproba": "1.2.0"
+        "aproba": "^1.1.1"
       }
     },
-    "rx-lite": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
-      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
-      "dev": true
-    },
-    "rx-lite-aggregates": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
-      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
+    "rxjs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz",
+      "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==",
       "dev": true,
       "requires": {
-        "rx-lite": "4.0.8"
+        "tslib": "^1.9.0"
       }
     },
     "safe-buffer": {
@@ -6859,7 +7592,7 @@
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "dev": true,
       "requires": {
-        "ret": "0.1.15"
+        "ret": "~0.1.10"
       }
     },
     "safer-buffer": {
@@ -6872,10 +7605,10 @@
       "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
       "requires": {
-        "glob": "7.1.2",
-        "lodash": "4.17.5",
-        "scss-tokenizer": "0.2.3",
-        "yargs": "7.1.0"
+        "glob": "^7.0.0",
+        "lodash": "^4.0.0",
+        "scss-tokenizer": "^0.2.3",
+        "yargs": "^7.0.0"
       },
       "dependencies": {
         "camelcase": {
@@ -6888,19 +7621,19 @@
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
           "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
           "requires": {
-            "camelcase": "3.0.0",
-            "cliui": "3.2.0",
-            "decamelize": "1.2.0",
-            "get-caller-file": "1.0.2",
-            "os-locale": "1.4.0",
-            "read-pkg-up": "1.0.1",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "1.0.2",
-            "which-module": "1.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "5.0.0"
+            "camelcase": "^3.0.0",
+            "cliui": "^3.2.0",
+            "decamelize": "^1.1.1",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^1.4.0",
+            "read-pkg-up": "^1.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^1.0.2",
+            "which-module": "^1.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^5.0.0"
           }
         },
         "yargs-parser": {
@@ -6908,7 +7641,7 @@
           "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
           "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
           "requires": {
-            "camelcase": "3.0.0"
+            "camelcase": "^3.0.0"
           }
         }
       }
@@ -6919,12 +7652,12 @@
       "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==",
       "dev": true,
       "requires": {
-        "clone-deep": "2.0.2",
-        "loader-utils": "1.1.0",
-        "lodash.tail": "4.1.1",
-        "neo-async": "2.5.1",
-        "pify": "3.0.0",
-        "semver": "5.5.0"
+        "clone-deep": "^2.0.1",
+        "loader-utils": "^1.0.1",
+        "lodash.tail": "^4.1.1",
+        "neo-async": "^2.5.0",
+        "pify": "^3.0.0",
+        "semver": "^5.5.0"
       },
       "dependencies": {
         "pify": {
@@ -6946,8 +7679,8 @@
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.4.tgz",
       "integrity": "sha512-cvSOlRPxOHs5dAhP9yiS/6IDmVAVxmk33f0CtTJRkmUWcb1Us+t7b1wqdzoC0REw2muC9V5f1L/w5R5uKGaepA==",
       "requires": {
-        "loose-envify": "1.4.0",
-        "object-assign": "4.1.1"
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.1"
       }
     },
     "schema-utils": {
@@ -6956,8 +7689,8 @@
       "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
       "dev": true,
       "requires": {
-        "ajv": "6.5.4",
-        "ajv-keywords": "3.2.0"
+        "ajv": "^6.1.0",
+        "ajv-keywords": "^3.1.0"
       },
       "dependencies": {
         "ajv": {
@@ -6966,10 +7699,10 @@
           "integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "2.0.1",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.4.1",
-            "uri-js": "4.2.2"
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
         "fast-deep-equal": {
@@ -6991,8 +7724,8 @@
       "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
       "requires": {
-        "js-base64": "2.4.9",
-        "source-map": "0.4.4"
+        "js-base64": "^2.1.8",
+        "source-map": "^0.4.2"
       },
       "dependencies": {
         "source-map": {
@@ -7000,7 +7733,7 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "requires": {
-            "amdefine": "1.0.1"
+            "amdefine": ">=0.0.4"
           }
         }
       }
@@ -7032,18 +7765,18 @@
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "depd": "1.1.2",
-        "destroy": "1.0.4",
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "etag": "1.8.1",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "1.6.3",
+        "http-errors": "~1.6.2",
         "mime": "1.4.1",
         "ms": "2.0.0",
-        "on-finished": "2.3.0",
-        "range-parser": "1.2.0",
-        "statuses": "1.4.0"
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.0",
+        "statuses": "~1.4.0"
       },
       "dependencies": {
         "debug": {
@@ -7069,13 +7802,13 @@
       "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
       "dev": true,
       "requires": {
-        "accepts": "1.3.5",
+        "accepts": "~1.3.4",
         "batch": "0.6.1",
         "debug": "2.6.9",
-        "escape-html": "1.0.3",
-        "http-errors": "1.6.3",
-        "mime-types": "2.1.17",
-        "parseurl": "1.3.2"
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
       },
       "dependencies": {
         "debug": {
@@ -7095,9 +7828,9 @@
       "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
       "dev": true,
       "requires": {
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "parseurl": "1.3.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.2",
         "send": "0.16.2"
       }
     },
@@ -7112,10 +7845,10 @@
       "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
       "dev": true,
       "requires": {
-        "extend-shallow": "2.0.1",
-        "is-extendable": "0.1.1",
-        "is-plain-object": "2.0.4",
-        "split-string": "3.1.0"
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
       },
       "dependencies": {
         "extend-shallow": {
@@ -7124,7 +7857,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
@@ -7147,8 +7880,8 @@
       "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "safe-buffer": "5.1.1"
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
     "shallow-clone": {
@@ -7157,9 +7890,9 @@
       "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
       "dev": true,
       "requires": {
-        "is-extendable": "0.1.1",
-        "kind-of": "5.1.0",
-        "mixin-object": "2.0.1"
+        "is-extendable": "^0.1.1",
+        "kind-of": "^5.0.0",
+        "mixin-object": "^2.0.1"
       },
       "dependencies": {
         "kind-of": {
@@ -7176,7 +7909,7 @@
       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
       "dev": true,
       "requires": {
-        "shebang-regex": "1.0.0"
+        "shebang-regex": "^1.0.0"
       }
     },
     "shebang-regex": {
@@ -7190,20 +7923,48 @@
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
+    "slice-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.0",
+        "astral-regex": "^1.0.0",
+        "is-fullwidth-code-point": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        }
+      }
+    },
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
       "requires": {
-        "base": "0.11.2",
-        "debug": "2.6.9",
-        "define-property": "0.2.5",
-        "extend-shallow": "2.0.1",
-        "map-cache": "0.2.2",
-        "source-map": "0.5.7",
-        "source-map-resolve": "0.5.2",
-        "use": "3.1.1"
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
       },
       "dependencies": {
         "debug": {
@@ -7221,7 +7982,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "0.1.6"
+            "is-descriptor": "^0.1.0"
           }
         },
         "extend-shallow": {
@@ -7230,7 +7991,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
@@ -7241,9 +8002,9 @@
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
       "requires": {
-        "define-property": "1.0.0",
-        "isobject": "3.0.1",
-        "snapdragon-util": "3.0.1"
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
       },
       "dependencies": {
         "define-property": {
@@ -7252,7 +8013,7 @@
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "1.0.2"
+            "is-descriptor": "^1.0.0"
           }
         },
         "is-accessor-descriptor": {
@@ -7261,7 +8022,7 @@
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-data-descriptor": {
@@ -7270,7 +8031,7 @@
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
           "requires": {
-            "kind-of": "6.0.2"
+            "kind-of": "^6.0.0"
           }
         },
         "is-descriptor": {
@@ -7279,9 +8040,9 @@
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
           "requires": {
-            "is-accessor-descriptor": "1.0.0",
-            "is-data-descriptor": "1.0.0",
-            "kind-of": "6.0.2"
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
           }
         }
       }
@@ -7292,7 +8053,7 @@
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.2.0"
       },
       "dependencies": {
         "kind-of": {
@@ -7301,7 +8062,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -7312,8 +8073,8 @@
       "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
       "dev": true,
       "requires": {
-        "faye-websocket": "0.10.0",
-        "uuid": "3.2.1"
+        "faye-websocket": "^0.10.0",
+        "uuid": "^3.0.1"
       }
     },
     "sortablejs": {
@@ -7339,11 +8100,11 @@
       "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
       "dev": true,
       "requires": {
-        "atob": "2.1.2",
-        "decode-uri-component": "0.2.0",
-        "resolve-url": "0.2.1",
-        "source-map-url": "0.4.0",
-        "urix": "0.1.0"
+        "atob": "^2.1.1",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
       }
     },
     "source-map-support": {
@@ -7352,8 +8113,8 @@
       "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==",
       "dev": true,
       "requires": {
-        "buffer-from": "1.1.1",
-        "source-map": "0.6.1"
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
       },
       "dependencies": {
         "source-map": {
@@ -7371,12 +8132,12 @@
       "dev": true
     },
     "spdx-correct": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz",
-      "integrity": "sha512-q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
       "requires": {
-        "spdx-expression-parse": "3.0.0",
-        "spdx-license-ids": "3.0.1"
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
       }
     },
     "spdx-exceptions": {
@@ -7389,14 +8150,14 @@
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
       "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
       "requires": {
-        "spdx-exceptions": "2.2.0",
-        "spdx-license-ids": "3.0.1"
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz",
-      "integrity": "sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w=="
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
+      "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="
     },
     "split-string": {
       "version": "3.1.0",
@@ -7404,7 +8165,7 @@
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
       "requires": {
-        "extend-shallow": "3.0.2"
+        "extend-shallow": "^3.0.0"
       }
     },
     "sprintf-js": {
@@ -7414,19 +8175,19 @@
       "dev": true
     },
     "sshpk": {
-      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.1.tgz",
-      "integrity": "sha512-mSdgNUaidk+dRU5MhYtN9zebdzF2iG0cNPWy8HG+W8y+fT1JnSkh0fzzpjOa0L7P8i1Rscz38t0h4gPcKz43xA==",
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
       "requires": {
-        "asn1": "0.2.4",
-        "assert-plus": "1.0.0",
-        "bcrypt-pbkdf": "1.0.2",
-        "dashdash": "1.14.1",
-        "ecc-jsbn": "0.1.2",
-        "getpass": "0.1.7",
-        "jsbn": "0.1.1",
-        "safer-buffer": "2.1.2",
-        "tweetnacl": "0.14.5"
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
       }
     },
     "ssr-window": {
@@ -7440,7 +8201,7 @@
       "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
       "dev": true,
       "requires": {
-        "figgy-pudding": "3.5.1"
+        "figgy-pudding": "^3.5.1"
       }
     },
     "static-extend": {
@@ -7449,8 +8210,8 @@
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
       "dev": true,
       "requires": {
-        "define-property": "0.2.5",
-        "object-copy": "0.1.0"
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
       },
       "dependencies": {
         "define-property": {
@@ -7459,7 +8220,7 @@
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
-            "is-descriptor": "0.1.6"
+            "is-descriptor": "^0.1.0"
           }
         }
       }
@@ -7475,7 +8236,7 @@
       "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
       "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
       "requires": {
-        "readable-stream": "2.3.3"
+        "readable-stream": "^2.0.1"
       }
     },
     "stream-browserify": {
@@ -7484,8 +8245,8 @@
       "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.3"
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
       }
     },
     "stream-each": {
@@ -7494,8 +8255,8 @@
       "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
       "dev": true,
       "requires": {
-        "end-of-stream": "1.4.1",
-        "stream-shift": "1.0.0"
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
       }
     },
     "stream-http": {
@@ -7504,11 +8265,11 @@
       "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
       "dev": true,
       "requires": {
-        "builtin-status-codes": "3.0.0",
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.6",
-        "to-arraybuffer": "1.0.1",
-        "xtend": "4.0.1"
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
       },
       "dependencies": {
         "process-nextick-args": {
@@ -7523,13 +8284,13 @@
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
           }
         },
         "string_decoder": {
@@ -7538,7 +8299,7 @@
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "~5.1.0"
           }
         }
       }
@@ -7554,9 +8315,9 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
       "requires": {
-        "code-point-at": "1.1.0",
-        "is-fullwidth-code-point": "1.0.0",
-        "strip-ansi": "3.0.1"
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
       }
     },
     "string_decoder": {
@@ -7564,7 +8325,7 @@
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
       "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
       "requires": {
-        "safe-buffer": "5.1.1"
+        "safe-buffer": "~5.1.0"
       }
     },
     "strip-ansi": {
@@ -7572,7 +8333,7 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
       "requires": {
-        "ansi-regex": "2.1.1"
+        "ansi-regex": "^2.0.0"
       }
     },
     "strip-bom": {
@@ -7580,7 +8341,7 @@
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
       "requires": {
-        "is-utf8": "0.2.1"
+        "is-utf8": "^0.2.0"
       }
     },
     "strip-eof": {
@@ -7594,7 +8355,7 @@
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
       "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
       "requires": {
-        "get-stdin": "4.0.1"
+        "get-stdin": "^4.0.1"
       }
     },
     "strip-json-comments": {
@@ -7609,8 +8370,8 @@
       "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.1.0",
-        "schema-utils": "1.0.0"
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^1.0.0"
       },
       "dependencies": {
         "ajv": {
@@ -7619,10 +8380,10 @@
           "integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "2.0.1",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.4.1",
-            "uri-js": "4.2.2"
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
         "fast-deep-equal": {
@@ -7649,9 +8410,9 @@
           "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
           "dev": true,
           "requires": {
-            "ajv": "6.5.4",
-            "ajv-errors": "1.0.0",
-            "ajv-keywords": "3.2.0"
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
           }
         },
         "uri-js": {
@@ -7660,7 +8421,7 @@
           "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
           "dev": true,
           "requires": {
-            "punycode": "2.1.1"
+            "punycode": "^2.1.0"
           }
         }
       }
@@ -7675,8 +8436,8 @@
       "resolved": "https://registry.npmjs.org/swiper/-/swiper-4.4.1.tgz",
       "integrity": "sha512-SONgpB1mFh++eFiUDOCggwW2ZzsWMEf3+SEROcQ+qXPYUnyD423l3uDsk+0jdo/a4pXeOJmH0oN3XK5maMqQyQ==",
       "requires": {
-        "dom7": "2.1.2",
-        "ssr-window": "1.0.1"
+        "dom7": "^2.1.2",
+        "ssr-window": "^1.0.1"
       }
     },
     "t": {
@@ -7684,6 +8445,58 @@
       "resolved": "https://registry.npmjs.org/t/-/t-0.5.1.tgz",
       "integrity": "sha1-fZGSIB7X+Lv2FZisc2YNj/zDtXg="
     },
+    "table": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.4.0.tgz",
+      "integrity": "sha512-nHFDrxmbrkU7JAFKqKbDJXfzrX2UBsWmrieXFTGxiI5e4ncg3VqsZeI4EzNmX0ncp4XNGVeoxIWJXfCIXwrsvw==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.9.1",
+        "lodash": "^4.17.11",
+        "slice-ansi": "^2.1.0",
+        "string-width": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "lodash": {
+          "version": "4.17.11",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
+      }
+    },
     "tapable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.0.tgz",
@@ -7691,13 +8504,13 @@
       "dev": true
     },
     "tar": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
+      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
       "requires": {
-        "block-stream": "0.0.9",
-        "fstream": "1.0.11",
-        "inherits": "2.0.3"
+        "block-stream": "*",
+        "fstream": "^1.0.12",
+        "inherits": "2"
       }
     },
     "terser": {
@@ -7706,9 +8519,9 @@
       "integrity": "sha512-+QrFoqBImmsQGB4c/HvaqgZynmbNvNBwoBxuu7fYXtq5EEtlLUzph+WimDj+xMkuqawXPMl2lgCIz81CdXvt+w==",
       "dev": true,
       "requires": {
-        "commander": "2.17.1",
-        "source-map": "0.6.1",
-        "source-map-support": "0.5.9"
+        "commander": "~2.17.1",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.6"
       },
       "dependencies": {
         "source-map": {
@@ -7725,14 +8538,14 @@
       "integrity": "sha512-61lV0DSxMAZ8AyZG7/A4a3UPlrbOBo8NIQ4tJzLPAdGOQ+yoNC7l5ijEow27lBAL2humer01KLS6bGIMYQxKoA==",
       "dev": true,
       "requires": {
-        "cacache": "11.2.0",
-        "find-cache-dir": "2.0.0",
-        "schema-utils": "1.0.0",
-        "serialize-javascript": "1.5.0",
-        "source-map": "0.6.1",
-        "terser": "3.10.2",
-        "webpack-sources": "1.2.0",
-        "worker-farm": "1.6.0"
+        "cacache": "^11.0.2",
+        "find-cache-dir": "^2.0.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^1.4.0",
+        "source-map": "^0.6.1",
+        "terser": "^3.8.1",
+        "webpack-sources": "^1.1.0",
+        "worker-farm": "^1.5.2"
       },
       "dependencies": {
         "ajv": {
@@ -7741,10 +8554,10 @@
           "integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "2.0.1",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.4.1",
-            "uri-js": "4.2.2"
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
         "fast-deep-equal": {
@@ -7759,9 +8572,9 @@
           "integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==",
           "dev": true,
           "requires": {
-            "commondir": "1.0.1",
-            "make-dir": "1.1.0",
-            "pkg-dir": "3.0.0"
+            "commondir": "^1.0.1",
+            "make-dir": "^1.0.0",
+            "pkg-dir": "^3.0.0"
           }
         },
         "find-up": {
@@ -7770,7 +8583,7 @@
           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "locate-path": "3.0.0"
+            "locate-path": "^3.0.0"
           }
         },
         "json-schema-traverse": {
@@ -7785,8 +8598,8 @@
           "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "dev": true,
           "requires": {
-            "p-locate": "3.0.0",
-            "path-exists": "3.0.0"
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
           }
         },
         "p-limit": {
@@ -7795,7 +8608,7 @@
           "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
           "dev": true,
           "requires": {
-            "p-try": "2.0.0"
+            "p-try": "^2.0.0"
           }
         },
         "p-locate": {
@@ -7804,7 +8617,7 @@
           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
-            "p-limit": "2.0.0"
+            "p-limit": "^2.0.0"
           }
         },
         "p-try": {
@@ -7825,7 +8638,7 @@
           "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
           "dev": true,
           "requires": {
-            "find-up": "3.0.0"
+            "find-up": "^3.0.0"
           }
         },
         "schema-utils": {
@@ -7834,9 +8647,9 @@
           "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
           "dev": true,
           "requires": {
-            "ajv": "6.5.4",
-            "ajv-errors": "1.0.0",
-            "ajv-keywords": "3.2.0"
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
           }
         },
         "source-map": {
@@ -7865,8 +8678,8 @@
       "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
       "dev": true,
       "requires": {
-        "readable-stream": "2.3.3",
-        "xtend": "4.0.1"
+        "readable-stream": "^2.1.5",
+        "xtend": "~4.0.1"
       }
     },
     "thunky": {
@@ -7881,7 +8694,7 @@
       "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
       "dev": true,
       "requires": {
-        "setimmediate": "1.0.5"
+        "setimmediate": "^1.0.4"
       }
     },
     "tmp": {
@@ -7890,7 +8703,7 @@
       "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "dev": true,
       "requires": {
-        "os-tmpdir": "1.0.2"
+        "os-tmpdir": "~1.0.2"
       }
     },
     "to-arraybuffer": {
@@ -7911,7 +8724,7 @@
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
+        "kind-of": "^3.0.2"
       },
       "dependencies": {
         "kind-of": {
@@ -7920,7 +8733,7 @@
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
           "requires": {
-            "is-buffer": "1.1.6"
+            "is-buffer": "^1.1.5"
           }
         }
       }
@@ -7931,10 +8744,10 @@
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
       "requires": {
-        "define-property": "2.0.2",
-        "extend-shallow": "3.0.2",
-        "regex-not": "1.0.2",
-        "safe-regex": "1.1.0"
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
       }
     },
     "to-regex-range": {
@@ -7943,8 +8756,8 @@
       "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
       "dev": true,
       "requires": {
-        "is-number": "3.0.0",
-        "repeat-string": "1.6.1"
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
       }
     },
     "tough-cookie": {
@@ -7952,8 +8765,8 @@
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
       "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
       "requires": {
-        "psl": "1.1.29",
-        "punycode": "1.4.1"
+        "psl": "^1.1.24",
+        "punycode": "^1.4.1"
       }
     },
     "trim-newlines": {
@@ -7972,9 +8785,15 @@
       "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
       "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
       "requires": {
-        "glob": "7.1.2"
+        "glob": "^7.1.2"
       }
     },
+    "tryer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
+      "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
+      "dev": true
+    },
     "tslib": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
@@ -7992,7 +8811,7 @@
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
       "requires": {
-        "safe-buffer": "5.1.1"
+        "safe-buffer": "^5.0.1"
       }
     },
     "tweetnacl": {
@@ -8006,7 +8825,7 @@
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
       "dev": true,
       "requires": {
-        "prelude-ls": "1.1.2"
+        "prelude-ls": "~1.1.2"
       }
     },
     "type-is": {
@@ -8016,7 +8835,7 @@
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
-        "mime-types": "2.1.20"
+        "mime-types": "~2.1.18"
       },
       "dependencies": {
         "mime-db": {
@@ -8031,7 +8850,7 @@
           "integrity": "sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==",
           "dev": true,
           "requires": {
-            "mime-db": "1.36.0"
+            "mime-db": "~1.36.0"
           }
         }
       }
@@ -8054,8 +8873,8 @@
       "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
       "dev": true,
       "requires": {
-        "unicode-canonical-property-names-ecmascript": "1.0.4",
-        "unicode-property-aliases-ecmascript": "1.0.4"
+        "unicode-canonical-property-names-ecmascript": "^1.0.4",
+        "unicode-property-aliases-ecmascript": "^1.0.4"
       }
     },
     "unicode-match-property-value-ecmascript": {
@@ -8076,10 +8895,10 @@
       "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
       "dev": true,
       "requires": {
-        "arr-union": "3.1.0",
-        "get-value": "2.0.6",
-        "is-extendable": "0.1.1",
-        "set-value": "0.4.3"
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^0.4.3"
       },
       "dependencies": {
         "extend-shallow": {
@@ -8088,7 +8907,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         },
         "set-value": {
@@ -8097,10 +8916,10 @@
           "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
           "dev": true,
           "requires": {
-            "extend-shallow": "2.0.1",
-            "is-extendable": "0.1.1",
-            "is-plain-object": "2.0.4",
-            "to-object-path": "0.3.0"
+            "extend-shallow": "^2.0.1",
+            "is-extendable": "^0.1.1",
+            "is-plain-object": "^2.0.1",
+            "to-object-path": "^0.3.0"
           }
         }
       }
@@ -8117,7 +8936,7 @@
       "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=",
       "dev": true,
       "requires": {
-        "unique-slug": "2.0.0"
+        "unique-slug": "^2.0.0"
       }
     },
     "unique-slug": {
@@ -8126,7 +8945,7 @@
       "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=",
       "dev": true,
       "requires": {
-        "imurmurhash": "0.1.4"
+        "imurmurhash": "^0.1.4"
       }
     },
     "unpipe": {
@@ -8141,8 +8960,8 @@
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
       "dev": true,
       "requires": {
-        "has-value": "0.3.1",
-        "isobject": "3.0.1"
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
       },
       "dependencies": {
         "has-value": {
@@ -8151,9 +8970,9 @@
           "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
           "dev": true,
           "requires": {
-            "get-value": "2.0.6",
-            "has-values": "0.1.4",
-            "isobject": "2.1.0"
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
           },
           "dependencies": {
             "isobject": {
@@ -8185,16 +9004,14 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
       "requires": {
-        "punycode": "2.1.1"
+        "punycode": "^2.1.0"
       },
       "dependencies": {
         "punycode": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-          "dev": true
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
         }
       }
     },
@@ -8228,8 +9045,8 @@
       "integrity": "sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==",
       "dev": true,
       "requires": {
-        "querystringify": "2.0.0",
-        "requires-port": "1.0.0"
+        "querystringify": "^2.0.0",
+        "requires-port": "^1.0.0"
       }
     },
     "use": {
@@ -8258,8 +9075,8 @@
       "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
       "dev": true,
       "requires": {
-        "define-properties": "1.1.3",
-        "object.getownpropertydescriptors": "2.0.3"
+        "define-properties": "^1.1.2",
+        "object.getownpropertydescriptors": "^2.0.3"
       }
     },
     "utils-merge": {
@@ -8279,9 +9096,9 @@
       "resolved": "https://registry.npmjs.org/v-tooltip/-/v-tooltip-2.0.0-rc.33.tgz",
       "integrity": "sha1-ePfY6cNCZWIr5lup3HjGfx3AK3M=",
       "requires": {
-        "lodash.merge": "4.6.1",
-        "popper.js": "1.14.3",
-        "vue-resize": "0.4.4"
+        "lodash.merge": "^4.6.0",
+        "popper.js": "^1.12.9",
+        "vue-resize": "^0.4.3"
       }
     },
     "v8-compile-cache": {
@@ -8295,8 +9112,8 @@
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
       "requires": {
-        "spdx-correct": "3.0.2",
-        "spdx-expression-parse": "3.0.0"
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
       }
     },
     "vary": {
@@ -8310,9 +9127,9 @@
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
       "requires": {
-        "assert-plus": "1.0.0",
+        "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
-        "extsprintf": "1.3.0"
+        "extsprintf": "^1.2.0"
       }
     },
     "vm-browserify": {
@@ -8334,8 +9151,8 @@
       "resolved": "https://registry.npmjs.org/vue-awesome-swiper/-/vue-awesome-swiper-3.1.3.tgz",
       "integrity": "sha512-E7suzkyApO8vNZbgdEnjSmnpsmQZyRvSVXJ7sey3XYwKPOkLhH3+GnHroBw+5PZIQXvWBwdCeQsPG1xQ1r1Rhg==",
       "requires": {
-        "object-assign": "4.1.1",
-        "swiper": "4.4.1"
+        "object-assign": "^4.1.1",
+        "swiper": "^4.0.7"
       }
     },
     "vue-custom-element": {
@@ -8350,12 +9167,12 @@
       "integrity": "sha512-ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw==",
       "dev": true,
       "requires": {
-        "debug": "3.1.0",
-        "eslint-scope": "3.7.3",
-        "eslint-visitor-keys": "1.0.0",
-        "espree": "3.5.4",
-        "esquery": "1.0.1",
-        "lodash": "4.17.5"
+        "debug": "^3.1.0",
+        "eslint-scope": "^3.7.1",
+        "eslint-visitor-keys": "^1.0.0",
+        "espree": "^3.5.2",
+        "esquery": "^1.0.0",
+        "lodash": "^4.17.4"
       },
       "dependencies": {
         "acorn-jsx": {
@@ -8364,7 +9181,7 @@
           "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
           "dev": true,
           "requires": {
-            "acorn": "3.3.0"
+            "acorn": "^3.0.4"
           },
           "dependencies": {
             "acorn": {
@@ -8390,8 +9207,8 @@
           "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
           "dev": true,
           "requires": {
-            "esrecurse": "4.2.1",
-            "estraverse": "4.2.0"
+            "esrecurse": "^4.1.0",
+            "estraverse": "^4.1.1"
           }
         },
         "espree": {
@@ -8400,8 +9217,8 @@
           "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
           "dev": true,
           "requires": {
-            "acorn": "5.7.1",
-            "acorn-jsx": "3.0.1"
+            "acorn": "^5.5.0",
+            "acorn-jsx": "^3.0.0"
           }
         }
       }
@@ -8418,11 +9235,11 @@
       "integrity": "sha512-nVV27GNIA9MeoD8yQ3dkUzwlAaAsWeYSWZHsu/K04KCD339lW0Jv2sJWsjj3721SP7sl2lYdPmjcHgkWQSp5bg==",
       "dev": true,
       "requires": {
-        "@vue/component-compiler-utils": "2.2.0",
-        "hash-sum": "1.0.2",
-        "loader-utils": "1.1.0",
-        "vue-hot-reload-api": "2.3.0",
-        "vue-style-loader": "4.1.2"
+        "@vue/component-compiler-utils": "^2.0.0",
+        "hash-sum": "^1.0.2",
+        "loader-utils": "^1.1.0",
+        "vue-hot-reload-api": "^2.3.0",
+        "vue-style-loader": "^4.1.0"
       }
     },
     "vue-masonry-css": {
@@ -8446,8 +9263,8 @@
       "integrity": "sha512-0ip8ge6Gzz/Bk0iHovU9XAUQaFt/G2B61bnWa2tCcqqdgfHs1lF9xXorFbE55Gmy92okFT+8bfmySuUOu13vxQ==",
       "dev": true,
       "requires": {
-        "hash-sum": "1.0.2",
-        "loader-utils": "1.1.0"
+        "hash-sum": "^1.0.2",
+        "loader-utils": "^1.0.2"
       }
     },
     "vue-template-compiler": {
@@ -8456,8 +9273,8 @@
       "integrity": "sha512-63uI4syCwtGR5IJvZM0LN5tVsahrelomHtCxvRkZPJ/Tf3ADm1U1wG6KWycK3qCfqR+ygM5vewUvmJ0REAYksg==",
       "dev": true,
       "requires": {
-        "de-indent": "1.0.2",
-        "he": "1.1.1"
+        "de-indent": "^1.0.2",
+        "he": "^1.1.0"
       }
     },
     "vue-template-es2015-compiler": {
@@ -8476,7 +9293,7 @@
       "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.16.0.tgz",
       "integrity": "sha512-fr9gcWKXMJlzbbtJcrQs4kU7qdOZqd4SEpAcx+r0nykbW8AygZN0aKVpadEtI53T8A2azhzCdXMvEqrLuKE2fA==",
       "requires": {
-        "sortablejs": "1.7.0"
+        "sortablejs": "^1.7.0"
       }
     },
     "vuex": {
@@ -8490,9 +9307,9 @@
       "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
       "dev": true,
       "requires": {
-        "chokidar": "2.0.4",
-        "graceful-fs": "4.1.11",
-        "neo-async": "2.5.1"
+        "chokidar": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0"
       }
     },
     "wbuf": {
@@ -8501,7 +9318,7 @@
       "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
       "dev": true,
       "requires": {
-        "minimalistic-assert": "1.0.1"
+        "minimalistic-assert": "^1.0.0"
       }
     },
     "webpack": {
@@ -8514,26 +9331,26 @@
         "@webassemblyjs/helper-module-context": "1.7.8",
         "@webassemblyjs/wasm-edit": "1.7.8",
         "@webassemblyjs/wasm-parser": "1.7.8",
-        "acorn": "5.7.1",
-        "acorn-dynamic-import": "3.0.0",
-        "ajv": "6.5.4",
-        "ajv-keywords": "3.2.0",
-        "chrome-trace-event": "1.0.0",
-        "enhanced-resolve": "4.1.0",
-        "eslint-scope": "4.0.0",
-        "json-parse-better-errors": "1.0.2",
-        "loader-runner": "2.3.1",
-        "loader-utils": "1.1.0",
-        "memory-fs": "0.4.1",
-        "micromatch": "3.1.10",
-        "mkdirp": "0.5.1",
-        "neo-async": "2.5.1",
-        "node-libs-browser": "2.1.0",
-        "schema-utils": "0.4.7",
-        "tapable": "1.1.0",
-        "uglifyjs-webpack-plugin": "1.3.0",
-        "watchpack": "1.6.0",
-        "webpack-sources": "1.3.0"
+        "acorn": "^5.6.2",
+        "acorn-dynamic-import": "^3.0.0",
+        "ajv": "^6.1.0",
+        "ajv-keywords": "^3.1.0",
+        "chrome-trace-event": "^1.0.0",
+        "enhanced-resolve": "^4.1.0",
+        "eslint-scope": "^4.0.0",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.3.0",
+        "loader-utils": "^1.1.0",
+        "memory-fs": "~0.4.1",
+        "micromatch": "^3.1.8",
+        "mkdirp": "~0.5.0",
+        "neo-async": "^2.5.0",
+        "node-libs-browser": "^2.0.0",
+        "schema-utils": "^0.4.4",
+        "tapable": "^1.1.0",
+        "uglifyjs-webpack-plugin": "^1.2.4",
+        "watchpack": "^1.5.0",
+        "webpack-sources": "^1.3.0"
       },
       "dependencies": {
         "ajv": {
@@ -8542,10 +9359,10 @@
           "integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "2.0.1",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.4.1",
-            "uri-js": "4.2.2"
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
         "cacache": {
@@ -8554,19 +9371,19 @@
           "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
           "dev": true,
           "requires": {
-            "bluebird": "3.5.2",
-            "chownr": "1.1.1",
-            "glob": "7.1.2",
-            "graceful-fs": "4.1.11",
-            "lru-cache": "4.1.1",
-            "mississippi": "2.0.0",
-            "mkdirp": "0.5.1",
-            "move-concurrently": "1.0.1",
-            "promise-inflight": "1.0.1",
-            "rimraf": "2.6.2",
-            "ssri": "5.3.0",
-            "unique-filename": "1.1.0",
-            "y18n": "4.0.0"
+            "bluebird": "^3.5.1",
+            "chownr": "^1.0.1",
+            "glob": "^7.1.2",
+            "graceful-fs": "^4.1.11",
+            "lru-cache": "^4.1.1",
+            "mississippi": "^2.0.0",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.6.2",
+            "ssri": "^5.2.4",
+            "unique-filename": "^1.1.0",
+            "y18n": "^4.0.0"
           }
         },
         "commander": {
@@ -8593,16 +9410,16 @@
           "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
           "dev": true,
           "requires": {
-            "concat-stream": "1.6.2",
-            "duplexify": "3.6.0",
-            "end-of-stream": "1.4.1",
-            "flush-write-stream": "1.0.3",
-            "from2": "2.3.0",
-            "parallel-transform": "1.1.0",
-            "pump": "2.0.1",
-            "pumpify": "1.5.1",
-            "stream-each": "1.2.3",
-            "through2": "2.0.3"
+            "concat-stream": "^1.5.0",
+            "duplexify": "^3.4.2",
+            "end-of-stream": "^1.1.0",
+            "flush-write-stream": "^1.0.0",
+            "from2": "^2.1.0",
+            "parallel-transform": "^1.1.0",
+            "pump": "^2.0.1",
+            "pumpify": "^1.3.3",
+            "stream-each": "^1.1.0",
+            "through2": "^2.0.0"
           }
         },
         "pump": {
@@ -8611,8 +9428,8 @@
           "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
           "dev": true,
           "requires": {
-            "end-of-stream": "1.4.1",
-            "once": "1.4.0"
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
           }
         },
         "source-map": {
@@ -8627,7 +9444,7 @@
           "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
           "dev": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "^5.1.1"
           }
         },
         "uglify-es": {
@@ -8636,8 +9453,8 @@
           "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
           "dev": true,
           "requires": {
-            "commander": "2.13.0",
-            "source-map": "0.6.1"
+            "commander": "~2.13.0",
+            "source-map": "~0.6.1"
           }
         },
         "uglifyjs-webpack-plugin": {
@@ -8646,14 +9463,14 @@
           "integrity": "sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==",
           "dev": true,
           "requires": {
-            "cacache": "10.0.4",
-            "find-cache-dir": "1.0.0",
-            "schema-utils": "0.4.7",
-            "serialize-javascript": "1.5.0",
-            "source-map": "0.6.1",
-            "uglify-es": "3.3.9",
-            "webpack-sources": "1.3.0",
-            "worker-farm": "1.6.0"
+            "cacache": "^10.0.4",
+            "find-cache-dir": "^1.0.0",
+            "schema-utils": "^0.4.5",
+            "serialize-javascript": "^1.4.0",
+            "source-map": "^0.6.1",
+            "uglify-es": "^3.3.4",
+            "webpack-sources": "^1.1.0",
+            "worker-farm": "^1.5.2"
           }
         },
         "webpack-sources": {
@@ -8662,8 +9479,8 @@
           "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==",
           "dev": true,
           "requires": {
-            "source-list-map": "2.0.0",
-            "source-map": "0.6.1"
+            "source-list-map": "^2.0.0",
+            "source-map": "~0.6.1"
           }
         },
         "y18n": {
@@ -8674,22 +9491,92 @@
         }
       }
     },
+    "webpack-bundle-analyzer": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz",
+      "integrity": "sha512-7qvJLPKB4rRWZGjVp5U1KEjwutbDHSKboAl0IfafnrdXMrgC0tOtZbQD6Rw0u4cmpgRN4O02Fc0t8eAT+FgGzA==",
+      "dev": true,
+      "requires": {
+        "acorn": "^6.0.7",
+        "acorn-walk": "^6.1.1",
+        "bfj": "^6.1.1",
+        "chalk": "^2.4.1",
+        "commander": "^2.18.0",
+        "ejs": "^2.6.1",
+        "express": "^4.16.3",
+        "filesize": "^3.6.1",
+        "gzip-size": "^5.0.0",
+        "lodash": "^4.17.10",
+        "mkdirp": "^0.5.1",
+        "opener": "^1.5.1",
+        "ws": "^6.0.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
+          "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "commander": {
+          "version": "2.20.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+          "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
+          "dev": true
+        },
+        "lodash": {
+          "version": "4.17.11",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
     "webpack-cli": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.1.2.tgz",
       "integrity": "sha512-Cnqo7CeqeSvC6PTdts+dywNi5CRlIPbLx1AoUPK2T6vC1YAugMG3IOoO9DmEscd+Dghw7uRlnzV1KwOe5IrtgQ==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.1",
-        "cross-spawn": "6.0.5",
-        "enhanced-resolve": "4.1.0",
-        "global-modules-path": "2.3.0",
-        "import-local": "2.0.0",
-        "interpret": "1.1.0",
-        "loader-utils": "1.1.0",
-        "supports-color": "5.5.0",
-        "v8-compile-cache": "2.0.2",
-        "yargs": "12.0.2"
+        "chalk": "^2.4.1",
+        "cross-spawn": "^6.0.5",
+        "enhanced-resolve": "^4.1.0",
+        "global-modules-path": "^2.3.0",
+        "import-local": "^2.0.0",
+        "interpret": "^1.1.0",
+        "loader-utils": "^1.1.0",
+        "supports-color": "^5.5.0",
+        "v8-compile-cache": "^2.0.2",
+        "yargs": "^12.0.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -8698,7 +9585,7 @@
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "^1.9.0"
           }
         },
         "chalk": {
@@ -8707,9 +9594,9 @@
           "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "escape-string-regexp": "1.0.5",
-            "supports-color": "5.5.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
           }
         },
         "supports-color": {
@@ -8718,7 +9605,7 @@
           "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -8730,34 +9617,34 @@
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
-        "bonjour": "3.5.0",
-        "chokidar": "2.0.4",
-        "compression": "1.7.3",
-        "connect-history-api-fallback": "1.5.0",
-        "debug": "4.1.1",
-        "del": "3.0.0",
-        "express": "4.16.3",
-        "html-entities": "1.2.1",
-        "http-proxy-middleware": "0.19.1",
-        "import-local": "2.0.0",
-        "internal-ip": "4.2.0",
-        "ip": "1.1.5",
-        "killable": "1.0.1",
-        "loglevel": "1.6.1",
-        "opn": "5.4.0",
-        "portfinder": "1.0.17",
-        "schema-utils": "1.0.0",
-        "selfsigned": "1.10.3",
-        "semver": "5.6.0",
-        "serve-index": "1.9.1",
+        "bonjour": "^3.5.0",
+        "chokidar": "^2.0.0",
+        "compression": "^1.5.2",
+        "connect-history-api-fallback": "^1.3.0",
+        "debug": "^4.1.1",
+        "del": "^3.0.0",
+        "express": "^4.16.2",
+        "html-entities": "^1.2.0",
+        "http-proxy-middleware": "^0.19.1",
+        "import-local": "^2.0.0",
+        "internal-ip": "^4.2.0",
+        "ip": "^1.1.5",
+        "killable": "^1.0.0",
+        "loglevel": "^1.4.1",
+        "opn": "^5.1.0",
+        "portfinder": "^1.0.9",
+        "schema-utils": "^1.0.0",
+        "selfsigned": "^1.9.1",
+        "semver": "^5.6.0",
+        "serve-index": "^1.7.2",
         "sockjs": "0.3.19",
         "sockjs-client": "1.3.0",
-        "spdy": "4.0.0",
-        "strip-ansi": "3.0.1",
-        "supports-color": "6.1.0",
-        "url": "0.11.0",
-        "webpack-dev-middleware": "3.6.1",
-        "webpack-log": "2.0.0",
+        "spdy": "^4.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^6.1.0",
+        "url": "^0.11.0",
+        "webpack-dev-middleware": "^3.5.1",
+        "webpack-log": "^2.0.0",
         "yargs": "12.0.2"
       },
       "dependencies": {
@@ -8767,10 +9654,10 @@
           "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "2.0.1",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.4.1",
-            "uri-js": "4.2.2"
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
         "debug": {
@@ -8779,7 +9666,7 @@
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "2.1.1"
+            "ms": "^2.1.1"
           }
         },
         "default-gateway": {
@@ -8788,8 +9675,8 @@
           "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
           "dev": true,
           "requires": {
-            "execa": "1.0.0",
-            "ip-regex": "2.1.0"
+            "execa": "^1.0.0",
+            "ip-regex": "^2.1.0"
           }
         },
         "eventsource": {
@@ -8798,7 +9685,7 @@
           "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
           "dev": true,
           "requires": {
-            "original": "1.0.2"
+            "original": "^1.0.0"
           }
         },
         "execa": {
@@ -8807,13 +9694,13 @@
           "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
           "dev": true,
           "requires": {
-            "cross-spawn": "6.0.5",
-            "get-stream": "4.1.0",
-            "is-stream": "1.1.0",
-            "npm-run-path": "2.0.2",
-            "p-finally": "1.0.0",
-            "signal-exit": "3.0.2",
-            "strip-eof": "1.0.0"
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
           }
         },
         "fast-deep-equal": {
@@ -8828,7 +9715,7 @@
           "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
           "dev": true,
           "requires": {
-            "websocket-driver": "0.7.0"
+            "websocket-driver": ">=0.5.1"
           }
         },
         "get-stream": {
@@ -8837,7 +9724,7 @@
           "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
           "dev": true,
           "requires": {
-            "pump": "3.0.0"
+            "pump": "^3.0.0"
           }
         },
         "handle-thing": {
@@ -8852,10 +9739,10 @@
           "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
           "dev": true,
           "requires": {
-            "http-proxy": "1.17.0",
-            "is-glob": "4.0.0",
-            "lodash": "4.17.11",
-            "micromatch": "3.1.10"
+            "http-proxy": "^1.17.0",
+            "is-glob": "^4.0.0",
+            "lodash": "^4.17.11",
+            "micromatch": "^3.1.10"
           }
         },
         "internal-ip": {
@@ -8864,8 +9751,8 @@
           "integrity": "sha512-ZY8Rk+hlvFeuMmG5uH1MXhhdeMntmIaxaInvAmzMq/SHV8rv4Kh+6GiQNNDQd0wZFrcO+FiTBo8lui/osKOyJw==",
           "dev": true,
           "requires": {
-            "default-gateway": "4.2.0",
-            "ipaddr.js": "1.9.0"
+            "default-gateway": "^4.0.1",
+            "ipaddr.js": "^1.9.0"
           }
         },
         "ipaddr.js": {
@@ -8904,9 +9791,9 @@
           "integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
           "dev": true,
           "requires": {
-            "inherits": "2.0.3",
-            "string_decoder": "1.2.0",
-            "util-deprecate": "1.0.2"
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
           }
         },
         "schema-utils": {
@@ -8915,9 +9802,9 @@
           "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
           "dev": true,
           "requires": {
-            "ajv": "6.10.0",
-            "ajv-errors": "1.0.0",
-            "ajv-keywords": "3.2.0"
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
           }
         },
         "semver": {
@@ -8932,12 +9819,12 @@
           "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
           "dev": true,
           "requires": {
-            "debug": "3.2.6",
-            "eventsource": "1.0.7",
-            "faye-websocket": "0.11.1",
-            "inherits": "2.0.3",
-            "json3": "3.3.2",
-            "url-parse": "1.4.3"
+            "debug": "^3.2.5",
+            "eventsource": "^1.0.7",
+            "faye-websocket": "~0.11.1",
+            "inherits": "^2.0.3",
+            "json3": "^3.3.2",
+            "url-parse": "^1.4.3"
           },
           "dependencies": {
             "debug": {
@@ -8946,7 +9833,7 @@
               "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
               "dev": true,
               "requires": {
-                "ms": "2.1.1"
+                "ms": "^2.1.1"
               }
             }
           }
@@ -8957,11 +9844,11 @@
           "integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
           "dev": true,
           "requires": {
-            "debug": "4.1.1",
-            "handle-thing": "2.0.0",
-            "http-deceiver": "1.2.7",
-            "select-hose": "2.0.0",
-            "spdy-transport": "3.0.0"
+            "debug": "^4.1.0",
+            "handle-thing": "^2.0.0",
+            "http-deceiver": "^1.2.7",
+            "select-hose": "^2.0.0",
+            "spdy-transport": "^3.0.0"
           }
         },
         "spdy-transport": {
@@ -8970,12 +9857,12 @@
           "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
           "dev": true,
           "requires": {
-            "debug": "4.1.1",
-            "detect-node": "2.0.4",
-            "hpack.js": "2.1.6",
-            "obuf": "1.1.2",
-            "readable-stream": "3.2.0",
-            "wbuf": "1.7.3"
+            "debug": "^4.1.0",
+            "detect-node": "^2.0.4",
+            "hpack.js": "^2.1.6",
+            "obuf": "^1.1.2",
+            "readable-stream": "^3.0.6",
+            "wbuf": "^1.7.3"
           }
         },
         "string_decoder": {
@@ -8984,7 +9871,7 @@
           "integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
           "dev": true,
           "requires": {
-            "safe-buffer": "5.1.1"
+            "safe-buffer": "~5.1.0"
           }
         },
         "supports-color": {
@@ -8993,7 +9880,7 @@
           "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
           "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         },
         "webpack-dev-middleware": {
@@ -9002,10 +9889,10 @@
           "integrity": "sha512-XQmemun8QJexMEvNFbD2BIg4eSKrmSIMrTfnl2nql2Sc6OGAYFyb8rwuYrCjl/IiEYYuyTEiimMscu7EXji/Dw==",
           "dev": true,
           "requires": {
-            "memory-fs": "0.4.1",
-            "mime": "2.4.0",
-            "range-parser": "1.2.0",
-            "webpack-log": "2.0.0"
+            "memory-fs": "^0.4.1",
+            "mime": "^2.3.1",
+            "range-parser": "^1.0.3",
+            "webpack-log": "^2.0.0"
           }
         }
       }
@@ -9016,8 +9903,8 @@
       "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
       "dev": true,
       "requires": {
-        "ansi-colors": "3.0.6",
-        "uuid": "3.3.2"
+        "ansi-colors": "^3.0.0",
+        "uuid": "^3.3.2"
       },
       "dependencies": {
         "uuid": {
@@ -9034,8 +9921,8 @@
       "integrity": "sha512-9BZwxR85dNsjWz3blyxdOhTgtnQvv3OEs5xofI0wPYTwu5kaWxS08UuD1oI7WLBLpRO+ylf0ofnXLXWmGb2WMw==",
       "dev": true,
       "requires": {
-        "source-list-map": "2.0.0",
-        "source-map": "0.6.1"
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -9052,8 +9939,8 @@
       "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
       "dev": true,
       "requires": {
-        "http-parser-js": "0.4.13",
-        "websocket-extensions": "0.1.3"
+        "http-parser-js": ">=0.4.0",
+        "websocket-extensions": ">=0.1.1"
       }
     },
     "websocket-extensions": {
@@ -9067,7 +9954,7 @@
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
       "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
       "requires": {
-        "isexe": "2.0.0"
+        "isexe": "^2.0.0"
       }
     },
     "which-module": {
@@ -9080,7 +9967,7 @@
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
       "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "requires": {
-        "string-width": "1.0.2"
+        "string-width": "^1.0.2 || 2"
       }
     },
     "wordwrap": {
@@ -9095,7 +9982,7 @@
       "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
       "dev": true,
       "requires": {
-        "errno": "0.1.7"
+        "errno": "~0.1.7"
       }
     },
     "wrap-ansi": {
@@ -9103,8 +9990,8 @@
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1"
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
       }
     },
     "wrappy": {
@@ -9112,6 +9999,24 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
+    "write": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
+      "dev": true,
+      "requires": {
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "ws": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+      "dev": true,
+      "requires": {
+        "async-limiter": "~1.0.0"
+      }
+    },
     "xregexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
@@ -9140,18 +10045,18 @@
       "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
       "dev": true,
       "requires": {
-        "cliui": "4.1.0",
-        "decamelize": "2.0.0",
-        "find-up": "3.0.0",
-        "get-caller-file": "1.0.2",
-        "os-locale": "3.0.1",
-        "require-directory": "2.1.1",
-        "require-main-filename": "1.0.1",
-        "set-blocking": "2.0.0",
-        "string-width": "2.1.1",
-        "which-module": "2.0.0",
-        "y18n": "3.2.1",
-        "yargs-parser": "10.1.0"
+        "cliui": "^4.0.0",
+        "decamelize": "^2.0.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^3.0.0",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^2.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^3.2.1 || ^4.0.0",
+        "yargs-parser": "^10.1.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -9166,9 +10071,9 @@
           "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
           "dev": true,
           "requires": {
-            "string-width": "2.1.1",
-            "strip-ansi": "4.0.0",
-            "wrap-ansi": "2.1.0"
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
           }
         },
         "decamelize": {
@@ -9186,7 +10091,7 @@
           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "dev": true,
           "requires": {
-            "locate-path": "3.0.0"
+            "locate-path": "^3.0.0"
           }
         },
         "invert-kv": {
@@ -9207,7 +10112,7 @@
           "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
           "dev": true,
           "requires": {
-            "invert-kv": "2.0.0"
+            "invert-kv": "^2.0.0"
           }
         },
         "locate-path": {
@@ -9216,8 +10121,8 @@
           "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "dev": true,
           "requires": {
-            "p-locate": "3.0.0",
-            "path-exists": "3.0.0"
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
           }
         },
         "os-locale": {
@@ -9226,9 +10131,9 @@
           "integrity": "sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==",
           "dev": true,
           "requires": {
-            "execa": "0.10.0",
-            "lcid": "2.0.0",
-            "mem": "4.0.0"
+            "execa": "^0.10.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
           }
         },
         "p-limit": {
@@ -9237,7 +10142,7 @@
           "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
           "dev": true,
           "requires": {
-            "p-try": "2.0.0"
+            "p-try": "^2.0.0"
           }
         },
         "p-locate": {
@@ -9246,7 +10151,7 @@
           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "dev": true,
           "requires": {
-            "p-limit": "2.0.0"
+            "p-limit": "^2.0.0"
           }
         },
         "p-try": {
@@ -9267,8 +10172,8 @@
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           }
         },
         "strip-ansi": {
@@ -9277,7 +10182,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         },
         "which-module": {
@@ -9294,7 +10199,7 @@
       "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
       "dev": true,
       "requires": {
-        "camelcase": "4.1.0"
+        "camelcase": "^4.1.0"
       }
     }
   }
diff --git a/package.json b/package.json
index cfadf771b..2f438c40b 100644
--- a/package.json
+++ b/package.json
@@ -7,9 +7,9 @@
     "build": "cross-env NODE_ENV=development webpack --display-error-details --mode development --progress --hide-modules"
   },
   "dependencies": {
-    "axios": "^0.18.0",
-    "buefy": "^0.7.5",
-    "bulma": "^0.7.4",
+    "axios": "^0.19.0",
+    "buefy": "^0.7.8",
+    "bulma": "^0.7.5",
     "mdi": "^2.2.43",
     "moment": "^2.22.2",
     "node-sass": "^4.12.0",
@@ -34,7 +34,7 @@
     "babel-loader": "^8.0.4",
     "cross-env": "^5.2.0",
     "css-loader": "^1.0.0",
-    "eslint": "^4.0.0",
+    "eslint": "^5.16.0",
     "eslint-loader": "^2.1.1",
     "eslint-plugin-vue": "^4.7.1",
     "file-loader": "^2.0.0",
@@ -46,6 +46,7 @@
     "vue-loader": "^15.4.2",
     "vue-template-compiler": "^2.5.17",
     "webpack": "^4.22.0",
+    "webpack-bundle-analyzer": "^3.3.2",
     "webpack-cli": "^3.1.2",
     "webpack-dev-server": ">=3.1.11"
   }
diff --git a/src/admin/admin.vue b/src/admin/admin.vue
index cb51f6318..9d0951373 100644
--- a/src/admin/admin.vue
+++ b/src/admin/admin.vue
@@ -64,6 +64,7 @@
             TainacanRepositorySubheader
         },
         created() {
+            this.$statusHelper.loadStatuses(); 
             this.$userPrefs.init();
             this.isMenuCompressed = (this.$route.params.collectionId != undefined);
             this.activeRoute = this.$route.name;
diff --git a/src/admin/class-tainacan-admin.php b/src/admin/class-tainacan-admin.php
index 8cafede8f..8f9527454 100644
--- a/src/admin/class-tainacan-admin.php
+++ b/src/admin/class-tainacan-admin.php
@@ -18,7 +18,6 @@ class Admin {
 
 	private function __construct() {
 
-		add_action( 'wp_ajax_tainacan-date-i18n', array( &$this, 'ajax_date_i18n') );
 		add_action( 'wp_ajax_tainacan-sample-permalink', array( &$this, 'ajax_sample_permalink') );
 
 		add_action( 'admin_menu', array( &$this, 'add_admin_menu' ) );
@@ -78,6 +77,7 @@ class Admin {
 		
 		// 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');
 	}
 	
@@ -220,6 +220,13 @@ class Admin {
 		    $class = new $metadata_type;
             $settings['i18n']['helpers_label'][$class->get_component()] = $class->get_form_labels();
 		}
+
+		$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();
 		
@@ -272,15 +279,6 @@ class Admin {
 		register_meta( 'user', 'tainacan_prefs', $args );
 	}
 
-	function ajax_date_i18n(){
-
-		$unix_time_stamp = strtotime($_POST['date_string']);
-
-		echo date_i18n(get_option('date_format'), $unix_time_stamp);
-
-		wp_die();
-	}
-
 	function ajax_sample_permalink(){
 
 		$id = $_POST['post_id'];
diff --git a/src/admin/components/advanced-search/advanced-search.vue b/src/admin/components/advanced-search/advanced-search.vue
index 4cc165041..89788c5b7 100644
--- a/src/admin/components/advanced-search/advanced-search.vue
+++ b/src/admin/components/advanced-search/advanced-search.vue
@@ -276,14 +276,7 @@
                 this.metadataIsLoading = false;
             });
 
-            let locale = navigator.language;
-
-            moment.locale(locale);
-
-            let localeData = moment.localeData();
-            this.dateFormat = localeData.longDateFormat('L');
-
-            if((this.$route.query.metaquery && Object.keys(this.$route.query.metaquery).length > 0) ||
+            if ((this.$route.query.metaquery && Object.keys(this.$route.query.metaquery).length > 0) ||
                 (this.$route.query.taxquery && Object.keys(this.$route.query.taxquery).length > 0) ){
                 this.searchCriteria = [];
             }
@@ -362,8 +355,6 @@
                 },
                 termList: [],
                 terms: [],
-                dateMask: this.getDateLocaleMask(),
-                dateFormat: '',
                 metadataIsLoading: false,
                 metadata: [],
             }
diff --git a/src/admin/components/bulk-edition/bulk-edition-modal.vue b/src/admin/components/bulk-edition/bulk-edition-modal.vue
index 3c8acc3d5..99415d1bf 100644
--- a/src/admin/components/bulk-edition/bulk-edition-modal.vue
+++ b/src/admin/components/bulk-edition/bulk-edition-modal.vue
@@ -124,10 +124,10 @@
                                 :placeholder="$i18n.get('instruction_select_a_status2')"
                                 @input="addToBulkEditionProcedures($event, 'newValue', criterion)">
                             <option
-                                    v-for="(status, key) in statuses"
-                                    :key="key"
-                                    :value="status">
-                                {{ $i18n.get(status) }}
+                                    v-for="(statusOption, index) of $statusHelper.getStatuses().filter(option => { return option.value != 'trash' })"
+                                    :key="index"
+                                    :value="statusOption.slug">
+                                {{ statusOption.name }}
                             </option>
                         </b-select>
                     </template>
diff --git a/src/admin/components/edition/collection-edition-form.vue b/src/admin/components/edition/collection-edition-form.vue
index 1ab7d2d9f..550459a30 100644
--- a/src/admin/components/edition/collection-edition-form.vue
+++ b/src/admin/components/edition/collection-edition-form.vue
@@ -297,15 +297,15 @@
                         <div class="status-radios">
                             <b-radio
                                     v-model="form.status"
-                                    v-for="statusOption in statusOptions"
-                                    :key="statusOption.value"
-                                    :native-value="statusOption.value">
+                                    v-for="(statusOption, index) of $statusHelper.getStatuses()"
+                                    :key="index"
+                                    :native-value="statusOption.slug">
                                 <span class="icon has-text-gray">
                                     <i 
                                         class="tainacan-icon tainacan-icon-18px"
-                                        :class="'tainacan-icon-' + getStatusIcon(statusOption.value)"/>
+                                        :class="$statusHelper.getIcon(statusOption.slug)"/>
                                 </span>
-                                {{ statusOption.label }}
+                                {{ statusOption.name }}
                             </b-radio>
                         </div>
                     </b-field>
@@ -555,20 +555,6 @@ export default {
             },
             thumbnail: {},
             cover: {},
-            // Can be obtained from api later
-            statusOptions: [{ 
-                value: 'publish',
-                label: this.$i18n.get('public')
-                }, {
-                value: 'private',
-                label: this.$i18n.get('private')
-                }, {
-                value: 'draft',
-                label: this.$i18n.get('draft')
-                }, {
-                value: 'trash',
-                label: this.$i18n.get('trash')
-            }],
             isFetchingPages: false,
             coverPages: [],
             coverPage: '',
@@ -674,10 +660,10 @@ export default {
                 this.form.status = this.collection.status;
                 this.form.cover_page_id = this.collection.cover_page_id;
                 this.form.enable_cover_page = this.collection.enable_cover_page;
-                this.form.enabled_view_modes = this.collection.enabled_view_modes;
+                this.form.enabled_view_modes = this.collection.enabled_view_modes.map((viewMode) => viewMode.viewMode);
                 this.form.default_view_mode = this.collection.default_view_mode;
                 this.form.allow_comments = this.collection.allow_comments;
-
+                
                 this.isLoading = false;
                 this.formErrorMessage = '';
                 this.editFormErrors = {};
@@ -876,15 +862,6 @@ export default {
                     }
                 }
             );
-        },
-        getStatusIcon(status) {
-            switch(status) {
-                case 'publish': return 'public';
-                case 'private': return 'private';
-                case 'draft': return 'draft';
-                case 'trash': return 'delete';
-                default: return 'item';
-            }
         }
     },
     mounted(){
@@ -926,10 +903,10 @@ export default {
                 this.form.cover_page_id = this.collection.cover_page_id;
                 this.form.parent = this.collection.parent;
                 this.form.default_view_mode = this.collection.default_view_mode;
-                this.form.enabled_view_modes = JSON.parse(JSON.stringify(this.collection.enabled_view_modes));
+                this.form.enabled_view_modes = JSON.parse(JSON.stringify(this.collection.enabled_view_modes.reduce((result, viewMode) => { typeof viewMode == 'string' ? result.push(viewMode) : null; return result }, [])));
                 this.moderators = JSON.parse(JSON.stringify(this.collection.moderators));
                 this.form.allow_comments = this.collection.allow_comments;
-                 
+
                 // Generates CoverPage from current cover_page_id info
                 if (this.form.cover_page_id != undefined && this.form.cover_page_id != '') {
                     
diff --git a/src/admin/components/edition/filter-edition-form.vue b/src/admin/components/edition/filter-edition-form.vue
index 4d47c5291..22b52e3a9 100644
--- a/src/admin/components/edition/filter-edition-form.vue
+++ b/src/admin/components/edition/filter-edition-form.vue
@@ -244,7 +244,7 @@ export default {
         saveEdition(filter) {
 
             if ((filter.filter_type_object && filter.filter_type_object.form_component) || filter.edit_form == '') {
-                
+
                 // this.fillExtraFormData(this.editForm);
                 this.updateFilter({ filterId: filter.id, index: this.index, options: this.editForm})
                     .then(() => {
diff --git a/src/admin/components/edition/item-bulk-edition-form.vue b/src/admin/components/edition/item-bulk-edition-form.vue
index 6e9834ed5..97fac9c69 100644
--- a/src/admin/components/edition/item-bulk-edition-form.vue
+++ b/src/admin/components/edition/item-bulk-edition-form.vue
@@ -370,7 +370,7 @@ export default {
         }
 
         .tainacan-page-title {
-            margin-bottom: 40px;
+            margin-bottom: 35px;
             display: flex;
             flex-wrap: wrap;
             align-items: flex-end;
diff --git a/src/admin/components/edition/item-edition-form.vue b/src/admin/components/edition/item-edition-form.vue
index c72203018..3c858ce54 100644
--- a/src/admin/components/edition/item-edition-form.vue
+++ b/src/admin/components/edition/item-edition-form.vue
@@ -9,14 +9,14 @@
             <h1 v-if="isCreatingNewItem">
                 <span 
                         v-if="(item != null && item != undefined && item.status != undefined && !isLoading)"
-                        class="status-tag">{{ $i18n.get(item.status) }}</span>
+                        class="status-tag">{{ $i18n.get('status_' + item.status) }}</span>
                 {{ $i18n.get('title_create_item_collection') + ' ' }}
                 <span style="font-weight: 600;">{{ collectionName }}</span>
             </h1>
             <h1 v-else>
                 <span 
                         v-if="(item != null && item != undefined && item.status != undefined && !isLoading)"
-                        class="status-tag">{{ $i18n.get(item.status) }}</span>
+                        class="status-tag">{{ $i18n.get('status_' + item.status) }}</span>
                 {{ $i18n.get('title_edit_item') + ' ' }}
                 <span style="font-weight: 600;">{{ (item != null && item != undefined) ? item.title : '' }}</span>
             </h1>
@@ -485,7 +485,7 @@
                                 v-for="(metadatum, index) of metadatumList"
                                 :key="index"
                                 :metadatum="metadatum"
-                                :is-collapsed="metadatumCollapses[index]"
+                                :is-collapsed="metadataCollapses[index]"
                                 @changeCollapse="onChangeCollapse($event, index)"/>
 
                         <!-- Hook for extra Form options -->
@@ -707,7 +707,7 @@ export default {
             isOnSequenceEdit: false,
             sequenceRightDirection: false,
             isLoading: false,
-            metadatumCollapses: [],
+            metadataCollapses: [],
             collapseAll: true,
             visibility: 'publish',
             form: {
@@ -718,20 +718,6 @@ export default {
                 comment_status: ''
             },
             thumbnail: {},
-            // Can be obtained from api later
-            statusOptions: [{
-                value: 'publish',
-                label: this.$i18n.get('public')
-                }, {
-                value: 'private',
-                label: this.$i18n.get('private')
-                }, {
-                value: 'draft',
-                label: this.$i18n.get('draft')
-                }, {
-                value: 'trash',
-                label: this.$i18n.get('trash')
-            }],
             formErrorMessage: '',
             thumbPlaceholderPath: tainacan_plugin.base_url + '/admin/images/placeholder_square.png',
             thumbnailMediaFrame: undefined,
@@ -859,9 +845,12 @@ export default {
                 this.isLoading = false;
 
                 if (!this.isOnSequenceEdit) {                    
-                    if (this.form.status != 'trash') 
-                        this.$router.push(this.$routerHelper.getItemPath(this.form.collectionId, this.itemId));
-                    else
+                    if (this.form.status != 'trash') {
+                        if (previousStatus == 'auto-draft')
+                            this.$router.push({ path: this.$routerHelper.getItemPath(this.form.collectionId, this.itemId), query: { recent: true } });
+                        else
+                            this.$router.push(this.$routerHelper.getItemPath(this.form.collectionId, this.itemId));
+                    } else
                         this.$router.push(this.$routerHelper.getCollectionPath(this.form.collectionId));
                 }
             })
@@ -919,11 +908,24 @@ export default {
         loadMetadata() {
             // Obtains Item Metadatum
             this.fetchMetadata(this.itemId).then((metadata) => {
-                this.isLoading = false;
-                for (let i = 0; i < metadata.length; i++) {
-                    this.metadatumCollapses.push(false);
-                    this.metadatumCollapses[i] = true;
+                this.metadataCollapses = [];
+
+                if (this.isOnSequenceEdit && this.$route.query.collapses) {
+                    for (let i = 0; i < metadata.length; i++) {
+                        this.metadataCollapses.push(this.$route.query.collapses[i] != undefined ? this.$route.query.collapses[i] : true);
+                    }
+                } else if (this.isOnSequenceEdit && !this.$route.query.collapses) {
+                    for (let i = 0; i < metadata.length; i++) {
+                        this.metadataCollapses.push(true);
+                        this.metadataCollapses[i] = false;
+                    }
+                } else {
+                    for (let i = 0; i < metadata.length; i++) {
+                        this.metadataCollapses.push(false);
+                        this.metadataCollapses[i] = true;
+                    }
                 }
+                this.isLoading = false;
             });
         },
         setFileDocument(event) {
@@ -1095,12 +1097,12 @@ export default {
         toggleCollapseAll() {
             this.collapseAll = !this.collapseAll;
 
-            for (let i = 0; i < this.metadatumCollapses.length; i++)
-                this.metadatumCollapses[i] = this.collapseAll;
+            for (let i = 0; i < this.metadataCollapses.length; i++)
+                this.metadataCollapses[i] = this.collapseAll;
 
         },
         onChangeCollapse(event, index) {
-            this.metadatumCollapses.splice(index, 1, event);
+            this.metadataCollapses.splice(index, 1, event);
         },
         onDeletePermanently() {
             this.$modal.open({
@@ -1121,7 +1123,12 @@ export default {
             // Initializes Media Frames now that itemId exists
             this.initializeMediaFrames();
 
-            this.fetchItem({ itemId: this.itemId, contextEdit: true }).then(res => {
+            this.fetchItem({ 
+                itemId: this.itemId, 
+                contextEdit: true, 
+                fetchOnly: 'title,thumbnail,status,modification_date,document_type,document,comment_status,document_as_html' 
+            })
+            .then(res => {
                 this.item = res;
 
                 // Checks if user has permission to edit
@@ -1173,11 +1180,17 @@ export default {
         },
         onNextInSequence() {
             this.sequenceRightDirection = true; 
-            this.$router.push(this.$routerHelper.getCollectionSequenceEditPath(this.collectionId, this.sequenceId, this.itemPosition + 1));
+            this.$router.push({ 
+                path: this.$routerHelper.getCollectionSequenceEditPath(this.collectionId, this.sequenceId, this.itemPosition + 1), 
+                query: { collapses: this.metadataCollapses }
+            });
         },
         onPrevInSequence() {
             this.sequenceRightDirection = false; 
-            this.$router.push(this.$routerHelper.getCollectionSequenceEditPath(this.collectionId, this.sequenceId, this.itemPosition - 1));
+            this.$router.push({
+                path: this.$routerHelper.getCollectionSequenceEditPath(this.collectionId, this.sequenceId, this.itemPosition - 1),
+                query: { collapses: this.metadataCollapses }
+            });
         }
     },
     created(){
@@ -1294,7 +1307,7 @@ export default {
 
         .tainacan-page-title {
             padding: 0 $page-side-padding;
-            margin-bottom: 40px;
+            margin-bottom: 35px;
             display: flex;
             flex-wrap: wrap;
             align-items: flex-end;
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 030cb92ca..829453c43 100644
--- a/src/admin/components/edition/item-metadata-bulk-edition-form.vue
+++ b/src/admin/components/edition/item-metadata-bulk-edition-form.vue
@@ -5,7 +5,7 @@
                 :active.sync="isLoadingMetadata"
                 :can-cancel="false"/>
         <div class="tainacan-page-title">
-            <h1><span class="status-tag">{{ $i18n.get(status) }}</span>{{ $i18n.get('label_bulk_edit_items') }}</h1>
+            <h1><span class="status-tag">{{ $i18n.get('status_' + status) }}</span>{{ $i18n.get('label_bulk_edit_items') }}</h1>
             <a 
                     @click="$router.go(-1)"
                     class="back-link has-text-secondary">
@@ -31,7 +31,7 @@
                         {{ $i18n.get('info_there_is_one_item_being_edited') }}
                     </p>
                     <p v-if="items.length <= 0 && !isLoadingGroupInfo && bulkEditGroup.items_count > 1">
-                        {{ $i18n.getWithVariables('info_there_are_%s_items_being_edited', bulkEditGroup.items_count) }}
+                        {{ $i18n.getWithVariables('info_there_are_%s_items_being_edited', [bulkEditGroup.items_count]) }}
                     </p>
                     <p v-if="items.length <= 0 && !isLoadingGroupInfo">
                         {{ $i18n.get('info_no_preview_found') }}
@@ -70,31 +70,17 @@
                     <div class="section-status">
                         <div class="field has-addons">
                             <b-radio
+                                    v-for="(statusOption, index) of $statusHelper.getStatuses().filter(option => { return option.value != 'trash' })"
+                                    :key="index"
                                     v-model="status"
                                     @input="changeStatus($event)"
-                                    value="publish"
-                                    native-value="publish">
+                                    :value="statusOption.slug"
+                                    :native-value="statusOption.slug">
                                 <span class="icon">
-                                    <i class="tainacan-icon tainacan-icon-public"/>
-                                </span> {{ $i18n.get('publish_visibility') }}
-                            </b-radio>
-                            <b-radio
-                                    v-model="status"
-                                    @input="changeStatus($event)"
-                                    value="private"
-                                    native-value="private">
-                                <span class="icon">
-                                    <i class="tainacan-icon tainacan-icon-private"/>
-                                </span>  {{ $i18n.get('private_visibility') }}
-                            </b-radio>
-                            <b-radio
-                                    v-model="status"
-                                    @input="changeStatus($event)"
-                                    value="draft"
-                                    native-value="draft">
-                                <span class="icon">
-                                    <i class="tainacan-icon tainacan-icon-draft"/>
-                                </span>  {{ $i18n.get('draft') }}
+                                    <i 
+                                            class="tainacan-icon"
+                                            :class="$statusHelper.getIcon(statusOption.slug)"/>
+                                </span> {{ statusOption.name }}
                             </b-radio>
                         </div>
                     </div>
@@ -469,7 +455,7 @@ export default {
         }
 
         .tainacan-page-title {
-            margin-bottom: 40px;
+            margin-bottom: 35px;
             display: flex;
             flex-wrap: wrap;
             align-items: flex-end;
diff --git a/src/admin/components/edition/taxonomy-edition-form.vue b/src/admin/components/edition/taxonomy-edition-form.vue
index 125ea7630..ca8200462 100644
--- a/src/admin/components/edition/taxonomy-edition-form.vue
+++ b/src/admin/components/edition/taxonomy-edition-form.vue
@@ -90,15 +90,15 @@
                                     <div class="status-radios">
                                         <b-radio
                                                 v-model="form.status"
-                                                v-for="statusOption in statusOptions"
-                                                :key="statusOption.value"
-                                                :native-value="statusOption.value">
+                                                v-for="(statusOption, index) of $statusHelper.getStatuses()"
+                                                :key="index"
+                                                :native-value="statusOption.slug">
                                             <span class="icon has-text-gray">
                                                 <i 
                                                     class="tainacan-icon tainacan-icon-18px"
-                                                    :class="'tainacan-icon-' + getStatusIcon(statusOption.value)"/>
+                                                    :class="$statusHelper.getIcon(statusOption.slug)"/>
                                             </span>
-                                            {{ statusOption.label }}
+                                            {{ statusOption.name }}
                                         </b-radio>
                                     </div>
                                 </b-field>
@@ -224,19 +224,6 @@
                     allowInsert: String,
                     enabledPostTypes: Array
                 },
-                statusOptions: [{
-                    value: 'publish',
-                    label: this.$i18n.get('public')
-                }, {
-                    value: 'private',
-                    label: this.$i18n.get('private')
-                }, {
-                    value: 'draft',
-                    label: this.$i18n.get('draft')
-                }, {
-                    value: 'trash',
-                    label: this.$i18n.get('trash')
-                }],
                 wpPostTypes: tainacan_plugin.wp_post_types,
                 editFormErrors: {},
                 formErrorMessage: '',
@@ -415,15 +402,6 @@
                     })
                     .catch(error => this.$console.error(error));
             },
-            getStatusIcon(status) {
-                switch(status) {
-                    case 'publish': return 'public';
-                    case 'private': return 'private';
-                    case 'draft': return 'draft';
-                    case 'trash': return 'delete';
-                    default: return 'item';
-                }
-            },
             clearErrors(attribute) {
                 this.editFormErrors[attribute] = undefined;
             },
diff --git a/src/admin/components/edition/term-edition-form.vue b/src/admin/components/edition/term-edition-form.vue
index 16a578ac5..257e97557 100644
--- a/src/admin/components/edition/term-edition-form.vue
+++ b/src/admin/components/edition/term-edition-form.vue
@@ -432,7 +432,7 @@
         animation-duration: 0.5s;
 
         .tainacan-page-title {
-            margin-bottom: 40px;
+            margin-bottom: 35px;
 
             h2 {
                 font-size: 20px;
diff --git a/src/admin/components/lists/collections-home-list.vue b/src/admin/components/lists/collections-home-list.vue
index 33eef761e..282a0fb00 100644
--- a/src/admin/components/lists/collections-home-list.vue
+++ b/src/admin/components/lists/collections-home-list.vue
@@ -1,5 +1,7 @@
 <template>
-    <div class="tainacan-cards-container">
+    <div
+            style="min-height: initial; position: relative"
+            class="tainacan-cards-container">
         <template v-if="collections.length <= 0 && !isLoading">
             <ul class="new-collection-menu">
                 <li>
@@ -260,6 +262,7 @@ export default {
     props: {
         isLoading: false,
         collections: Array,
+        collectionsTotal: Number
     }
 }
 </script>
diff --git a/src/admin/components/lists/filters-list.vue b/src/admin/components/lists/filters-list.vue
index 7f3aef271..d01fbebc9 100644
--- a/src/admin/components/lists/filters-list.vue
+++ b/src/admin/components/lists/filters-list.vue
@@ -17,21 +17,12 @@
         </div>
         <p v-if="isRepositoryLevel">{{ $i18n.get('info_repository_filters_inheritance') }}</p>
         <br>
-        <div class="columns">
+        <div
+                :style="{ height: 'calc(100vh - 6px - ' + columnsTopY + 'px)'}"
+                class="columns"
+                ref="filterEditionPageColumns">
             <div class="column">
-                <section 
-                        v-if="activeFilterList.length <= 0 && !isLoadingFilters"
-                        class="field is-grouped-centered section">
-                    <div class="content has-text-gray has-text-centered">
-                        <p>
-                            <span class="icon is-large">
-                                <i class="tainacan-icon tainacan-icon-36px tainacan-icon-filters"/>
-                            </span>
-                        </p>
-                        <p>{{ $i18n.get('info_there_is_no_filter' ) }}</p>  
-                        <p>{{ $i18n.get('info_create_filters' ) }}</p>
-                    </div>
-                </section>         
+                     
                 <draggable 
                         class="active-filters-area"
                         @change="handleChangeOnFilter"
@@ -45,6 +36,19 @@
                             ghostClass: 'sortable-ghost',
                             filter: 'not-sortable-item', 
                             animation: '250'}">
+                            <section 
+                        v-if="activeFilterList.length <= 0 && !isLoadingFilters"
+                        class="field is-grouped-centered section">
+                    <div class="content has-text-gray has-text-centered">
+                        <p>
+                            <span class="icon is-large">
+                                <i class="tainacan-icon tainacan-icon-36px tainacan-icon-filters"/>
+                            </span>
+                        </p>
+                        <p>{{ $i18n.get('info_there_is_no_filter' ) }}</p>  
+                        <p>{{ $i18n.get('info_create_filters' ) }}</p>
+                    </div>
+                </section>    
                     <div  
                             class="active-filter-item" 
                             :class="{
@@ -255,7 +259,7 @@
                                             :key="index"
                                             @click="onFilterTypeSelected(filterType)"
                                             @mouseover="currentFilterTypePreview = { name: filterType.name, template: filterType.preview_template }"
-                                            @mouseleave="currentFilterTypePreview = undefined">
+                                            @mouseleave="currentFilterTypePreview = { name: filterType.name, template: filterType.preview_template }">
                                         <h4>{{ filterType.name }}</h4>          
                                     </div>
                                 </div>
@@ -330,7 +334,8 @@ export default {
             newFilterIndex: 0,
             availableMetadata: [],
             filterTypes: [],
-            currentFilterTypePreview: undefined        
+            currentFilterTypePreview: undefined,
+            columnsTopY: 0        
         }
     },
     computed: {
@@ -569,6 +574,7 @@ export default {
                     this.newFilterIndex = 0;
                 }
                 this.openedFilterId = filter.id;
+
                 // First time opening
                 if (this.editForms[this.openedFilterId] == undefined) {
                     this.editForms[this.openedFilterId] = JSON.parse(JSON.stringify(filter));
@@ -609,6 +615,10 @@ export default {
         if (!this.isRepositoryLevel)
             this.$root.$emit('onCollectionBreadCrumbUpdate', [{ path: '', label: this.$i18n.get('filter') }]);
 
+        this.$nextTick(() => { 
+            this.columnsTopY = this.$refs.filterEditionPageColumns.getBoundingClientRect().top;
+        });
+
         this.isRepositoryLevel = this.$route.name == 'FiltersPage' ? true : false;
         if (this.isRepositoryLevel)
             this.collectionId = 'default';
@@ -666,9 +676,10 @@ export default {
     @import "../../scss/_variables.scss";
 
     .filters-list-page {
+        padding-bottom: 0;
 
         .tainacan-page-title {
-            margin-bottom: 40px;
+            margin-bottom: 35px;
             display: flex;
             flex-wrap: wrap;
             align-items: flex-end;
@@ -696,9 +707,18 @@ export default {
             }
         }
                     
-        .column:not(.available-metadata-area){
-            overflow: hidden;
-            flex-grow: 2;
+        .column {
+            overflow-x: hidden;
+            overflow-y: auto;
+
+            &:not(.available-metadata-area){
+                margin-right: $page-side-padding;
+                flex-grow: 2;
+
+                @media screen and (max-width: 769px) {
+                    margin-right: 0;
+                }
+            }
         }
 
         .loading-spinner {
@@ -715,9 +735,9 @@ export default {
 
         .active-filters-area {
             font-size: 14px;
-            margin-right: 0.8em;
-            margin-left: -0.8em;
-            padding-right: 6em;
+            margin-right: 0.8rem;
+            margin-left: -0.8rem;
+            padding-right: 3rem;
             min-height: 330px;
 
             @media screen and (max-width: 769px) {
@@ -888,13 +908,13 @@ export default {
             }
 
             h3 {
-                margin: 0.2em 0em 1em -1.2em;
+                margin: 0.2rem 0rem 1rem 0rem;
                 font-weight: 500;
             }
 
             .available-metadatum-item {
                 padding: 0.7em;
-                margin: 4px;
+                margin: 4px 4px 4px 1.2rem;
                 background-color: white;
                 cursor: pointer;
                 left: 0;
@@ -1013,6 +1033,7 @@ export default {
 
             .column {
                 overflow: visible;
+                margin: 0;
             }
 
             .filter-types-container {
@@ -1091,7 +1112,7 @@ export default {
                 }
                 .field {
                     width: 100%;
-                    margin: 16px;
+                    margin: 6px;
                     .label { 
                         color: $gray5;
                         font-weight: normal;
@@ -1102,6 +1123,36 @@ export default {
                     text-decoration: underline;
                     margin: 0.875rem 1.5rem;
                 }
+
+                .numeric-filter-container,
+                .date-filter-container {
+                    display: flex;
+
+                    .field { margin: 0; }
+                    .dropdown {
+                        width: auto;
+
+                        .dropdown-trigger button {
+                            padding: 0 0.5rem !important;
+                            height: 30px !important;
+
+                            i:not(.tainacan-icon-arrowdown) {
+                                margin-top: -3px;
+                                font-size: 1.5rem;
+                                font-style: normal;
+                                color: #555758;
+                            }
+                        }
+                        .dropdown-menu {
+                            display: block !important;
+                        }
+                    }
+                    .datepicker {
+                        flex-shrink: 0;
+                        max-width: 70%;
+                    }
+                }
+
             }
 
         }
diff --git a/src/admin/components/lists/items-list.vue b/src/admin/components/lists/items-list.vue
index 9d940ff79..5e46026a5 100644
--- a/src/admin/components/lists/items-list.vue
+++ b/src/admin/components/lists/items-list.vue
@@ -107,6 +107,11 @@
                             v-if="contextMenuItem != null && contextMenuItem.current_user_can_edit && !$route.query.iframemode">
                         {{ $i18n.getFrom('items','edit_item') }}
                     </b-dropdown-item>
+                    <!-- <b-dropdown-item
+                            @click="duplicateOneItem(contextMenuItem.id)"
+                            v-if="contextMenuItem != null && contextMenuItem.current_user_can_edit && !$route.query.iframemode">
+                        {{ $i18n.get('label_duplicate_item') }}
+                    </b-dropdown-item> -->
                     <b-dropdown-item
                             @click="deleteOneItem(contextMenuItem.id)"
                             v-if="contextMenuItem != null && contextMenuItem.current_user_can_edit && !$route.query.iframemode">
@@ -485,13 +490,13 @@
                                             show: 500,
                                             hide: 300,
                                         },
-                                        content: item.creation_date != undefined ? item.creation_date : '',
+                                        content: item.creation_date != undefined ? parseDateToNavigatorLanguage(item.creation_date) : '',
                                         html: false,
                                         autoHide: false,
                                         placement: 'auto-start'
                                     }"   
                                     class="metadata-author-creation">   
-                                {{ $i18n.get('info_date') + ' ' + (item.creation_date != undefined ? item.creation_date : '') }}
+                                {{ $i18n.get('info_date') + ' ' + (item.creation_date != undefined ? parseDateToNavigatorLanguage(item.creation_date) : '') }}
                             </p>   
                         </div>
                     </div>
@@ -654,6 +659,15 @@
                                         v-html="renderMetadata(item.metadata, column)"
                                         class="metadata-value"/>
                             </span>
+                            <span 
+                                    v-for="(column, index) in tableMetadata"
+                                    :key="index"
+                                    v-if="column.metadatum == 'row_creation' || column.metadatum == 'row_author'">
+                                <h3 class="metadata-label">{{ column.name }}</h3>
+                                <p 
+                                        v-html="column.metadatum == 'row_creation' ? parseDateToNavigatorLanguage(item[column.slug]) : item[column.slug]"
+                                        class="metadata-value"/>
+                            </span>
                         </div>
                     </div>
                
@@ -687,8 +701,7 @@
                                                                                                             column.metadata_type_object.primitive_type == 'item' || 
                                                                                                             column.metadata_type_object.primitive_type == 'compound') : false,
                                         'column-large-width' : column.metadata_type_object != undefined ? (column.metadata_type_object.primitive_type == 'long_string' || column.metadata_type_object.related_mapped_prop == 'description') : false,
-                                }"
-                                :custom-key="column.slug">
+                                }">
                             <div class="th-wrap">{{ column.name }}</div>
                         </th>
                         <th class="actions-header">
@@ -718,7 +731,6 @@
                                 :key="columnIndex"
                                 v-for="(column, columnIndex) in tableMetadata"
                                 v-if="column.display"
-                                :label="column.name" 
                                 class="column-default-width"
                                 :class="{ 'metadata-type-textarea': column.metadata_type_object != undefined && column.metadata_type_object.component == 'tainacan-textarea',
                                         'thumbnail-cell': column.metadatum == 'row_thumbnail',
@@ -750,7 +762,7 @@
                                     v-if="collectionId == undefined &&
                                           column.metadata_type_object != undefined && 
                                           column.metadata_type_object.related_mapped_prop == 'title'"
-                                    v-html="(item.title != undefined && item.title != '') ? item.title : `<span class='has-text-gray3 is-italic'>` + $i18n.get('label_value_not_informed') + `</span>`"/>
+                                    v-html="`<span class='sr-only'>` + column.name + ': </span>' + ((item.title != undefined && item.title != '') ? item.title : `<span class='has-text-gray3 is-italic'>` + $i18n.get('label_value_not_informed') + `</span>`)"/>
                             <p
                                     v-tooltip="{
                                         delay: {
@@ -765,7 +777,7 @@
                                     v-if="collectionId == undefined &&
                                           column.metadata_type_object != undefined && 
                                           column.metadata_type_object.related_mapped_prop == 'description'"
-                                    v-html="(item.description != undefined && item.description) != '' ? item.description : `<span class='has-text-gray3 is-italic'>` + $i18n.get('label_value_not_informed') + `</span>`"/>
+                                    v-html="`<span class='sr-only'>` + column.name + ': </span>' + ((item.description != undefined && item.description) != '' ? item.description : `<span class='has-text-gray3 is-italic'>` + $i18n.get('label_value_not_informed') + `</span>`)"/>
                             <p
                                     v-tooltip="{
                                         delay: {
@@ -804,9 +816,23 @@
                                         autoHide: false,
                                         placement: 'auto-start'
                                     }"
-                                    v-if="column.metadatum == 'row_author' || column.metadatum == 'row_creation'">
+                                    v-if="column.metadatum == 'row_author'">
                                     {{ item[column.slug] }}
                             </p>
+                            <p 
+                                    v-tooltip="{
+                                        delay: {
+                                            show: 500,
+                                            hide: 300,
+                                        },
+                                        content: parseDateToNavigatorLanguage(item[column.slug]),
+                                        html: true,
+                                        autoHide: false,
+                                        placement: 'auto-start'
+                                    }"
+                                    v-if="column.metadatum == 'row_creation'">
+                                    {{ parseDateToNavigatorLanguage(item[column.slug]) }}
+                            </p>
 
                         </td>
 
@@ -875,6 +901,7 @@
 import { mapActions, mapGetters } from 'vuex';
 import CustomDialog from '../other/custom-dialog.vue';
 import BulkEditionModal from '../bulk-edition/bulk-edition-modal.vue';
+import { dateInter } from "../../../admin/js/mixins";
 
 export default {
     name: 'ItemsList',
@@ -894,6 +921,7 @@ export default {
             enableSelectAllItemsPages: tainacan_plugin.enable_select_all_items_pages
         }
     },
+    mixins: [ dateInter ],
     props: {
         collectionId: undefined,
         tableMetadata: Array,
@@ -949,6 +977,10 @@ export default {
         ...mapGetters('bulkedition', [
             'getGroupID'
         ]),
+        ...mapActions('item', [
+            'fetchItem',
+            'duplicateItem'
+        ]),
         ...mapGetters('search', [
             'getOrder',
             'getOrderBy'
@@ -993,6 +1025,18 @@ export default {
                 this.selectedItems.splice(i, 1, this.isAllItemsSelected);
             }
         },
+        duplicateOneItem(itemId) {
+            this.fetchItem({ itemId: itemId, contextEdit: true })
+                .then((item) => {
+                    this.duplicateItem({ item: item })
+                        .then((duplicatedItem) => {
+                            this.$console.log(duplicatedItem);
+                        })
+                        .catch((error) => this.$console.error(error));
+                })
+                .catch(error => this.$console.error("Error fetching item for duplicate: " + error));    
+            this.clearContextMenu();
+        },
         untrashOneItem(itemId) {
             this.$modal.open({
                 parent: this,
@@ -1178,9 +1222,9 @@ export default {
                 return '';
             } else {
                 if ((component != undefined && component == 'tainacan-textarea') || this.$route.query.iframemode)
-                    return metadata.value_as_string;
+                    return this.viewMode == 'table' ? ('<span class="sr-only">' + column.name + ': </span>' + metadata.value_as_string) : metadata.value_as_string;
                 else
-                    return metadata.value_as_html;
+                    return this.viewMode == 'table' ? ('<span class="sr-only">' + column.name + ': </span>' + metadata.value_as_html) : metadata.value_as_html;
             }
         },
         getLimitedDescription(description) {
diff --git a/src/admin/components/lists/metadata-list.vue b/src/admin/components/lists/metadata-list.vue
index b3fe8d39f..6515b9499 100644
--- a/src/admin/components/lists/metadata-list.vue
+++ b/src/admin/components/lists/metadata-list.vue
@@ -20,21 +20,11 @@
         <br>
         <b-tabs v-model="activeTab">    
             <b-tab-item :label="$i18n.get('metadata')">
-                <div class="columns">
-                    <div class="column"> 
-                        <section 
-                                v-if="activeMetadatumList.length <= 0 && !isLoadingMetadata"
-                                class="field is-grouped-centered section">
-                            <div class="content has-text-gray has-text-centered">
-                                <p>
-                                    <span class="icon is-large">
-                                        <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>
-                            </div>
-                        </section>             
+                <div
+                        :style="{ height: 'calc(100vh - 6px - ' + columnsTopY + 'px)'}"
+                        class="columns"
+                        ref="metadataEditionPageColumns">
+                    <div class="column">     
                         <draggable 
                                 v-model="activeMetadatumList"
                                 class="active-metadata-area"
@@ -49,6 +39,19 @@
                                         chosenClass: 'sortable-chosen',
                                         filter: 'not-sortable-item', 
                                         animation: '250'}">
+                            <section 
+                                    v-if="activeMetadatumList.length <= 0 && !isLoadingMetadata"
+                                    class="field is-grouped-centered section">
+                                <div class="content has-text-gray has-text-centered">
+                                    <p>
+                                        <span class="icon is-large">
+                                            <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>
+                                </div>
+                            </section>         
                             <div  
                                     class="active-metadatum-item"
                                     :class="{
@@ -233,10 +236,8 @@
             </b-tab-item>
 
             <!-- Exposer --------------- -->
-            <b-tab-item
-                    :label="$i18n.get('mapping')"
-                    v-model="activeMetadatumList">
-                <div class="active-metadata-area">
+            <b-tab-item :label="$i18n.get('mapping')">
+                <div>
                     <section 
                             v-if="activeMetadatumList.length <= 0 && !isLoadingMetadata"
                             class="field is-grouped-centered section">
@@ -254,11 +255,12 @@
                         <div class="field is-grouped form-submit">
                             <b-select
                                     id="mappers-options-dropdown"
-                                    :placeholder="$i18n.get('instruction_select_a_mapper')">
+                                    :placeholder="$i18n.get('instruction_select_a_mapper')"
+                                    @input="onSelectMetadataMapper($event)">
                                 <option
                                         v-for="metadatum_mapper in metadatum_mappers"
                                         :key="metadatum_mapper.slug"
-                                        @click="onSelectMetadataMapper(metadatum_mapper)">
+                                        :value="metadatum_mapper">
                                     {{ $i18n.get(metadatum_mapper.name) }}
                                 </option>
                             </b-select>
@@ -458,7 +460,8 @@ export default {
             newMapperMetadataList: [],
             new_metadata_label: '',
             new_metadata_uri: '',
-            new_metadata_slug: ''
+            new_metadata_slug: '',
+            columnsTopY: 0
         }
     },
     components: {
@@ -644,6 +647,7 @@ export default {
             this.openedMetadatumId = '';
         },
         onSelectMetadataMapper(metadatum_mapper) {
+
             this.isMapperMetadataLoading = true;
             this.mapper = metadatum_mapper; //TODO try to use v-model again
             this.mapperMetadata = [];
@@ -861,6 +865,10 @@ export default {
         if (!this.isRepositoryLevel)
             this.$root.$emit('onCollectionBreadCrumbUpdate', [{ path: '', label: this.$i18n.get('metadata') }]);
 
+        this.$nextTick(() => { 
+            this.columnsTopY = this.$refs.metadataEditionPageColumns.getBoundingClientRect().top;
+        });
+
         this.cleanMetadata();
         this.isLoadingMetadatumTypes = true;
         this.isLoadingMetadata = true;
@@ -896,9 +904,11 @@ export default {
     @import "../../scss/_variables.scss";
 
     .metadata-list-page {
+        padding-bottom: 0;
+        height: calc(100% - 42px + 26px);
 
         .tainacan-page-title {
-            margin-bottom: 40px;
+            margin-bottom: 35px;
             display: flex;
             flex-wrap: wrap;
             align-items: flex-end;
@@ -930,10 +940,19 @@ export default {
             overflow: visible;
             min-height: 500px;
         }
-                  
-        .column:not(.available-metadata-area){
-            overflow: hidden;
-            flex-grow: 2;
+
+        .column {
+            overflow-x: hidden;
+            overflow-y: auto;
+
+            &:not(.available-metadata-area){
+                margin-right: $page-side-padding;
+                flex-grow: 2;
+
+                @media screen and (max-width: 769px) {
+                    margin-right: 0;
+                }
+            }
         }
 
         .page-title {
@@ -969,9 +988,9 @@ export default {
 
         .active-metadata-area {
             font-size: 14px;
-            margin-right: 0.8em;
-            margin-left: -0.8em;
-            padding-right: 6em;
+            margin-right: 0.8rem;
+            margin-left: -0.8rem;
+            padding-right: 3rem;
             min-height: 330px;
 
             @media screen and (max-width: 769px) {
@@ -1133,13 +1152,13 @@ export default {
             }
 
             h3 {
-                margin: 0.2em 0em 1em -1.2em;
+                margin: 0.2rem 0rem 1rem 0rem;
                 font-weight: 500;
             }
 
             .available-metadatum-item {
                 padding: 0.7em;
-                margin: 4px;
+                margin: 4px 4px 4px 1.2rem;
                 background-color: white;
                 cursor: pointer;
                 left: 0;
@@ -1169,7 +1188,7 @@ export default {
                     overflow-x: hidden;
                     white-space: nowrap;
                     font-weight: bold;
-                    margin-left: 0.4em;
+                    margin-left: 0.4rem;
                     display: inline-block;
                     max-width: 180px;
                     width: 60%;
diff --git a/src/admin/components/lists/terms-list.vue b/src/admin/components/lists/terms-list.vue
index 2604d75fa..aeb03ee7a 100644
--- a/src/admin/components/lists/terms-list.vue
+++ b/src/admin/components/lists/terms-list.vue
@@ -11,36 +11,50 @@
             {{ $i18n.get('label_new_term') }}
         </button>
         <b-field class="order-area">
-            <button
-                    :disabled="localTerms.length <= 0 || isLoadingTerms || isEditingTerm || order == 'asc'"
-                    class="button is-white is-small"
-                    @click="onChangeOrder('asc')">
-                <span
-                        v-tooltip="{
-                            content: $i18n.get('label_sort_ascending'),
-                            autoHide: true,
-                            classes: ['tooltip', 'repository-tooltip'],
-                            placement: 'bottom'
-                        }"
-                        class="icon gray-icon">
-                    <i class="tainacan-icon tainacan-icon-sortascending"/>
-                </span>
-            </button>
-            <button
-                    :disabled="localTerms.length <= 0 || isLoadingTerms || isEditingTerm || order == 'desc'"
-                    class="button is-white is-small"
-                    @click="onChangeOrder('desc')">
-                <span
-                        v-tooltip="{
-                            content: $i18n.get('label_sort_descending'),
-                            autoHide: true,
-                            classes: ['tooltip', 'repository-tooltip'],
-                            placement: 'bottom'
-                        }"
-                        class="icon gray-icon">
-                    <i class="tainacan-icon tainacan-icon-sortdescending"/>
-                </span>
-            </button>
+            <label class="label">{{ $i18n.get('label_sort') }}</label>
+            <b-dropdown
+                    :mobile-modal="true"
+                    :disabled="localTerms.length <= 0 || isLoadingTerms || isEditingTerm"
+                    @input="onChangeOrder(order == 'asc' ? 'desc' : 'asc')"
+                    aria-role="list">
+                <button
+                            :aria-label="$i18n.get('label_sorting_direction')"
+                            class="button is-white"
+                            slot="trigger">
+                    <span class="icon is-small gray-icon">
+                        <i 
+                                :class="order == 'desc' ? 'tainacan-icon-sortdescending' : 'tainacan-icon-sortascending'"
+                                class="tainacan-icon"/>
+                    </span>
+                    <span class="icon">
+                        <i class="tainacan-icon tainacan-icon-20px tainacan-icon-arrowdown" />
+                    </span>
+                </button>
+                <b-dropdown-item
+                        aria-controls="items-list-results"
+                        role="button"
+                        :class="{ 'is-active': order == 'desc' }"
+                        :value="'desc'"
+                        aria-role="listitem"
+                        style="padding-bottom: 0.45rem">
+                    <span class="icon is-small gray-icon">
+                        <i class="tainacan-icon tainacan-icon-18px tainacan-icon-sortdescending"/>
+                    </span>
+                    {{ $i18n.get('label_descending') }}
+                </b-dropdown-item>
+                <b-dropdown-item
+                        aria-controls="items-list-results"
+                        role="button"
+                        :class="{ 'is-active': order == 'asc' }"
+                        :value="'asc'"
+                        aria-role="listitem"
+                        style="padding-bottom: 0.45rem">
+                    <span class="icon is-small gray-icon">
+                        <i class="tainacan-icon tainacan-icon-18px tainacan-icon-sortascending"/>
+                    </span>
+                    {{ $i18n.get('label_ascending') }}
+                </b-dropdown-item>
+            </b-dropdown>
         </b-field>
         <div class="search-area is-hidden-mobile">
             <div class="control has-icons-right  is-small is-clearfix">
@@ -468,19 +482,35 @@ export default {
         align-items: flex-start;
 
         .order-area {
-            display: inline-flex !important;
             padding: 4px;
+            margin-top: -4px;
             margin-left: auto;
 
-            .gray-icon, 
-            .gray-icon .icon {
-                color: $gray4 !important;
+            .label {
+                font-size: 0.875rem;
+                font-weight: normal;
+                margin-top: 3px;
+                margin-bottom: 2px;
+                cursor: default;
             }
-            .gray-icon 
-            .icon i::before, 
+
+            .button {
+                display: flex;
+                align-items: center;
+            }
+            
+            .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: 21px !important;
-                width: 26px;
+                font-size: 1.3125rem !important;
+                max-width: 26px;
             }
         }
 
diff --git a/src/admin/components/navigation/tainacan-title.vue b/src/admin/components/navigation/tainacan-title.vue
index 9ba7dab02..5cadd666b 100644
--- a/src/admin/components/navigation/tainacan-title.vue
+++ b/src/admin/components/navigation/tainacan-title.vue
@@ -68,7 +68,7 @@ export default {
     @import "../../scss/_variables.scss";
     
     .tainacan-page-title {
-        margin-bottom: 40px;
+        margin-bottom: 35px;
         display: flex;
         flex-wrap: wrap;
         align-items: flex-end;
diff --git a/src/admin/components/other/file-item.vue b/src/admin/components/other/file-item.vue
index 53824ebbc..f54bd3505 100644
--- a/src/admin/components/other/file-item.vue
+++ b/src/admin/components/other/file-item.vue
@@ -31,7 +31,7 @@
         <template v-if="modalOnClick">
             <b-modal
                     :active.sync="isPreviewModalActive"
-                    :width="640"
+                    :width="1024"
                     scroll="keep">
                 <div class="tainacan-modal-content">
                     <div class="tainacan-modal-title">
@@ -40,7 +40,10 @@
                     <div    
                             class="is-flex rendered-content"
                             v-html="file.description.rendered" />
-
+                    <iframe
+                            style="width: 100%; min-height: 50vh;"    
+                            v-if="file.guid != undefined && file.guid.rendered != undefined && file.mime_type != undefined && file.mime_type == 'application/pdf'"
+                            :src="file.guid.rendered" />
                     <div class="field is-grouped form-submit">
                         <div class="control">
                             <button
@@ -163,6 +166,8 @@ export default {
     }
     .rendered-content {
         justify-content: center !important;
+        flex-direction: column;
+        align-items: center;
     }
     
 </style>
diff --git a/src/admin/js/main.js b/src/admin/js/main.js
index 52421fd75..b37d9ad54 100644
--- a/src/admin/js/main.js
+++ b/src/admin/js/main.js
@@ -24,6 +24,8 @@ 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';
@@ -32,6 +34,8 @@ 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 FormNumeric from '../../classes/filter-types/numeric/FormNumeric.vue';
+
 import TainacanFormItem from '../../classes/metadata-types/tainacan-form-item.vue';
 import TainacanFiltersList from '../../classes/filter-types/tainacan-filter-item.vue';
 
@@ -43,7 +47,7 @@ import store from '../../js/store/store'
 import router from './router'
 import eventBusSearch from '../../js/event-bus-search';
 import termsListBus from './terms-list-bus.js';
-import { I18NPlugin, UserPrefsPlugin, RouterHelperPlugin, ConsolePlugin, UserCapabilitiesPlugin } from './utilities';
+import { I18NPlugin, UserPrefsPlugin, RouterHelperPlugin, ConsolePlugin, UserCapabilitiesPlugin, StatusHelperPlugin } from './utilities';
 
 // Configure and Register Plugins
 Vue.use(Buefy);
@@ -53,6 +57,7 @@ Vue.use(I18NPlugin);
 Vue.use(UserPrefsPlugin);
 Vue.use(RouterHelperPlugin);
 Vue.use(UserCapabilitiesPlugin);
+Vue.use(StatusHelperPlugin);
 Vue.use(ConsolePlugin, {visual: false});
 Vue.use(VueTheMask);
 
@@ -64,7 +69,7 @@ Vue.component('tainacan-numeric', Numeric);
 Vue.component('tainacan-date', Date);
 Vue.component('tainacan-relationship', Relationship);
 Vue.component('tainacan-taxonomy', Taxonomy);
-
+/* Metadata Option forms */
 Vue.component('tainacan-form-relationship', FormRelationship);
 Vue.component('tainacan-form-taxonomy', FormTaxonomy);
 Vue.component('tainacan-form-selectbox', FormSelectbox);
@@ -73,12 +78,16 @@ 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);
 Vue.component('tainacan-filter-autocomplete', FilterAutocomplete);
 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);
+/* Filter Metadata Option forms */
+Vue.component('tainacan-filter-form-numeric', FormNumeric);
 
 /* Others */
 Vue.component('help-button', HelpButton);
diff --git a/src/admin/js/mixins.js b/src/admin/js/mixins.js
index 9b71168d7..f5d6bb1e5 100644
--- a/src/admin/js/mixins.js
+++ b/src/admin/js/mixins.js
@@ -22,29 +22,31 @@ export const wpAjax = {
                     new_slug: newSlug,
                     nonce: tainacan_plugin.nonce,
                 }));
-        },
-        getDatei18n(dateString){
-            return this.axiosWPAjax.post('', qs.stringify({
-                action: 'tainacan-date-i18n',
-                date_string: dateString,
-                nonce: tainacan_plugin.nonce,
-            }));
-        },
+        }
     }
 };
 
 export const dateInter = {
-    methods: {
-        getDateLocaleMask() {
-            let locale = navigator.language;
+    created() {
+        let locale = navigator.language;
 
-            moment.locale(locale);
+        moment.locale(locale);
 
-            let localeData = moment.localeData();
-            let format = localeData.longDateFormat('L');
-
-            return format.replace(/[\w]/g, '#');
+        let localeData = moment.localeData();
+        this.dateFormat = localeData.longDateFormat('L');
+        this.dateMask = this.dateFormat.replace(/[\w]/g, '#');
+    },
+    data() {
+        return {
+            dateFormat: '',
+            dateMask: ''
         }
+    },
+    methods: {
+        parseDateToNavigatorLanguage(date) {
+            date = new Date(date.replace(/-/g, '/'));
+            return moment(date, moment.ISO_8601).format(this.dateFormat);  
+        },
     }
 };
 
diff --git a/src/admin/js/theme-main.js b/src/admin/js/theme-main.js
index f22399157..83dd0bcaf 100644
--- a/src/admin/js/theme-main.js
+++ b/src/admin/js/theme-main.js
@@ -5,19 +5,9 @@ import VTooltip from 'v-tooltip';
 import VueMasonry from 'vue-masonry-css';
 
 // Custom elements
-import Text from '../../classes/metadata-types/text/Text.vue';
-import Textarea from '../../classes/metadata-types/textarea/Textarea.vue';
-import Selectbox from '../../classes/metadata-types/selectbox/Selectbox.vue';
-import Numeric from '../../classes/metadata-types/numeric/Numeric.vue';
-import Date from '../../classes/metadata-types/date/Date.vue';
-import Relationship from '../../classes/metadata-types/relationship/Relationship.vue';
-import Taxonomy from '../../classes/metadata-types/taxonomy/Taxonomy.vue';
-
-import FormRelationship from '../../classes/metadata-types/relationship/FormRelationship.vue';
-import FormTaxonomy from '../../classes/metadata-types/taxonomy/FormTaxonomy.vue';
-import FormSelectbox from '../../classes/metadata-types/selectbox/FormSelectbox.vue';
-
 import 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';
@@ -26,7 +16,6 @@ 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 TaincanFormItem from '../../classes/metadata-types/tainacan-form-item.vue';
 import TaincanFiltersList from '../../classes/filter-types/tainacan-filter-item.vue';
 import ItemsPage from '../pages/lists/items-page.vue';
 import TermItemsPage from '../pages/lists/term-items-page.vue';
@@ -37,12 +26,10 @@ import ViewModeMasonry from '../../theme-helper/view-mode-masonry.vue';
 import ViewModeSlideshow from '../../theme-helper/view-mode-slideshow.vue';
 
 // Remaining imports
-import HelpButton from '../components/other/help-button.vue';
-import draggable from 'vuedraggable'
 import store from '../../js/store/store'
 import routerTheme from './theme-router.js'
 import eventBusSearch from '../../js/event-bus-search';
-import { I18NPlugin, UserPrefsPlugin, RouterHelperPlugin, ConsolePlugin } from './utilities';
+import { I18NPlugin, UserPrefsPlugin, RouterHelperPlugin, ConsolePlugin, StatusHelperPlugin } from './utilities';
 
 // Configure and Register Plugins
 Vue.use(Buefy);
@@ -51,25 +38,16 @@ Vue.use(VueMasonry);
 Vue.use(I18NPlugin);
 Vue.use(UserPrefsPlugin);
 Vue.use(RouterHelperPlugin);
+Vue.use(StatusHelperPlugin);
 Vue.use(ConsolePlugin, {visual: false});
 
-/* Metadata */
-Vue.component('tainacan-text', Text);
-Vue.component('tainacan-textarea', Textarea);
-Vue.component('tainacan-selectbox', Selectbox);
-Vue.component('tainacan-numeric', Numeric);
-Vue.component('tainacan-date', Date);
-Vue.component('tainacan-relationship', Relationship);
-Vue.component('tainacan-taxonomy', Taxonomy);
 
-Vue.component('tainacan-form-relationship', FormRelationship);
-Vue.component('tainacan-form-taxonomy', FormTaxonomy);
-Vue.component('tainacan-form-selectbox', FormSelectbox);
-Vue.component('tainacan-form-item', TaincanFormItem);
 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);
 Vue.component('tainacan-filter-autocomplete', FilterAutocomplete);
 Vue.component('tainacan-filter-checkbox', FilterCheckbox);
@@ -78,8 +56,6 @@ Vue.component('tainacan-filter-taxonomy-checkbox', FilterTaxonomyCheckbox);
 Vue.component('tainacan-filter-taxonomy-taginput', FilterTaxonomyTaginput);
 
 /* Others */
-Vue.component('help-button', HelpButton);
-Vue.component('draggable', draggable);
 Vue.component('items-page', ItemsPage);
 Vue.component('term-items-page', TermItemsPage);
 
diff --git a/src/admin/js/utilities.js b/src/admin/js/utilities.js
index d82f2525c..c5f887159 100644
--- a/src/admin/js/utilities.js
+++ b/src/admin/js/utilities.js
@@ -101,14 +101,18 @@ I18NPlugin.install = function (Vue, options = {}) {
         getWithVariables(key, variables) { // TRY WITH regex: \%((\d)\$)*s 
             let rawString = tainacan_plugin.i18n[key];
             if (rawString != undefined && rawString != null && rawString != '' ) {
-                let splits = rawString.match(/\%((\d)\$)*s/gm); // An array with all the %s, %1$s, %2$s, etc
-                let parsedString = '';
-                
-                for (let i = 0; i < splits.length; i++) {
-                    parsedString += rawString.split(splits[i]).join(variables[i]);
-                }
-                return parsedString;
+                // let splits = rawString.match(/\%((\d)\$)*s*/gm); // An array with all the %s, %1$s, %2$s, etc
+                // let parsedString = '';
+                // for (let i = 0; i < splits.length; i++) {
+                //     parsedString += rawString.split(splits[i]).join(variables[i]);
+                // }
+                // return parsedString;
 
+                const regex = /\%(\d\$)*s/m;
+                for (let variable of variables)
+                    rawString = rawString.replace(regex, variable);
+                
+                return rawString;
             } else {
                 "Invalid i18n key: " + tainacan_plugin.i18n[key];
             }
@@ -150,7 +154,8 @@ UserPrefsPlugin.install = function (Vue, options = {}) {
                     .then( updatedRes => {
                         let prefs = JSON.parse(updatedRes.data.meta['tainacan_prefs']);
                         this.tainacanPrefs = prefs;
-                    });
+                    })
+                    .catch( () => console.log("Request to /users/me failed. Maybe you're not logged in.") );
             } else {
                 let prefs = JSON.parse(tainacan_plugin.user_prefs);
                 this.tainacanPrefs = prefs;
@@ -175,9 +180,7 @@ UserPrefsPlugin.install = function (Vue, options = {}) {
                             this.tainacanPrefs[key] = value;
                         }
                     })
-                    .catch(error => {
-                        reject( error );
-                    });
+                    .catch( () => console.log("Request to /users/me failed. Maybe you're not logged in.") );
             }); 
         },
         clean() {
@@ -338,4 +341,61 @@ UserCapabilitiesPlugin.install = function (Vue, options = {}) {
             return false;
         }
     }
+};
+
+
+// STATUS ICONS PLUGIN - Sets icon for status option
+export const StatusHelperPlugin = {};
+StatusHelperPlugin.install = function (Vue, options = {}) {
+    
+    Vue.prototype.$statusHelper = {
+        statuses: [
+            { name: tainacan_plugin.i18n['status_publish'], slug: 'publish' },
+            // { name: tainacan_plugin.i18n['status_private'], slug: 'private' },
+            // { name: tainacan_plugin.i18n['status_draft'], slug: 'draft' },
+            // { name: tainacan_plugin.i18n['status_trash'], slug: 'trash' }
+        ],
+        getIcon(status) {
+            switch (status) {
+                case 'publish': return 'tainacan-icon-public';
+                case 'private': return 'tainacan-icon-private';
+                case 'draft': return 'tainacan-icon-draft';
+                case 'trash': return 'tainacan-icon-delete';
+                default: '';
+            }
+        },
+        hasIcon(status) {
+            return ['publish', 'private', 'draft', 'trash'].includes(status);
+        },
+        getStatuses() {
+            return  this.statuses;
+        },
+        loadStatuses() {
+            wpApi.get('/statuses/')
+                    .then( res => {
+                        let loadedStatus = res.data;
+                        this.statuses = [];
+
+                        if (loadedStatus['publish'] != undefined)
+                            this.statuses.push(loadedStatus['publish']);
+                        
+                        if (loadedStatus['private'] != undefined)
+                            this.statuses.push(loadedStatus['private']);
+                        
+                        this.statuses.concat(Object.values(loadedStatus).filter((status) => {
+                            return !['publish','private','draft','trash'].includes(status.slug); 
+                        }));
+
+                        if (loadedStatus['draft'] != undefined)
+                            this.statuses.push(loadedStatus['draft']);
+                        
+                        if (loadedStatus['trash'] != undefined)
+                            this.statuses.push(loadedStatus['trash']);
+                    })
+                    .catch(error => {
+                        console.error( error );
+                    });
+        }
+    }
+
 };
\ No newline at end of file
diff --git a/src/admin/pages/home-page.vue b/src/admin/pages/home-page.vue
index f83f2ca43..3659cffd1 100644
--- a/src/admin/pages/home-page.vue
+++ b/src/admin/pages/home-page.vue
@@ -41,7 +41,7 @@
                             <span class="icon is-medium">
                                 <i class="tainacan-icon tainacan-icon-36px tainacan-icon-items"/>
                             </span>
-                            <span class="menu-text">{{ $i18n.get('label_all_items') }}</span>
+                            <span class="menu-text">{{ $i18n.get('label_all_published_items') }}</span>
                         </router-link>
                     </li> -->
                     <li>
@@ -109,6 +109,9 @@
         </section>
 
         <section class="home-section home-section-collection">
+            <div 
+                    class="collection-section-connector" 
+                    aria-hidden/>
             <div class="home-section-header collections-section-header">
                 <div class="home-section-icon">
                     <router-link
@@ -118,19 +121,30 @@
                         <i class="tainacan-icon tainacan-icon-collections"/>
                     </router-link>
                 </div>
-                <h1>{{ $i18n.get('collections') }}</h1>
-                <router-link
-                        tag="a"
-                        to="/collections">
-                    <span class="icon">
-                        <i class="tainacan-icon tainacan-icon-20px tainacan-icon-viewtable"/>
-                    </span>
-                    <span class="menu-text">{{ $i18n.get('label_view_all_collections') }}</span>
-                </router-link>
+                <h1>{{ $i18n.get('label_recent_collections') }}</h1>
             </div>
             <collections-home-list
                     :is-loading="isLoadingCollections"
-                    :collections="collections"/> 
+                    :collections="collections"
+                    :collections-total="collectionsTotal"/> 
+            <router-link
+                    class="collections-see-more"
+                    tag="a"
+                    to="/collections">
+                <span class="icon">
+                    <i class="tainacan-icon tainacan-icon-20px tainacan-icon-viewtable"/>
+                </span>
+                <span
+                        v-if="collectionsTotal != undefined && collectionsTotal > 1"
+                        class="menu-text">
+                    {{ $i18n.getWithVariables('label_view_all_%s_collections', [collectionsTotal]) }}
+                </span>
+                <span
+                        v-if="collectionsTotal != undefined && collectionsTotal == 1"
+                        class="menu-text">
+                    {{ $i18n.get('label_view_collections_list') }}
+                </span>
+            </router-link>
         </section>
 
     </div>   
@@ -169,12 +183,13 @@ export default {
             this.cleanCollections();    
             this.isLoadingCollections = true;
             this.fetchCollections({ page: 1, collectionsPerPage: 9, status: undefined, contextEdit: true })
-            .then(() => {
-                this.isLoadingCollections = false;
-            }) 
-            .catch(() => {
-                this.isLoadingCollections = false;
-            });
+                .then((res) => {
+                    this.collectionsTotal = res.total;
+                    this.isLoadingCollections = false;
+                }) 
+                .catch(() => {
+                    this.isLoadingCollections = false;
+                });
         }
     },
     mounted(){
@@ -203,6 +218,7 @@ export default {
                 }
             }
             &.home-section-collection {
+                position: relative;
                 margin-left: 52px;
             }
 
@@ -215,6 +231,15 @@ export default {
                 top: 43px;
                 left: 26px;
             }
+            .collection-section-connector {
+                border-left: 1px solid $gray2;
+                border-bottom: 1px solid $gray2;
+                position: absolute;
+                width: calc(100% + 26px);
+                height: 100%;
+                top: 0px;
+                left: -26px;
+            }
 
             .home-section-header {
                 width: 100%;
@@ -282,6 +307,34 @@ export default {
                     }
                 }
             }
+            a.collections-see-more {
+                padding: 10px 16px;
+                display: inline-flex;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                background: $gray1;
+                color: $turquoise5;
+                float: right;
+                width: calc(100% - 20px);
+
+                @media screen and (min-width: 768px) {
+                    width: calc(50% - 20px);
+                }
+                @media screen and (min-width: 1215px) {
+                    width: calc(33.3333% - 20px);
+                }
+                @media screen and (min-width: 1408px) {
+                    width: calc(25% - 20px);
+                }
+                @media screen and (min-width: 1920px) {
+                    width: calc(20% - 20px);
+                }
+
+                .menu-text { margin-left: 0.5rem;}
+                &:hover {
+                    background-color: $gray2;
+                }
+            }
         }
 
         .repository-menu-list {
diff --git a/src/admin/pages/lists/collections-page.vue b/src/admin/pages/lists/collections-page.vue
index e069382cb..8ce6c689c 100644
--- a/src/admin/pages/lists/collections-page.vue
+++ b/src/admin/pages/lists/collections-page.vue
@@ -57,6 +57,55 @@
 
             <!-- Sorting options ----  -->
             <b-field class="header-item">
+                <label class="label">{{ $i18n.get('label_sort') }}</label>
+                <b-dropdown
+                        :mobile-modal="true"
+                        :disabled="collections.length <= 0 || isLoading"
+                        @input="onChangeOrder(order == 'asc' ? 'desc' : 'asc')"
+                        aria-role="list">
+                    <button
+                            :aria-label="$i18n.get('label_sorting_direction')"
+                            class="button is-white"
+                            slot="trigger">
+                        <span class="icon is-small gray-icon">
+                            <i 
+                                    :class="order == 'desc' ? 'tainacan-icon-sortdescending' : 'tainacan-icon-sortascending'"
+                                    class="tainacan-icon tainacan-icon-18px"/>
+                        </span>
+                        <span class="icon">
+                            <i class="tainacan-icon tainacan-icon-20px tainacan-icon-arrowdown" />
+                        </span>
+                    </button>
+                    <b-dropdown-item
+                            aria-controls="items-list-results"
+                            role="button"
+                            :class="{ 'is-active': order == 'desc' }"
+                            :value="'desc'"
+                            aria-role="listitem"
+                            style="padding-bottom: 0.45rem">
+                        <span class="icon is-small gray-icon">
+                            <i class="tainacan-icon tainacan-icon-18px tainacan-icon-sortdescending"/>
+                        </span>
+                        {{ $i18n.get('label_descending') }}
+                    </b-dropdown-item>
+                    <b-dropdown-item
+                            aria-controls="items-list-results"
+                            role="button"
+                            :class="{ 'is-active': order == 'asc' }"
+                            :value="'asc'"
+                            aria-role="listitem"
+                            style="padding-bottom: 0.45rem">
+                        <span class="icon is-small gray-icon">
+                            <i class="tainacan-icon tainacan-icon-18px tainacan-icon-sortascending"/>
+                        </span>
+                        {{ $i18n.get('label_ascending') }}
+                    </b-dropdown-item>
+                </b-dropdown>
+                <span
+                        class="label"
+                        style="padding-left: 0.65rem;">
+                    {{ $i18n.get('info_by_inner') }}
+                </span>
                 <b-select
                         class="sorting-select"
                         :disabled="collections.length <= 0"
@@ -70,38 +119,6 @@
                         {{ option.label }}
                     </option>
                 </b-select>
-                <button
-                        :disabled="collections.length <= 0 || isLoading || order == 'desc'"
-                        class="button is-white is-small"
-                        @click="onChangeOrder('desc')"
-                        :aria-label="$i18n.get('label_sort_descending')">
-                    <span
-                            v-tooltip="{
-                                content: $i18n.get('label_sort_descending'),
-                                autoHide: true,
-                                placement: 'bottom',
-                                classes: ['tooltip', 'repository-tooltip']
-                            }"
-                            class="icon gray-icon is-small">
-                        <i class="tainacan-icon tainacan-icon-sortdescending tainacan-icon-20px"/>
-                    </span>
-                </button>
-                <button
-                        :disabled="collections.length <= 0 || isLoading || order == 'asc'"
-                        class="button is-white is-small"
-                        @click="onChangeOrder('asc')"
-                        :aria-label="$i18n.get('label_sort_ascending')">
-                    <span 
-                            v-tooltip="{
-                                content: $i18n.get('label_sort_ascending'),
-                                autoHide: true,
-                                placement: 'bottom',
-                                classes: ['tooltip', 'repository-tooltip']
-                            }"
-                            class="icon gray-icon is-small">
-                        <i class="tainacan-icon tainacan-icon-sortascending tainacan-icon-20px"/>
-                    </span>
-                </button>
             </b-field>
         </div>
 
@@ -110,21 +127,44 @@
                 <ul>
                     <li 
                             @click="onChangeTab('')"
-                            :class="{ 'is-active': status == undefined || status == ''}">
-                        <a>{{ `${$i18n.get('label_all_collections')}` }}<span class="has-text-gray">&nbsp;{{ `${` ${repositoryTotalCollections ? `(${Number(repositoryTotalCollections.private) + Number(repositoryTotalCollections.publish)})` : '' }`}` }}</span></a>
+                            :class="{ 'is-active': status == undefined || status == ''}"
+                            v-tooltip="{
+                                content: $i18n.get('info_collections_tab_all'),
+                                autoHide: true,
+                                placement: 'auto',
+                            }">
+                        <a :style="{ fontWeight: 'bold', color: '#454647 !important', lineHeight: '1.5rem' }">
+                            {{ `${$i18n.get('label_all_collections')}` }}
+                            <span class="has-text-gray">&nbsp;{{ `${` ${repositoryTotalCollections ? `(${Number(repositoryTotalCollections.private) + Number(repositoryTotalCollections.publish)})` : '' }`}` }}</span>
+                        </a>
                     </li>
                     <li 
-                            @click="onChangeTab('draft')"
-                            :class="{ 'is-active': status == 'draft'}">
-                        <a>{{ `${$i18n.get('label_draft_items')}` }}<span class="has-text-gray">&nbsp;{{ `${` ${repositoryTotalCollections ? `(${repositoryTotalCollections.draft})` : '' }`}` }}</span></a>
-                    </li>
-                    <li 
-                            @click="onChangeTab('trash')"
-                            :class="{ 'is-active': status == 'trash'}">
-                        <a>{{ `${$i18n.get('label_trash_items')}` }}<span class="has-text-gray">&nbsp;{{ `${` ${repositoryTotalCollections ? `(${repositoryTotalCollections.trash})` : '' }`}` }}</span></a>
+                            v-for="(statusOption, index) of $statusHelper.getStatuses()"
+                            :key="index"
+                            @click="onChangeTab(statusOption.slug)"
+                            :class="{ 'is-active': status == statusOption.slug}"
+                            :style="{ marginRight: statusOption.slug == 'private' ? 'auto' : '' }"
+                            v-tooltip="{
+                                content: $i18n.getWithVariables('info_%s_tab_' + statusOption.slug,[$i18n.get('collections')]),
+                                autoHide: true,
+                                placement: 'auto',
+                            }">
+                        <a>
+                            <span 
+                                    v-if="$statusHelper.hasIcon(statusOption.slug)"
+                                    class="icon has-text-gray">
+                                <i 
+                                        class="tainacan-icon tainacan-icon-18px"
+                                        :class="$statusHelper.getIcon(statusOption.slug)"
+                                        />
+                            </span>
+                            {{ statusOption.name }}
+                            <span class="has-text-gray">&nbsp;{{ `${` ${repositoryTotalCollections ? `(${repositoryTotalCollections[statusOption.slug]})` : '' }`}` }}</span>
+                        </a>
                     </li>
                 </ul>
             </div>
+
             <div>
                 <collections-list
                         :is-loading="isLoading"
@@ -144,8 +184,12 @@
                                 </span>
                             </p>
                             <p v-if="status == undefined || status == ''">{{ $i18n.get('info_no_collection_created') }}</p>
-                            <p v-if="status == 'draft'">{{ $i18n.get('info_no_collection_draft') }}</p>
-                            <p v-if="status == 'trash'">{{ $i18n.get('info_no_collection_trash') }}</p>
+                            <p
+                                    v-for="(statusOption, index) of $statusHelper.getStatuses()"
+                                    :key="index"
+                                    v-if="status == statusOption.slug">
+                                {{ $i18n.get('info_no_collections_' + statusOption.slug) }}
+                            </p>
 
                             <div v-if="$userCaps.hasCapability('edit_tainacan-collections') && status == undefined || status == ''">
                                 <b-dropdown 
@@ -435,12 +479,38 @@ export default {
         align-items: center;
         width: 100%;
 
-        .header-item:not(:last-child) {
-            padding-right: 0.5em;
-        }
+        .header-item {
 
-        .header-item .button .icon i{
-            width: 100%;
+            &: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;
+            }
+            
+            .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;
+            }
         }
 
         @media screen and (max-width: 769px) {
diff --git a/src/admin/pages/lists/items-page.vue b/src/admin/pages/lists/items-page.vue
index 59ca3d5a2..8268da3e5 100644
--- a/src/admin/pages/lists/items-page.vue
+++ b/src/admin/pages/lists/items-page.vue
@@ -156,11 +156,18 @@
 
             <!-- SEARCH CONTROL ------------------------- -->
             <div
-                    :aria-label="$i18n.get('label_sort_visualization')"
+                    aria-labelledby="search-control-landmark"
                     role="region"
                     ref="search-control"
                     v-if="!openAdvancedSearch && !(registeredViewModes[viewMode] != undefined && registeredViewModes[viewMode].full_screen)"
                     class="search-control">
+
+                <h3 
+                        id="search-control-landmark"
+                        class="sr-only">
+                    {{ $i18n.get('label_sort_visualization') }}
+                </h3>
+
                 <!-- <b-loading
                         :is-full-page="false"
                         :active.sync="isLoadingMetadata"/> -->
@@ -283,7 +290,54 @@
                 <!-- Change OrderBy Select and Order Button-->
                 <div class="search-control-item">
                     <b-field>
-                        <label class="label is-hidden-mobile">{{ $i18n.get('label_sorting') + ':' }}</label>
+                        <label class="label">{{ $i18n.get('label_sort') }}</label>
+                        <b-dropdown
+                                :mobile-modal="true"
+                                @input="onChangeOrder()"
+                                aria-role="list">
+                            <button
+                                    :aria-label="$i18n.get('label_sorting_direction')"
+                                    class="button is-white"
+                                    slot="trigger">
+                                <span class="icon is-small gray-icon">
+                                    <i 
+                                            :class="order == 'DESC' ? 'tainacan-icon-sortdescending' : 'tainacan-icon-sortascending'"
+                                            class="tainacan-icon"/>
+                                </span>
+                                <span class="icon">
+                                    <i class="tainacan-icon tainacan-icon-20px tainacan-icon-arrowdown" />
+                                </span>
+                            </button>
+                            <b-dropdown-item
+                                    aria-controls="items-list-results"
+                                    role="button"
+                                    :class="{ 'is-active': order == 'DESC' }"
+                                    :value="'DESC'"
+                                    aria-role="listitem"
+                                    style="padding-bottom: 0.45rem">
+                                <span class="icon is-small gray-icon">
+                                    <i class="tainacan-icon tainacan-icon-18px tainacan-icon-sortdescending"/>
+                                </span>
+                                {{ $i18n.get('label_descending') }}
+                            </b-dropdown-item>
+                            <b-dropdown-item
+                                    aria-controls="items-list-results"
+                                    role="button"
+                                    :class="{ 'is-active': order == 'ASC' }"
+                                    :value="'ASC'"
+                                    aria-role="listitem"
+                                    style="padding-bottom: 0.45rem">
+                                <span class="icon is-small gray-icon">
+                                    <i class="tainacan-icon tainacan-icon-18px tainacan-icon-sortascending"/>
+                                </span>
+                                {{ $i18n.get('label_ascending') }}
+                            </b-dropdown-item>
+                        </b-dropdown>
+                        <span
+                                class="label"
+                                style="padding-left: 0.65rem;">
+                            {{ $i18n.get('info_by_inner') }}
+                        </span>
                         <b-dropdown
                                 :mobile-modal="true"
                                 @input="onChangeOrderBy($event)"
@@ -308,60 +362,7 @@
                                     aria-role="listitem">
                                 {{ metadatum.name }}
                             </b-dropdown-item>
-                            <!-- Once we have sorting by metadata we can use this -->
-                            <!-- <b-dropdown-item
-                                    :class="{ 'is-active': orderBy == metadatum.slug }"
-                                    v-for="metadatum of sortingMetadata"
-                                    v-if="
-                                        metadatum.slug === 'creation_date' ||
-                                        metadatum.slug === 'author_name' || (
-                                            metadatum.id !== undefined &&
-                                            metadatum.metadata_type_object && 
-                                            metadatum.metadata_type_object.related_mapped_prop !== 'description' &&
-                                            metadatum.metadata_type_object.primitive_type !== 'term' &&
-                                            metadatum.metadata_type_object.primitive_type !== 'item' &&
-                                            metadatum.metadata_type_object.primitive_type !== 'compound'
-                                    )"
-                                    :value="metadatum"
-                                    :key="metadatum.slug">
-                                {{ metadatum.name }}
-                            </b-dropdown-item> -->
                         </b-dropdown>
-                        <!-- Order ASC vs DESC buttons -->
-                        <button
-                                aria-controls="items-list-results"
-                                class="button is-white is-small"
-                                :aria-label="$i18n.get('label_sort_descending')"
-                                :disabled="totalItems <= 0 || order == 'DESC'"
-                                @click="onChangeOrder()">
-                            <span
-                                    v-tooltip="{
-                                        content: $i18n.get('label_sort_descending'),
-                                        autoHide: true,
-                                        placement: 'bottom',
-                                        classes: ['tooltip', isRepositoryLevel ? 'repository-tooltip' : '']
-                                    }"
-                                    class="icon is-small gray-icon">
-                                <i class="tainacan-icon tainacan-icon-sortdescending"/>
-                            </span>
-                        </button>
-                        <button
-                                aria-controls="items-list-results"
-                                :disabled="totalItems <= 0 || order == 'ASC'"
-                                :aria-label="$i18n.get('label_sort_ascending')"
-                                class="button is-white is-small"
-                                @click="onChangeOrder()">
-                            <span
-                                    v-tooltip="{
-                                        content: $i18n.get('label_sort_ascending'),
-                                        autoHide: true,
-                                        placement: 'bottom',
-                                        classes: ['tooltip', isRepositoryLevel ? 'repository-tooltip' : '']
-                                    }"
-                                    class="icon is-small gray-icon">
-                                <i class="tainacan-icon tainacan-icon-sortascending"/>
-                            </span>
-                        </button>
                     </b-field>
                 </div>
 
@@ -615,22 +616,44 @@
             <div 
                     v-if="!isOnTheme && !openAdvancedSearch"
                     class="tabs">
-                <ul>
+                <ul>               
                     <li 
                             @click="onChangeTab('')"
-                            :class="{ 'is-active': status == undefined || status == ''}">
-                        <a>{{ `${$i18n.get('label_all_items')}` }}<span class="has-text-gray">&nbsp;{{ collection && collection.total_items ? ` (${Number(collection.total_items.private) + Number(collection.total_items.publish)})` : (isRepositoryLevel && repositoryTotalItems) ? ` (${ repositoryTotalItems.private + repositoryTotalItems.publish })` : '' }}</span></a>
+                            :class="{ 'is-active': status == undefined || status == ''}"
+                            v-tooltip="{
+                                content: $i18n.get('info_items_tab_all'),
+                                autoHide: true,
+                                placement: 'auto',
+                            }">
+                        <a :style="{ fontWeight: 'bold', color: '#454647 !important', lineHeight: '1.5rem' }">
+                            {{ $i18n.get('label_all_published_items') }}
+                            <span class="has-text-gray">&nbsp;{{ collection && collection.total_items ? ` (${Number(collection.total_items.private) + Number(collection.total_items.publish)})` : (isRepositoryLevel && repositoryTotalItems) ? ` (${ repositoryTotalItems.private + repositoryTotalItems.publish })` : '' }}</span>
+                        </a>
                     </li>
                     <li 
-                            @click="onChangeTab('draft')"
-                            :class="{ 'is-active': status == 'draft'}">
-                        <a>{{ `${$i18n.get('label_draft_items')}` }}<span class="has-text-gray">&nbsp;{{ collection && collection.total_items ? ` (${collection.total_items.draft})` : (isRepositoryLevel && repositoryTotalItems) ? ` (${ repositoryTotalItems.draft })` : '' }}</span></a>
-                    </li>
-                    <li
-                            v-if="!isRepositoryLevel"
-                            @click="onChangeTab('trash')"
-                            :class="{ 'is-active': status == 'trash'}">
-                        <a>{{ `${$i18n.get('label_trash_items')}` }}<span class="has-text-gray">&nbsp;{{ collection && collection.total_items ? ` (${collection.total_items.trash})` : (isRepositoryLevel && repositoryTotalItems) ? ` (${ repositoryTotalItems.trash })` : '' }}</span></a>
+                            v-for="(statusOption, index) of $statusHelper.getStatuses()"
+                            v-if="(isRepositoryLevel || statusOption.slug != 'private') || (statusOption.slug == 'private' && $userCaps.hasCapability('read_private_tnc_col_' + collectionId + '_items'))"
+                            :key="index"
+                            @click="onChangeTab(statusOption.slug)"
+                            :class="{ 'is-active': status == statusOption.slug}"
+                            :style="{ marginRight: statusOption.slug == 'private' ? 'auto' : '' }"
+                            v-tooltip="{
+                                content: $i18n.getWithVariables('info_%s_tab_' + statusOption.slug,[$i18n.get('items')]),
+                                autoHide: true,
+                                placement: 'auto',
+                            }">
+                        <a>
+                            <span 
+                                    v-if="$statusHelper.hasIcon(statusOption.slug)"
+                                    class="icon has-text-gray">
+                                <i 
+                                        class="tainacan-icon tainacan-icon-18px"
+                                        :class="$statusHelper.getIcon(statusOption.slug)"
+                                        />
+                            </span>
+                            {{ statusOption.name }}
+                            <span class="has-text-gray">&nbsp;{{ collection && collection.total_items ? ` (${collection.total_items[statusOption.slug]})` : (isRepositoryLevel && repositoryTotalItems) ? ` (${ repositoryTotalItems[statusOption.slug] })` : '' }}</span>
+                        </a>
                     </li>
                 </ul>
             </div>
@@ -701,7 +724,7 @@
                               registeredViewModes[viewMode] != undefined &&
                               registeredViewModes[viewMode].type == 'template'"
                         v-html="itemsListTemplate"/>
-
+                        
                 <component
                         v-if="isOnTheme && 
                               registeredViewModes[viewMode] != undefined &&
@@ -712,7 +735,7 @@
                         :items="items"
                         :is-filters-menu-compressed="isFiltersMenuCompressed || openAdvancedSearch "
                         :total-items="totalItems"
-                        :is-loading="isLoadingItems"
+                        :is-loading="showLoading"
                         :is="registeredViewModes[viewMode] != undefined ? registeredViewModes[viewMode].component : ''"/>
 
                 <!-- Empty Placeholder (only used in Admin) -->
@@ -726,8 +749,12 @@
                             </span>
                         </p>
                         <p v-if="status == undefined || status == ''">{{ hasFiltered ? $i18n.get('info_no_item_found_filter') : $i18n.get('info_no_item_created') }}</p>
-                        <p v-if="status == 'draft'">{{ $i18n.get('info_no_item_draft') }}</p>
-                        <p v-if="status == 'trash'">{{ $i18n.get('info_no_item_trash') }}</p>
+                        <p
+                                v-for="(statusOption, index) of $statusHelper.getStatuses()"
+                                :key="index"
+                                v-if="status == statusOption.slug">
+                            {{ $i18n.get('info_no_items_' + statusOption.slug) }}
+                        </p>
 
                         <router-link
                                 v-if="!hasFiltered && (status == undefined || status == '') && !$route.query.iframemode"
@@ -963,9 +990,11 @@
                 this.localDisplayedMetadata = JSON.parse(JSON.stringify(this.displayedMetadata));
             },
             openAdvancedSearch(newValue){
-                if(newValue == false){
+                if (newValue == false){
                     this.$eventBusSearch.$emit('closeAdvancedSearch');
                     this.advancedSearchResults = false;
+                } else {
+                    this.$eventBusSearch.clearAllFilters();
                 }
             }
         },
@@ -1756,7 +1785,6 @@
         display: flex;
         justify-content: space-between;
         flex-wrap: wrap;
-
     }
 
     .search-control-item {
@@ -1874,6 +1902,14 @@
         margin-bottom: 20px;
         padding-left: $page-side-padding;
         padding-right: $page-side-padding;
+
+        @media screen and (min-width: 1024px) {
+            overflow: visible;
+        }
+
+        li {
+            cursor: pointer;
+        }
     }
 
     .items-list-area {
diff --git a/src/admin/pages/lists/taxonomies-page.vue b/src/admin/pages/lists/taxonomies-page.vue
index 0154b6997..905d3ead7 100644
--- a/src/admin/pages/lists/taxonomies-page.vue
+++ b/src/admin/pages/lists/taxonomies-page.vue
@@ -20,7 +20,55 @@
 
                 <!-- Sorting options ----  -->
                 <b-field class="header-item">
-                    <label class="label">{{ $i18n.get('label_sorting') + ':' }}</label>
+                    <label class="label">{{ $i18n.get('label_sort') }}</label>
+                    <b-dropdown
+                            :mobile-modal="true"
+                            :disabled="taxonomies.length <= 0 || isLoading"
+                            @input="onChangeOrder(order == 'asc' ? 'desc' : 'asc')"
+                            aria-role="list">
+                        <button
+                                :aria-label="$i18n.get('label_sorting_direction')"
+                                class="button is-white"
+                                slot="trigger">
+                            <span class="icon is-small gray-icon">
+                                <i 
+                                        :class="order == 'desc' ? 'tainacan-icon-sortdescending' : 'tainacan-icon-sortascending'"
+                                        class="tainacan-icon tainacan-icon-18px"/>
+                            </span>
+                            <span class="icon">
+                                <i class="tainacan-icon tainacan-icon-20px tainacan-icon-arrowdown" />
+                            </span>
+                        </button>
+                        <b-dropdown-item
+                                aria-controls="items-list-results"
+                                role="button"
+                                :class="{ 'is-active': order == 'desc' }"
+                                :value="'desc'"
+                                aria-role="listitem"
+                                style="padding-bottom: 0.45rem">
+                            <span class="icon is-small gray-icon">
+                                <i class="tainacan-icon tainacan-icon-18px tainacan-icon-sortdescending"/>
+                            </span>
+                            {{ $i18n.get('label_descending') }}
+                        </b-dropdown-item>
+                        <b-dropdown-item
+                                aria-controls="items-list-results"
+                                role="button"
+                                :class="{ 'is-active': order == 'asc' }"
+                                :value="'asc'"
+                                aria-role="listitem"
+                                style="padding-bottom: 0.45rem">
+                            <span class="icon is-small gray-icon">
+                                <i class="tainacan-icon tainacan-icon-18px tainacan-icon-sortascending"/>
+                            </span>
+                            {{ $i18n.get('label_ascending') }}
+                        </b-dropdown-item>
+                    </b-dropdown>
+                    <span
+                            class="label"
+                            style="padding-left: 0.65rem;">
+                        {{ $i18n.get('info_by_inner') }}
+                    </span>
                     <b-select
                             class="sorting-select"
                             :disabled="taxonomies.length <= 0"
@@ -34,36 +82,6 @@
                             {{ option.label }}
                         </option>
                     </b-select>
-                    <button
-                            :disabled="taxonomies.length <= 0 || isLoading || order == 'desc'"
-                            class="button is-white is-small"
-                            @click="onChangeOrder('desc')">
-                        <span
-                                v-tooltip="{
-                                    content: $i18n.get('label_sort_descending'),
-                                    autoHide: true,
-                                    placement: 'bottom',
-                                    classes: ['tooltip', 'repository-tooltip']
-                                }"
-                                class="icon gray-icon is-small">
-                            <i class="tainacan-icon tainacan-icon-sortdescending tainacan-icon-20px"/>
-                        </span>
-                    </button>
-                    <button
-                            :disabled="taxonomies.length <= 0 || isLoading || order == 'asc'"
-                            class="button is-white is-small"
-                            @click="onChangeOrder('asc')">
-                        <span
-                                v-tooltip="{
-                                    content: $i18n.get('label_sort_ascending'),
-                                    autoHide: true,
-                                    placement: 'bottom',
-                                    classes: ['tooltip', 'repository-tooltip']
-                                }"
-                                class="icon gray-icon is-small">
-                            <i class="tainacan-icon tainacan-icon-sortascending tainacan-icon-20px"/>
-                        </span>
-                    </button>
                 </b-field>
             </div>
 
@@ -76,18 +94,40 @@
                     <ul>
                         <li 
                                 @click="onChangeTab('')"
-                                :class="{ 'is-active': status == undefined || status == ''}">
-                            <a>{{ `${$i18n.get('label_all_taxonomies')}` }}<span class="has-text-gray">&nbsp;{{ `${` ${repositoryTotalTaxonomies ? `(${Number(repositoryTotalTaxonomies.private) + Number(repositoryTotalTaxonomies.publish)})` : '' }`}` }}</span></a>
+                                :class="{ 'is-active': status == undefined || status == ''}"
+                                v-tooltip="{
+                                    content: $i18n.get('info_taxonomies_tab_all'),
+                                    autoHide: true,
+                                    placement: 'auto',
+                                }">
+                            <a :style="{ fontWeight: 'bold', color: '#454647 !important', lineHeight: '1.5rem' }">
+                                {{ `${$i18n.get('label_all_taxonomies')}` }}
+                                <span class="has-text-gray">&nbsp;{{ repositoryTotalTaxonomies ? `(${Number(repositoryTotalTaxonomies.private) + Number(repositoryTotalTaxonomies.publish)})` : '' }}</span>
+                            </a>
                         </li>
                         <li 
-                                @click="onChangeTab('draft')"
-                                :class="{ 'is-active': status == 'draft'}">
-                            <a>{{ `${$i18n.get('label_draft_items')}` }}<span class="has-text-gray">&nbsp;{{ `${` ${repositoryTotalTaxonomies ? `(${repositoryTotalTaxonomies.draft})` : '' }`}` }}</span></a>
-                        </li>
-                        <li 
-                                @click="onChangeTab('trash')"
-                                :class="{ 'is-active': status == 'trash'}">
-                            <a>{{ `${$i18n.get('label_trash_items')}` }}<span class="has-text-gray">&nbsp;{{ `${` ${repositoryTotalTaxonomies ? `(${repositoryTotalTaxonomies.trash})` : '' }`}` }}</span></a>
+                                v-for="(statusOption, index) of $statusHelper.getStatuses()"
+                                :key="index"
+                                @click="onChangeTab(statusOption.slug)"
+                                :class="{ 'is-active': status == statusOption.slug}"
+                                :style="{ marginRight: statusOption.slug == 'private' ? 'auto' : '' }"
+                                v-tooltip="{
+                                    content: $i18n.getWithVariables('info_%s_tab_' + statusOption.slug,[$i18n.get('taxonomies')]),
+                                    autoHide: true,
+                                    placement: 'auto',
+                                }">
+                            <a>
+                                <span 
+                                        v-if="$statusHelper.hasIcon(statusOption.slug)"
+                                        class="icon has-text-gray">
+                                    <i 
+                                            class="tainacan-icon tainacan-icon-18px"
+                                            :class="$statusHelper.getIcon(statusOption.slug)"
+                                            />
+                                </span>
+                                {{ statusOption.name }}
+                                <span class="has-text-gray">&nbsp;{{ repositoryTotalTaxonomies ? `(${repositoryTotalTaxonomies[statusOption.slug]})` : '' }}</span>
+                            </a>
                         </li>
                     </ul>
                 </div>
@@ -108,8 +148,12 @@
                                     <i class="tainacan-icon tainacan-icon-36px tainacan-icon-terms"/>
                                 </span>
                                 <p v-if="status == undefined || status == ''">{{ $i18n.get('info_no_taxonomy_created') }}</p>
-                                <p v-if="status == 'draft'">{{ $i18n.get('info_no_taxonomy_draft') }}</p>
-                                <p v-if="status == 'trash'">{{ $i18n.get('info_no_taxonomy_trash') }}</p>
+                                <p
+                                        v-for="(statusOption, index) of $statusHelper.getStatuses()"
+                                        :key="index"
+                                        v-if="status == statusOption.slug">
+                                    {{ $i18n.get('info_no_taxonomies_' + statusOption.slug) }}
+                                </p>
                                 <router-link
                                         v-if="status == undefined || status == ''"
                                         id="button-create-taxonomy"
@@ -328,17 +372,38 @@
         align-items: center;
         width: 100%;
 
-        .header-item:not(:last-child) {
-            padding-right: 0.5em;
-        }
+        .header-item {
 
-        .header-item .button .icon i{
-            width: 100%;
-        } 
-        .header-item .label{
-            font-weight: normal;
-            font-size: 0.875rem;
-            margin-top: 3px;
+            &: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;
+            }
+            
+            .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;
+            }
         }
 
         @media screen and (max-width: 769px) {
diff --git a/src/admin/pages/lists/term-items-page.vue b/src/admin/pages/lists/term-items-page.vue
index a49be5f5f..a40f2e41a 100644
--- a/src/admin/pages/lists/term-items-page.vue
+++ b/src/admin/pages/lists/term-items-page.vue
@@ -267,7 +267,54 @@
                 <!-- Change OrderBy Select and Order Button-->
                 <div class="search-control-item">
                     <b-field>
-                        <label class="label is-hidden-mobile">{{ $i18n.get('label_sorting') + ':' }}</label>
+                        <label class="label">{{ $i18n.get('label_sorting_direction') }}</label>
+                        <b-dropdown
+                                :mobile-modal="true"
+                                @input="onChangeOrder()"
+                                aria-role="list">
+                            <button
+                                    :aria-label="$i18n.get('label_sorting_direction')"
+                                    class="button is-white"
+                                    slot="trigger">
+                                <span class="icon is-small gray-icon">
+                                    <i 
+                                            :class="order == 'DESC' ? 'tainacan-icon-sortdescending' : 'tainacan-icon-sortascending'"
+                                            class="tainacan-icon"/>
+                                </span>
+                                <span class="icon">
+                                    <i class="tainacan-icon tainacan-icon-20px tainacan-icon-arrowdown" />
+                                </span>
+                            </button>
+                            <b-dropdown-item
+                                    aria-controls="items-list-results"
+                                    role="button"
+                                    :class="{ 'is-active': order == 'DESC' }"
+                                    :value="'DESC'"
+                                    aria-role="listitem"
+                                    style="padding-bottom: 0.45rem">
+                                <span class="icon is-small gray-icon">
+                                    <i class="tainacan-icon tainacan-icon-18px tainacan-icon-sortdescending"/>
+                                </span>
+                                {{ $i18n.get('label_descending') }}
+                            </b-dropdown-item>
+                            <b-dropdown-item
+                                    aria-controls="items-list-results"
+                                    role="button"
+                                    :class="{ 'is-active': order == 'ASC' }"
+                                    :value="'ASC'"
+                                    aria-role="listitem"
+                                    style="padding-bottom: 0.45rem">
+                                <span class="icon is-small gray-icon">
+                                    <i class="tainacan-icon tainacan-icon-18px tainacan-icon-sortascending"/>
+                                </span>
+                                {{ $i18n.get('label_ascending') }}
+                            </b-dropdown-item>
+                        </b-dropdown>
+                        <span
+                                class="label"
+                                style="padding-left: 0.65rem;">
+                            {{ $i18n.get('info_by_inner') }}
+                        </span>
                         <b-dropdown
                                 :mobile-modal="true"
                                 @input="onChangeOrderBy($event)"
@@ -278,7 +325,7 @@
                                     slot="trigger">
                                 <span>{{ orderByName }}</span>
                                 <span class="icon">
-                                    <i class="tainacan-icon tainacan-icon-20px tainacan-icon-arrowdown "/>
+                                    <i class="tainacan-icon tainacan-icon-20px tainacan-icon-arrowdown" />
                                 </span>
                             </button>
                             <b-dropdown-item
@@ -292,60 +339,7 @@
                                     aria-role="listitem">
                                 {{ metadatum.name }}
                             </b-dropdown-item>
-                            <!-- Once we have sorting by metadata we can use this -->
-                            <!-- <b-dropdown-item
-                                    :class="{ 'is-active': orderBy == metadatum.slug }"
-                                    v-for="metadatum of sortingMetadata"
-                                    v-if="
-                                        metadatum.slug === 'creation_date' ||
-                                        metadatum.slug === 'author_name' || (
-                                            metadatum.id !== undefined &&
-                                            metadatum.metadata_type_object && 
-                                            metadatum.metadata_type_object.related_mapped_prop !== 'description' &&
-                                            metadatum.metadata_type_object.primitive_type !== 'term' &&
-                                            metadatum.metadata_type_object.primitive_type !== 'item' &&
-                                            metadatum.metadata_type_object.primitive_type !== 'compound'
-                                    )"
-                                    :value="metadatum"
-                                    :key="metadatum.slug">
-                                {{ metadatum.name }}
-                            </b-dropdown-item> -->
                         </b-dropdown>
-                        <!-- Order ASC vs DESC buttons -->
-                        <button
-                                aria-controls="items-list-results"
-                                class="button is-white is-small"
-                                :aria-label="$i18n.get('label_sort_descending')"
-                                :disabled="totalItems <= 0 || order == 'DESC'"
-                                @click="onChangeOrder()">
-                            <span
-                                    v-tooltip="{
-                                        content: $i18n.get('label_sort_descending'),
-                                        autoHide: true,
-                                        placement: 'bottom',
-                                        classes: ['tooltip', isRepositoryLevel ? 'repository-tooltip' : '']
-                                    }"
-                                    class="icon is-small gray-icon">
-                                <i class="tainacan-icon tainacan-icon-sortdescending"/>
-                            </span>
-                        </button>
-                        <button
-                                aria-controls="items-list-results"
-                                :disabled="totalItems <= 0 || order == 'ASC'"
-                                :aria-label="$i18n.get('label_sort_ascending')"
-                                class="button is-white is-small"
-                                @click="onChangeOrder()">
-                            <span
-                                    v-tooltip="{
-                                        content: $i18n.get('label_sort_ascending'),
-                                        autoHide: true,
-                                        placement: 'bottom',
-                                        classes: ['tooltip', isRepositoryLevel ? 'repository-tooltip' : '']     
-                                    }"
-                                    class="icon is-small gray-icon">
-                                <i class="tainacan-icon tainacan-icon-sortascending"/>
-                            </span>
-                        </button>
                     </b-field>
                 </div>
 
@@ -603,13 +597,42 @@
                 <ul>
                     <li 
                             @click="onChangeTab('')"
-                            :class="{ 'is-active': status == undefined || status == ''}"><a>{{ $i18n.get('label_all_items') }}</a></li>
+                            :class="{ 'is-active': status == undefined || status == ''}"
+                            v-tooltip="{
+                                content: $i18n.get('info_items_tab_all'),
+                                autoHide: true,
+                                placement: 'auto',
+                            }">
+                        <a :style="{ fontWeight: 'bold', color: '#454647 !important', lineHeight: '1.5rem' }">
+                            {{ $i18n.get('label_all_published_items') }}
+                            <span class="has-text-gray">&nbsp;{{ collection && collection.total_items ? ` (${Number(collection.total_items.private) + Number(collection.total_items.publish)})` : (isRepositoryLevel && repositoryTotalItems) ? ` (${ repositoryTotalItems.private + repositoryTotalItems.publish })` : '' }}</span>
+                        </a>
+                    </li>
                     <li 
-                            @click="onChangeTab('draft')"
-                            :class="{ 'is-active': status == 'draft'}"><a>{{ $i18n.get('label_draft_items') }}</a></li>
-                    <li 
-                            @click="onChangeTab('trash')"
-                            :class="{ 'is-active': status == 'trash'}"><a>{{ $i18n.get('label_trash_items') }}</a></li>
+                            v-for="(statusOption, index) of $statusHelper.getStatuses()"
+                            v-if="(isRepositoryLevel || statusOption.slug != 'private') || (statusOption.slug == 'private' && $userCaps.hasCapability('read_private_tnc_col_' + collectionId + '_items'))"
+                            :key="index"
+                            @click="onChangeTab(statusOption.slug)"
+                            :class="{ 'is-active': status == statusOption.slug}"
+                            :style="{ marginRight: statusOption.slug == 'private' ? 'auto' : '' }"
+                            v-tooltip="{
+                                content: $i18n.getWithVariables('info_%s_tab_' + statusOption.slug,[$i18n.get('items')]),
+                                autoHide: true,
+                                placement: 'auto',
+                            }">
+                        <a>
+                            <span 
+                                    v-if="$statusHelper.hasIcon(statusOption.slug)"
+                                    class="icon has-text-gray">
+                                <i 
+                                        class="tainacan-icon tainacan-icon-18px"
+                                        :class="$statusHelper.getIcon(statusOption.slug)"
+                                        />
+                            </span>
+                            {{ statusOption.name }}
+                            <span class="has-text-gray">&nbsp;{{ collection && collection.total_items ? ` (${collection.total_items[statusOption.slug]})` : (isRepositoryLevel && repositoryTotalItems) ? ` (${ repositoryTotalItems[statusOption.slug] })` : '' }}</span>
+                        </a>
+                    </li>
                 </ul>
             </div>
 
@@ -689,7 +712,7 @@
                         :items="items"
                         :is-filters-menu-compressed="isFiltersMenuCompressed"
                         :total-items="totalItems"
-                        :is-loading="isLoadingItems"
+                        :is-loading="showLoading"
                         :is="registeredViewModes[viewMode] != undefined ? registeredViewModes[viewMode].component : ''"/>     
 
                 <!-- Empty Placeholder (only used in Admin) -->
@@ -703,8 +726,12 @@
                             </span>
                         </p>
                         <p v-if="status == undefined || status == ''">{{ hasFiltered ? $i18n.get('info_no_item_found_filter') : $i18n.get('info_no_item_created') }}</p>
-                        <p v-if="status == 'draft'">{{ $i18n.get('info_no_item_draft') }}</p>
-                        <p v-if="status == 'trash'">{{ $i18n.get('info_no_item_trash') }}</p>
+                        <p
+                                v-for="(statusOption, index) of $statusHelper.getStatuses()"
+                                :key="index"
+                                v-if="status == statusOption.slug">
+                            {{ $i18n.get('info_no_items_' + statusOption.slug) }}
+                        </p>
 
                         <router-link
                                 v-if="!hasFiltered && (status == undefined || status == '')"
@@ -918,9 +945,11 @@
                 this.localDisplayedMetadata = JSON.parse(JSON.stringify(this.displayedMetadata));
             },
             openAdvancedSearch(newValue){
-                if(newValue == false){
+                if (newValue == false){
                     this.$eventBusSearch.$emit('closeAdvancedSearch');
                     this.advancedSearchResults = false;
+                } else {
+                    this.$eventBusSearch.clearAllFilters();
                 }
             }
         },
diff --git a/src/admin/pages/singles/collection-page.vue b/src/admin/pages/singles/collection-page.vue
index ec567e16f..a238983de 100644
--- a/src/admin/pages/singles/collection-page.vue
+++ b/src/admin/pages/singles/collection-page.vue
@@ -15,7 +15,7 @@
 
 <script>
 import TainacanCollectionSubheader from '../../components/navigation/tainacan-collection-subheader.vue';
-import { mapActions } from 'vuex';
+import { mapActions, mapGetters } from 'vuex';
 
 export default {
     name: 'CollectionPage',
@@ -31,6 +31,9 @@ export default {
     methods: {
         ...mapActions('collection', [
             'fetchCollectionUserCanEdit'
+        ]),
+        ...mapGetters('collection', [
+            'getCollection'
         ])
     },
     created(){
@@ -38,9 +41,14 @@ export default {
         this.$eventBusSearch.setCollectionId(this.collectionId);
     },
     mounted() {
-        this.fetchCollectionUserCanEdit(this.collectionId).then((caps) => {
-            this.currentUserCanEdit = caps;
-        }).catch((error) => this.$console.error(error));
+        let storedCollection = this.getCollection();
+        if (storedCollection != undefined && storedCollection.id == this.collectionId && storedCollection.currentUserCanEdit != undefined)
+            this.currentUserCanEdit = storedCollection.currentUserCanEdit;
+        else {
+            this.fetchCollectionUserCanEdit(this.collectionId).then((caps) => {
+                this.currentUserCanEdit = caps;
+            }).catch((error) => this.$console.error(error));
+        }
     }
 }
 </script>
diff --git a/src/admin/pages/singles/item-page.vue b/src/admin/pages/singles/item-page.vue
index 5e1b4e93f..2bb33c13a 100644
--- a/src/admin/pages/singles/item-page.vue
+++ b/src/admin/pages/singles/item-page.vue
@@ -7,9 +7,11 @@
 
         <div class="tainacan-page-title">
             <h1>
-        <span
-                v-if="(item != null && item != undefined && item.status != undefined && !isLoading)"
-                class="status-tag">{{ $i18n.get(item.status) }}</span>
+            <span
+                    v-if="(item != null && item != undefined && item.status != undefined && !isLoading)"
+                    class="status-tag">
+                {{ $i18n.get('status_' + item.status) }}
+            </span>
                 {{ $i18n.get('title_item_page') + ' ' }}
                 <span style="font-weight: 600;">{{ (item != null && item != undefined) ? item.title : '' }}</span>
             </h1>
@@ -337,6 +339,13 @@
             </div>
             <div class="footer">
                 <div class="form-submission-footer">
+                    <router-link
+                            v-if="item.current_user_can_edit && $route.query.recent == true"
+                            class="button is-secondary"
+                            style="margin-right: auto;"
+                            :to="{ path: $routerHelper.getNewItemPath(collectionId)}">
+                        {{ $i18n.get('label_create_another_item') }}
+                    </router-link>
                     <router-link
                             v-if="item.current_user_can_edit"
                             class="button is-secondary"
@@ -467,7 +476,12 @@
                 });
 
             // Obtains Item
-            this.fetchItem({ itemId: this.itemId, contextEdit: true }).then((item) => {
+            this.fetchItem({ 
+                itemId: this.itemId,
+                contextEdit: true,    
+                fetchOnly: 'title,thumbnail,status,modification_date,document_type,document,comment_status,document_as_html'       
+            })
+            .then((item) => {
                 this.$root.$emit('onCollectionBreadCrumbUpdate', [
                     {path: this.$routerHelper.getCollectionPath(this.collectionId), label: this.$i18n.get('items')},
                     {path: '', label: item.title}
@@ -510,7 +524,7 @@
 
         .tainacan-page-title {
             padding: 0 $page-side-padding;
-            margin-bottom: 40px;
+            margin-bottom: 35px;
             display: flex;
             flex-wrap: wrap;
             align-items: flex-end;
diff --git a/src/admin/scss/_dropdown-and-autocomplete.scss b/src/admin/scss/_dropdown-and-autocomplete.scss
index 5f1a44b5d..79472b22c 100644
--- a/src/admin/scss/_dropdown-and-autocomplete.scss
+++ b/src/admin/scss/_dropdown-and-autocomplete.scss
@@ -7,6 +7,9 @@
                 color: $secondary;
                 align-items: center;
             }
+            .gray-icon {
+                padding-right: 0 !important;
+            }
         }
         .button.is-primary, .button.is-secondary, .button.is-success {
             .icon {
@@ -19,14 +22,18 @@
     }
     .dropdown-menu {
         padding: 0px;
+        margin-top: 0;
         border-radius: 0px;
         min-width: 6rem;
+        border: none;
         
         .dropdown-content {
             padding: 0px;
             border-radius: 0px !important;
             max-height: 240px;
             overflow-y: auto;
+            box-shadow: none;
+            border: 1px solid $gray3;
 
             .dropdown-item {
                 display: block;
@@ -80,6 +87,19 @@
         max-height: unset !important;
     }
 }
+.taginput-container .mdi-magnify::before, 
+.autocomplete .mdi-magnify::before {
+    content: 'search';
+    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;
+    font-size: 20px;
+}
 
 .taginput-container {
     padding: 0px !important;
@@ -90,6 +110,9 @@
     }
     .autocomplete .icon {
         height: 2.2em !important;
+        .mdi-magnify::before {
+            margin-top: -3px;
+        }
     }
     .input { 
         margin-bottom: 0px !important; 
diff --git a/src/admin/scss/_modals.scss b/src/admin/scss/_modals.scss
index 4282afce5..8c3fce6b5 100644
--- a/src/admin/scss/_modals.scss
+++ b/src/admin/scss/_modals.scss
@@ -53,6 +53,7 @@
     border-radius: 0px;
     background-color: white;
     padding: 40px $page-side-padding;
+    padding: 40px 4.166666667vw;
     position: relative;
     overflow-y: auto;
     overflow-x: hidden;
diff --git a/src/admin/scss/_radios.scss b/src/admin/scss/_radios.scss
index 0d39efa6b..5a55a6b04 100644
--- a/src/admin/scss/_radios.scss
+++ b/src/admin/scss/_radios.scss
@@ -7,8 +7,10 @@
     }
     input[type="radio"] + .check::before {
         background: black !important;
-        width: 7px !important;
-        height: 7px !important;
+        width: 15px !important;
+        height: 15px !important;
+        margin-left: calc(-16px/2) !important;
+        margin-bottom: calc(-16px/2) !important;
     }
     &:focus input[type="radio"] + .check,
     &:active input[type="radio"] + .check,
diff --git a/src/admin/scss/_repository-level-overrides.scss b/src/admin/scss/_repository-level-overrides.scss
index 22b064271..65d534e41 100644
--- a/src/admin/scss/_repository-level-overrides.scss
+++ b/src/admin/scss/_repository-level-overrides.scss
@@ -50,6 +50,14 @@
     .button.is-outlined {
         color: $blue5 !important;
     }
+    .b-numberinput {
+        button.is-primary,
+        button.is-primary:hover,
+        button.is-primary:focus,
+        button.is-primary:active  {
+            color: $blue5 !important;
+        }
+    }
     .tabs {
         li.is-active a {
             border-bottom-color: $blue5;
@@ -81,7 +89,21 @@
     .dropdown-menu .dropdown-content {
         .dropdown-item.is-active { background-color: $blue2; }
     }
-
+    .datepicker {
+        .datepicker-header a>span>i:before {
+            color: $blue5 !important;
+        }
+        .datepicker-table {
+            .datepicker-cell.is-today,
+            .datepicker-cell.is-today:hover {
+                background-color: $blue1 !important;
+            }
+            .datepicker-cell.is-selected,
+            .datepicker-cell.is-selected:hover {
+                background-color: $blue5 !important;
+            }
+        }
+    }
     .switch {
         &:hover input[type="checkbox"]:checked + .check {
             background-color: $blue2;
diff --git a/src/admin/scss/_tainacan-form.scss b/src/admin/scss/_tainacan-form.scss
index e4d1ade95..ba0397310 100644
--- a/src/admin/scss/_tainacan-form.scss
+++ b/src/admin/scss/_tainacan-form.scss
@@ -49,7 +49,52 @@
           background-color: $red1;  
         }
     }
-    .control{
+    .b-numberinput {
+        height: 30px;
+        
+        .control {
+            margin-right: 0 !important;
+        }
+        div.control {
+            flex-shrink: 1;
+            order: -1;
+        }
+        button, 
+        input {
+            height: 30px !important;
+        }
+        button.is-primary,
+        button.is-primary:hover,
+        button.is-primary:focus,
+        button.is-primary:active {
+            border: 1px solid $gray2;
+            background-color: $gray1 !important;
+            color: $secondary !important;
+            padding: 0 0.6rem !important;
+            border-radius: 0 !important;
+
+            .mdi::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;
+                transform: none !important;
+                font-size: 20px;
+                margin-top: -2px;
+            }
+            .mdi-plus::before {
+                content: "plus" !important;
+            } 
+            .mdi-minus::before {
+                content: "minus" !important;
+            } 
+        }
+    }
+    .control {
         &.has-icons-right {
             .icon {
                 height: 2.0em;
diff --git a/src/admin/scss/_view-mode-masonry.scss b/src/admin/scss/_view-mode-masonry.scss
index 212abc385..a6c29a59b 100644
--- a/src/admin/scss/_view-mode-masonry.scss
+++ b/src/admin/scss/_view-mode-masonry.scss
@@ -74,6 +74,7 @@
                 width: 100%;
                 height: auto;    
                 transition: height 0.2s ease;
+                display: block;
             }
             img:not(.skeleton) {
                 visibility: hidden;
diff --git a/src/admin/scss/_view-mode-records.scss b/src/admin/scss/_view-mode-records.scss
index a147d020b..4e7792f94 100644
--- a/src/admin/scss/_view-mode-records.scss
+++ b/src/admin/scss/_view-mode-records.scss
@@ -134,6 +134,10 @@
                     color: $gray4;
                 }
 
+                & span:last-of-type>.metadata-value {
+                    margin-bottom: 0px;
+                }
+
             }
         }
     
diff --git a/src/admin/scss/tainacan-admin.scss b/src/admin/scss/tainacan-admin.scss
index bce8cf999..967592913 100644
--- a/src/admin/scss/tainacan-admin.scss
+++ b/src/admin/scss/tainacan-admin.scss
@@ -31,12 +31,12 @@
 @import "../scss/_iframe_read_mode_overrides.scss";
 
 // Clears wordpress content
-body.tainacan-admin-page #adminmenumain, body.tainacan-admin-page #wpfooter, body.tainacan-admin-page #wp-auth-check-wrap {
-    display: none;
-}
 html {
     overflow-y: hidden;
 }
+body.tainacan-admin-page #adminmenumain, body.tainacan-admin-page #wpfooter, body.tainacan-admin-page #wp-auth-check-wrap {
+    display: none;
+}
 #tainacan-admin-app {
     background: #ffffff;
     position: fixed;
@@ -51,6 +51,21 @@ html {
     font-family: $family-sans-serif;
 }
 
+// Scrollbars
+#tainacan-admin-app * {
+    // For Firefox
+    scrollbar-color: $gray3 transparent;
+    scrollbar-width: thin;
+
+    // For Chromium and related
+    &::-webkit-scrollbar {
+        width: 0.4rem;
+    }
+    &::-webkit-scrollbar-thumb {
+        background-color: $gray3;
+    }
+}
+
 // Tainacan Loading
 .tainacan-icon {
     opacity: 0; // Will make it 1 once window.load is done; 
diff --git a/src/admin/scss/theme-basics.sass b/src/admin/scss/theme-basics.sass
index 1810d58f5..fd30980b6 100644
--- a/src/admin/scss/theme-basics.sass
+++ b/src/admin/scss/theme-basics.sass
@@ -1,11 +1,11 @@
 @import "../../../node_modules/bulma/sass/utilities/_all.sass"
 @import "../../../node_modules/bulma/sass/base/helpers.sass"
-@import "../../../node_modules/bulma/sass/elements/form.sass"
+@import "../../../node_modules/bulma/sass/form/_all.sass"
 @import "../../../node_modules/bulma/sass/components/pagination.sass"
 @import "../../../node_modules/bulma/sass/elements/icon.sass"
 @import "../../../node_modules/bulma/sass/elements/tag.sass"
 @import "../../../node_modules/bulma/sass/components/tabs.sass"
 @import "../../../node_modules/bulma/sass/elements/button.sass"
 @import "../../../node_modules/bulma/sass/grid/columns.sass"
+@import "../../../node_modules/bulma/sass/components/dropdown.sass"
 @import "../../../node_modules/bulma/sass/components/modal.sass"
-@import "../../../node_modules/bulma/sass/components/breadcrumb.sass"
diff --git a/src/admin/tainacan-admin-i18n.php b/src/admin/tainacan-admin-i18n.php
index 8612b83d0..cf57f705b 100644
--- a/src/admin/tainacan-admin-i18n.php
+++ b/src/admin/tainacan-admin-i18n.php
@@ -2,7 +2,7 @@
 
 return apply_filters( 'tainacan-admin-i18n', [
 
-	// Advanced search comparators
+	// Comparators
 	'is_equal_to'                                    => __( 'Equal', 'tainacan' ),
 	'is_not_equal_to'                                => __( 'Not equal', 'tainacan' ),
 	'contains'                                       => __( 'Contains', 'tainacan' ),
@@ -11,6 +11,10 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'less_than'                                      => __( 'Less than', 'tainacan' ),
 	'greater_than_or_equal_to'                       => __( 'Greater than or equal to', 'tainacan' ),
 	'less_than_or_equal_to'                          => __( 'Less than or equal to', 'tainacan' ),
+	'before'                                   	 	 => __( 'Before', 'tainacan' ),
+	'after'		                                     => __( 'After', 'tainacan' ),
+	'before_or_on_day'		                         => __( 'Before (inclusive)', 'tainacan' ),
+	'after_or_on_day'                          		 => __( 'After (inclusive)', 'tainacan' ),
 
 	// Tainacan common terms
 	'repository'                                     => __( 'Repository', 'tainacan' ),
@@ -82,14 +86,14 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'delete'                                    	 => __( 'Delete', 'tainacan' ),
 
 	// Wordpress Status
-	'publish'                                        => __( 'Publish', 'tainacan' ),
-	'public'                                         => __( 'Public', 'tainacan' ),
-	'draft'                                          => __( 'Draft', 'tainacan' ),
-	'private'                                        => __( 'Private', 'tainacan' ),
-	'trash'                                          => __( 'Trash', 'tainacan' ),
-	'auto-draft'                                     => __( 'Automatic Draft', 'tainacan' ),
-	'publish_visibility'                             => __( 'Visible to everyone', 'tainacan' ),
-	'private_visibility'                             => __( 'Visible only for editors', 'tainacan' ),
+	'status_publish'                                 => __( 'Publish', 'tainacan' ),
+	'status_public'                                  => __( 'Public', 'tainacan' ),
+	'status_draft'                                   => __( 'Draft', 'tainacan' ),
+	'status_private'                                 => __( 'Private', 'tainacan' ),
+	'status_trash'                                   => __( 'Trash', 'tainacan' ),
+	'status_auto-draft'                              => __( 'Automatic Draft', 'tainacan' ),
+	'publish_visibility'                             => __( 'Public (Visible to everyone)', 'tainacan' ),
+	'private_visibility'                             => __( 'Private (Visible only for editors)', 'tainacan' ),
 
 	// Page Titles (used mainly on Router)
 	'title_repository_collections_page'              => __( 'Repository Collections', 'tainacan' ),
@@ -213,6 +217,8 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'label_core_title'                               => __( 'Core Title', 'tainacan' ),
 	'label_core_description'                         => __( 'Core Description', 'tainacan' ),
 	'label_sorting'                                  => __( 'Sorting', 'tainacan' ),
+	'label_sorting_direction'                                  => __( 'Sorting direction', 'tainacan' ),
+	'label_sort'	                                 => __( 'Sort', 'tainacan' ),
 	'label_activity_date'                            => __( 'Activity date', 'tainacan' ),
 	'label_activity_title'                           => __( 'Activity', 'tainacan' ),
 	'label_header_image'                             => __( 'Header Image', 'tainacan' ),
@@ -235,11 +241,9 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'label_expand_all'                               => __( 'Expand all', 'tainacan' ),
 	'label_collapse_all'                             => __( 'Collapse all', 'tainacan' ),
 	'label_view_term'                                => __( 'View Term', 'tainacan' ),
-	'label_all_items'                                => __( 'All items', 'tainacan' ),
+	'label_all_published_items'                      => __( 'All published items', 'tainacan' ),
 	'label_all_collections'                          => __( 'All collections', 'tainacan' ),
 	'label_all_taxonomies'                           => __( 'All taxonomies', 'tainacan' ),
-	'label_draft_items'                              => __( 'Draft', 'tainacan' ),
-	'label_trash_items'                              => __( 'Trash', 'tainacan' ),
 	'label_bulk_actions'                             => __( 'Bulk actions', 'tainacan' ),
 	'label_delete_selected_collections'              => __( 'Delete selected collections', 'tainacan' ),
 	'label_edit_selected_collections'                => __( 'Edit selected collections', 'tainacan' ),
@@ -366,8 +370,8 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'label_no_output_info'			                 => __( 'No output info', 'tainacan' ),
 	'label_output'			                 	 	 => __( 'Output', 'tainacan' ),
 	'label_no_mapping'			                 	 => __( 'No mapping', 'tainacan' ),
-	'label_sort_descending'		                 	 => __( 'Sort descending', 'tainacan' ),
-	'label_sort_ascending'			                 => __( 'Sort ascending', 'tainacan' ),
+	'label_descending'		                 	 	 => __( 'Descending', 'tainacan' ),
+	'label_ascending'			                 	 => __( 'Ascending', 'tainacan' ),
 	'label_slideshow'			                 	 => __( 'Slideshow', 'tainacan' ),
 	'label_items_list'			                 	 => __( 'Items List', 'tainacan' ),
 	'label_list_pagination'			                 => __( 'List pagination', 'tainacan' ),
@@ -404,7 +408,14 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'label_previous_group_slides'					 => __( 'Previous group of slides', 'tainacan' ),	
 	'label_plugin_home_page'					 	 => __( 'Plugin home page', 'tainacan' ),	
 	'label_wordpress_admin_page'					 => __( 'WordPress Admin Page', 'tainacan' ),	
-
+	'label_view_all_%s_collections'					 => __( 'View all %s collections', 'tainacan' ),
+	'label_view_collections_list'                    => __( 'View collections list', 'tainacan' ),
+	'label_comparator'								 => __( 'Comparator', 'tainacan' ),
+	'label_table_of_items'                           => __( 'Table of Items', 'tainacan' ),
+	'label_duplicate_item'                           => __( 'Duplicate item', 'tainacan' ),
+	'label_create_another_item'                      => __( 'Create another item', 'tainacan' ),
+	'label_recent_collections'	                     => __( 'Recent Collections', 'tainacan' ),
+	
 	// Instructions. More complex sentences to guide user and placeholders
 	'instruction_delete_selected_collections'        => __( 'Delete selected collections', 'tainacan' ),
 	'instruction_delete_selected_items'              => __( 'Delete selected items', 'tainacan' ),
@@ -448,24 +459,53 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'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_metadatum_sort'     	 => __( 'Drag and drop to change metadatum order', 'tainacan' ),
+	'instruction_select_a_date' 				     => __( 'Select a date', 'tainacan' ),
 
 	// Info. Other feedback to user.
+	'info_items_tab_all'                			 => __( 'Every published item, including those visible only to editors.', 'tainacan' ),
+	'info_items_tab_publish'                         => __( 'Only items that are visible to everyone.', 'tainacan' ),
+	'info_items_tab_private'                         => __( 'Items visible only to editors.', 'tainacan' ),
+	'info_items_tab_draft'                           => __( 'Draft items, not published.', 'tainacan' ),
+	'info_items_tab_trash'                         	 => __( 'Items that were sent to trash.', 'tainacan' ),
+
+	'info_collections_tab_all'                		 => __( 'Every published collection, including those visible only to editors.', 'tainacan' ),
+	'info_collections_tab_publish'                   => __( 'Only collections that are visible to everyone.', 'tainacan' ),
+	'info_collections_tab_private'                   => __( 'Collections visible only to editors.', 'tainacan' ),
+	'info_collections_tab_draft'                     => __( 'Draft collections, not published.', 'tainacan' ),
+	'info_collections_tab_trash'                     => __( 'Collections that were sent to trash.', 'tainacan' ),
+
+	'info_taxonomies_tab_all'                	     => __( 'Every published taxonomy, including those visible only to editors.', 'tainacan' ),
+	'info_taxonomies_tab_publish'                    => __( 'Only taxonomies that are visible to everyone.', 'tainacan' ),
+	'info_taxonomies_tab_private'                    => __( 'Taxonomies visible only to editors.', 'tainacan' ),
+	'info_taxonomies_tab_draft'                      => __( 'Draft taxonomies, not published.', 'tainacan' ),
+	'info_taxonomies_tab_trash'                      => __( 'Taxonomies that were sent to trash.', 'tainacan' ),
+
 	'info_error_invalid_date'                        => __( 'Invalid date', 'tainacan' ),
 	'info_search_results'                            => __( 'Search Results', 'tainacan' ),
 	'info_search_criteria'                           => __( 'Search Criteria', 'tainacan' ),
 	'info_name_is_required'                          => __( 'Name is required.', 'tainacan' ),
 	'info_no_collection_created'                     => __( 'No collection was created in this repository.', 'tainacan' ),
-	'info_no_collection_draft'                       => __( 'No draft collection found.', 'tainacan' ),
-	'info_no_collection_trash'                       => __( 'No collection in trash.', 'tainacan' ),
-	'info_no_taxonomy_draft'                         => __( 'No draft taxonomy found.', 'tainacan' ),
-	'info_no_taxonomy_trash'                         => __( 'No taxonomy in trash.', 'tainacan' ),
+	
+	'info_no_items_publish'			                 => __( 'No public items found.', 'tainacan' ),
+	'info_no_items_private'			                 => __( 'No private items found.', 'tainacan' ),
+	'info_no_items_draft'			                 => __( 'No draft items found.', 'tainacan' ),
+	'info_no_items_trash'			                 => __( 'No items found on trash.', 'tainacan' ),
+	
+	'info_no_collections_publish'			         => __( 'No public collections found.', 'tainacan' ),
+	'info_no_collections_private'			         => __( 'No private collections found.', 'tainacan' ),
+	'info_no_collections_draft'			             => __( 'No draft collections found.', 'tainacan' ),
+	'info_no_collections_trash'			             => __( 'No collections found on trash.', 'tainacan' ),
+	
+	'info_no_taxonomies_publish'			         => __( 'No public taxonomies found.', 'tainacan' ),
+	'info_no_taxonomies_private'			         => __( 'No private taxonomies found.', 'tainacan' ),
+	'info_no_taxonomies_draft'			             => __( 'No draft taxonomies found.', 'tainacan' ),
+	'info_no_taxonomies_trash'			             => __( 'No taxonomies found on trash.', 'tainacan' ),
+		
 	'info_no_taxonomy_created'                       => __( 'No taxonomy was created in this repository.', 'tainacan' ),
 	'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_draft'                             => __( 'No draft item found.', 'tainacan' ),
-	'info_no_item_trash'                             => __( 'No item in trash.', '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' ),
@@ -474,6 +514,8 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'info_no_moderator_on_collection'                => __( "This collection doesn't have any moderator yet.", 'tainacan' ),
 	'info_error_deleting_collection'                 => __( 'Error on deleting collection.', 'tainacan' ),
 	'info_error_deleting_taxonomy'                   => __( 'Error on deleting taxonomy', 'tainacan' ),
+	'info_error_first_value_greater'                 => __( 'First value should be lower than second value', 'tainacan' ),
+	'info_error_value_must_be_number'                => __( 'Value should be a number', 'tainacan' ),
 	'info_collection_deleted'                        => __( 'Collection deleted.', 'tainacan' ),
 	'info_item_deleted'                              => __( 'Item deleted.', 'tainacan' ),
 	'info_taxonomy_deleted'                          => __( 'Taxonomy deleted', 'tainacan' ),
@@ -564,9 +606,8 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'info_no_options_avialable_filtering'            => __( 'No options for this filtering.', 'tainacan' ),
 	'info_no_options_found'                          => __( 'No options found.', 'tainacan' ),
 	'info_all_files_uploaded'                        => __( 'All files uploaded.', 'tainacan' ),
-	'info_there_are_%s_items_being_edited'           => __( 'There are %s items being edited', 'tainacan' ),
-	'info_there_is_one_item_being_edited'            => __( 'There is one item being edited', 'tainacan' ),
-	'info_item_being_edited'                         => __( 'item being edited', 'tainacan' ),
+	'info_there_are_%s_items_being_edited'           => __( 'There are %s items being edited;', 'tainacan' ),
+	'info_there_is_one_item_being_edited'            => __( 'There is one item being edited.', 'tainacan' ),
 	'info_no_preview_found'                          => __( 'No preview was found.', 'tainacan' ),
 	'info_leaving_bulk_edition'                      => __( 'You are leaving the bulk edition now.', 'tainacan' ),
 	'info_current_view_mode_metadata_not_allowed'    => __( 'Current view mode does not allow displayed metadata selection.', 'tainacan' ),
@@ -597,12 +638,30 @@ return apply_filters( 'tainacan-admin-i18n', [
 
 	// Tainacan Filter Types
 	'tainacan-filter-custom-interval'                => __( 'Custom Interval', 'tainacan' ),
+	'tainacan-filter-numeric'		                 => __( 'Numeric', 'tainacan' ),
+	'tainacan-filter-date'			                 => __( 'Date', 'tainacan' ),
 	'tainacan-filter-selectbox'                      => __( 'Select Box', 'tainacan' ),
 	'tainacan-filter-autocomplete'                   => __( 'Autocomplete', 'tainacan' ),
 	'tainacan-filter-taginput'                       => __( 'Tag Input', 'tainacan' ),
 	'tainacan-filter-checkbox'                       => __( 'Check Box', 'tainacan' ),
 	'tainacan-filter-taxonomy-taginput'              => __( 'Taxonomy Tag Input', 'tainacan' ),
 	'tainacan-filter-taxonomy-checkbox'              => __( 'Taxonomy Check Box', 'tainacan' ),
-	'tainacan-filter-taxonomy-selectbox'             => __( 'Taxonomy Select Box', 'tainacan' )
+	'tainacan-filter-taxonomy-selectbox'             => __( 'Taxonomy Select Box', 'tainacan' ),
+
+	// Datepicker week days
+	/* translators: This refers to the short label that will appear on datepickers for Sunday */
+	'datepicker_short_sunday'			=> __( 'Su', 'tainacan' ),
+	/* translators: This refers to the short label that will appear on datepickers for Monday */
+	'datepicker_short_monday'			=> __( 'M', 'tainacan' ),
+	/* translators: This refers to the short label that will appear on datepickers for Tuesday */
+	'datepicker_short_tuesday'			=> __( 'Tu', 'tainacan' ),
+	/* translators: This refers to the short label that will appear on datepickers for Wednesday */
+	'datepicker_short_wednesday'		=> __( 'W', 'tainacan' ),
+	/* translators: This refers to the short label that will appear on datepickers for Thursday */
+	'datepicker_short_thursday'			=> __( 'Th', 'tainacan' ),
+	/* translators: This refers to the short label that will appear on datepickers for Friday */
+	'datepicker_short_friday'			=> __( 'F', 'tainacan' ),
+	/* translators: This refers to the short label that will appear on datepickers for Saturday */
+	'datepicker_short_saturday'			=> __( 'Sa', 'tainacan' )
 ] );
 ?>
diff --git a/src/admin/theme-items-list.vue b/src/admin/theme-items-list.vue
index 116d12b7b..780ecdeb3 100644
--- a/src/admin/theme-items-list.vue
+++ b/src/admin/theme-items-list.vue
@@ -22,6 +22,7 @@
 export default {
     name: "ThemeItemsList",
     created() {
+        this.$statusHelper.loadStatuses();
         this.$userPrefs.init(); 
     }
 }
@@ -36,8 +37,8 @@ export default {
     @import "./scss/theme-basics.sass";
 
     // Buefy imports
-    @import "../../node_modules/buefy/src/scss/components/_datepicker.scss";
     @import "../../node_modules/buefy/src/scss/utils/_all.scss";
+    @import "../../node_modules/buefy/src/scss/components/_datepicker.scss";
     @import "../../node_modules/buefy/src/scss/components/_checkbox.scss";
     @import "../../node_modules/buefy/src/scss/components/_radio.scss";
     @import "../../node_modules/buefy/src/scss/components/_tag.scss";
@@ -45,6 +46,7 @@ export default {
     @import "../../node_modules/buefy/src/scss/components/_dropdown.scss";
     @import "../../node_modules/buefy/src/scss/components/_modal.scss";
     @import "../../node_modules/buefy/src/scss/components/_notices.scss";
+    @import "../../node_modules/buefy/src/scss/components/_numberinput.scss";
 
     // Tainacan imports
     @import "../admin/scss/_tables.scss";
@@ -150,9 +152,6 @@ export default {
                     top: 5px;
                 }
             }
-            .filter-item-forms .datepicker .dropdown-content {
-                max-width: 100% !important;
-            }
         }
 
         .search-control {   
diff --git a/src/api/endpoints/class-tainacan-rest-collections-controller.php b/src/api/endpoints/class-tainacan-rest-collections-controller.php
index 04fc164e2..22dcc4977 100644
--- a/src/api/endpoints/class-tainacan-rest-collections-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-collections-controller.php
@@ -357,13 +357,20 @@ class REST_Collections_Controller extends REST_Controller {
 	 * @return string|\WP_Error|\WP_REST_Response
 	 */
 	public function delete_item( $request ) {
-	    $collection_id = $request['collection_id'];
 		$permanently = $request['permanently'];
+		$collection = $this->collections_repository->fetch($request['collection_id']);
+
+		if(! $collection instanceof Entities\Collection) {
+			return new \WP_REST_Response([
+		    	'error_message' => __('Collection with this ID was not found', 'tainacan' ),
+			    'collection_id' => $collection_id
+		    ], 400);
+		}
 
 		if($permanently == true) {
-			$collection = $this->collections_repository->delete($collection_id);
+			$collection = $this->collections_repository->delete($collection);
 		} else {
-			$collection = $this->collections_repository->trash($collection_id);
+			$collection = $this->collections_repository->trash($collection);
 		}
 
 		$prepared_collection = $this->prepare_item_for_response($collection, $request);
diff --git a/src/api/endpoints/class-tainacan-rest-facets-controller.php b/src/api/endpoints/class-tainacan-rest-facets-controller.php
index 970f988bc..0a904814f 100644
--- a/src/api/endpoints/class-tainacan-rest-facets-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-facets-controller.php
@@ -63,6 +63,7 @@ class REST_Facets_Controller extends REST_Controller {
 			
 			$metadatum = $this->metadatum_repository->fetch($metadatum_id);
 			$metadatum_type = $metadatum->get_metadata_type();
+			$metadatum_type_object = $metadatum->get_metadata_type_object();
 			
 			$offset = null;
 			$number = null;
@@ -130,6 +131,25 @@ class REST_Facets_Controller extends REST_Controller {
 			
 			$all_values = $this->metadatum_repository->fetch_all_metadatum_values( $metadatum_id, $args );
 			
+			if (isset($request['context']) && $request['context'] == 'extended') {
+				
+				if ($metadatum_type_object->get_repository() instanceof \Tainacan\Repositories\Repository) {
+					$all_values['values'] = array_map(function($val) use($metadatum_type_object) {
+						
+						$second_arg = [];
+						if (isset($val['taxonomy'])) {
+							$second_arg = $val['taxonomy'];
+						}
+						$entity = $metadatum_type_object->get_repository()->fetch( (int) $val['value'], $second_arg );
+						if ($entity) {
+							$val['entity'] = $entity->_toArray();
+						}
+						return $val;
+					}, $all_values['values']);
+				}
+				
+			}
+			
 			$response = [
 				'values' => $all_values['values'],
 				'last_term' => $all_values['last_term']
diff --git a/src/api/endpoints/class-tainacan-rest-filters-controller.php b/src/api/endpoints/class-tainacan-rest-filters-controller.php
index 702879823..f83e5602a 100644
--- a/src/api/endpoints/class-tainacan-rest-filters-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-filters-controller.php
@@ -136,25 +136,25 @@ class REST_Filters_Controller extends REST_Controller {
 			$metadatum_id      = $request['metadatum_id'];
 
 			$filter_obj->set_collection_id( $collection_id );
-			$filter_obj->set_metadatum( $metadatum_id );
+			$filter_obj->set_metadatum_id( $metadatum_id );
 		} elseif (isset($request['collection_id'])){
 			$collection_id = $request['collection_id'];
 
 			$filter_obj->set_collection_id( $collection_id );
 
-			if(!isset($body['metadatum'])){
+			if(!isset($body['metadatum_id'])){
 				throw new \InvalidArgumentException('You need provide a metadatum id');
 			}
 
-			$filter_obj->set_metadatum($body['metadatum']);
+			$filter_obj->set_metadatum_id($body['metadatum_id']);
 		} else {
 			$filter_obj->set_collection_id( 'filter_in_repository' );
 
-			if(!isset($body['metadatum'])){
+			if(!isset($body['metadatum_id'])){
 				throw new \InvalidArgumentException('You need provide a metadatum id');
 			}
 
-			$filter_obj->set_metadatum($body['metadatum']);
+			$filter_obj->set_metadatum_id($body['metadatum_id']);
 		}
 
 		$filter_obj->set_filter_type($filter_type);
@@ -223,13 +223,21 @@ class REST_Filters_Controller extends REST_Controller {
 	 * @return \WP_Error|\WP_REST_Response
 	 */
 	public function delete_item( $request ) {
-		$filter_id = $request['filter_id'];
 		$permanently = $request['permanently'];
+		
+		$filter = $this->filter_repository->fetch($request['filter_id']);
+
+		if (! $filter instanceof Entities\Filter) {
+			return new \WP_REST_Response([
+		    	'error_message' => __('A filter with this ID was not found', 'tainacan' ),
+			    'filter_id' => $filter_id
+		    ], 400);
+		}
 
 		if($permanently == true) {
-			$filter = $this->filter_repository->delete($filter_id);
+			$filter = $this->filter_repository->delete($filter);
 		} else {
-			$filter = $this->filter_repository->trash($filter_id);
+			$filter = $this->filter_repository->trash($filter);
 		}
 
 		return new \WP_REST_Response($this->prepare_item_for_response($filter, $request), 200);
@@ -421,7 +429,14 @@ class REST_Filters_Controller extends REST_Controller {
 		$filter_id = $request['filter_id'];
 
 		$filter = $this->filter_repository->fetch($filter_id);
-
+		
+		if(! $filter instanceof Entities\Filter) {
+			return new \WP_REST_Response([
+		    	'error_message' => __('A filter with this ID was not found', 'tainacan' ),
+			    'filter_id' => $filter_id
+		    ], 400);
+		}
+		
 		return new \WP_REST_Response($this->prepare_item_for_response($filter, $request), 200);
 	}
 
diff --git a/src/api/endpoints/class-tainacan-rest-items-controller.php b/src/api/endpoints/class-tainacan-rest-items-controller.php
index c2677ae6e..5d9b48c5b 100644
--- a/src/api/endpoints/class-tainacan-rest-items-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-items-controller.php
@@ -123,6 +123,7 @@ class REST_Items_Controller extends REST_Controller {
 			$item_array['metadata'][ $slug ]['value']           = $item_metadata_array['value'];
 			$item_array['metadata'][ $slug ]['value_as_html']   = $item_metadata_array['value_as_html'];
 			$item_array['metadata'][ $slug ]['value_as_string'] = $item_metadata_array['value_as_string'];
+			$item_array['metadata'][ $slug ]['semantic_uri'] = $item_metadata_array['metadatum']['semantic_uri'];
 			
 			$item_array['metadata'][ $slug ]['multiple']        = $metadatum->get_multiple();
 			$item_array['metadata'][ $slug ]['mapping']        = $metadatum->get_exposer_mapping();
@@ -215,7 +216,11 @@ class REST_Items_Controller extends REST_Controller {
 				
 			}
 
+			// \error_log("DEBUG-1:");
+			// \error_log(\json_encode($item_arr));
 			$item_arr = apply_filters('tainacan-api-items-prepare-for-response', $item_arr, $item, $request);
+			// \error_log("DEBUG-2:");
+			// \error_log(\json_encode($item_arr));
 			
 			return $item_arr;
 		}
@@ -232,7 +237,14 @@ class REST_Items_Controller extends REST_Controller {
 		$item_id = $request['item_id'];
 
 		$item = $this->items_repository->fetch($item_id);
-
+		
+		if (! $item instanceof Entities\Item) {
+			return new \WP_REST_Response([
+		    	'error_message' => __('An item with this ID was not found', 'tainacan' ),
+			    'item_id' => $item_id
+		    ], 400);
+		}
+		
 		$response = $this->prepare_item_for_response($item, $request);
 
 		return new \WP_REST_Response(apply_filters('tainacan-rest-response', $response, $request), 200);
@@ -508,11 +520,20 @@ class REST_Items_Controller extends REST_Controller {
 	public function delete_item( $request ) {
 		$item_id     = $request['item_id'];
 		$permanently = $request['permanently'];
+		
+		$item = $this->items_repository->fetch($request['item_id']);
 
+		if (! $item instanceof Entities\Item) {
+			return new \WP_REST_Response([
+		    	'error_message' => __('An item with this ID was not found', 'tainacan' ),
+			    'item_id' => $item_id
+		    ], 400);
+		}
+		
 		if($permanently == true) {
-			$item = $this->items_repository->delete($item_id);
+			$item = $this->items_repository->delete($item);
 		} else {
-			$item = $this->items_repository->trash($item_id);
+			$item = $this->items_repository->trash($item);
 		}
 
 		$prepared_item = $this->prepare_item_for_response($item, $request);
diff --git a/src/api/endpoints/class-tainacan-rest-metadata-controller.php b/src/api/endpoints/class-tainacan-rest-metadata-controller.php
index e26bfdfe8..87da4c239 100644
--- a/src/api/endpoints/class-tainacan-rest-metadata-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-metadata-controller.php
@@ -137,6 +137,13 @@ class REST_Metadata_Controller extends REST_Controller {
 		}
 
 		$result = $this->metadatum_repository->fetch($metadatum_id, 'OBJECT');
+		
+		if (! $result instanceof Entities\Metadatum) {
+			return new \WP_REST_Response([
+				'error_message' => __('Metadata with this ID was not found', 'tainacan'),
+				'item_id' => $item_id
+			], 400);
+		}
 
 		return new \WP_REST_Response($this->prepare_item_for_response($result, $request), 200);
 	}
@@ -288,9 +295,10 @@ class REST_Metadata_Controller extends REST_Controller {
 			$item_arr['metadata_type_object'] = $item->get_metadata_type_object()->_toArray();
 
 			if(isset($item_arr['metadata_type_options']) && isset($item_arr['metadata_type_options']['taxonomy_id'])){
-				$taxonomy = new Entities\Taxonomy($item_arr['metadata_type_options']['taxonomy_id']);
-
-				$item_arr['metadata_type_options']['taxonomy'] = $taxonomy->get_db_identifier();
+				$taxonomy = Repositories\Taxonomies::get_instance()->get_db_identifier_by_id( $item_arr['metadata_type_options']['taxonomy_id'] );
+				//$taxonomy = new Entities\Taxonomy($item_arr['metadata_type_options']['taxonomy_id']);
+				//$item_arr['metadata_type_options']['taxonomy'] = $taxonomy->get_db_identifier();
+				$item_arr['metadata_type_options']['taxonomy'] = $taxonomy;
 			}
 			
 			if($request['context'] === 'edit'){
@@ -384,8 +392,17 @@ class REST_Metadata_Controller extends REST_Controller {
 	 */
 	public function delete_item( $request ) {
 		$metadatum_id = $request['metadatum_id'];
-
-		$metadatum_trashed = $this->metadatum_repository->trash($metadatum_id);
+		
+		$metadatum = $this->metadatum_repository->fetch($metadatum_id);
+		
+		if (! $metadatum instanceof Entities\Metadatum) {
+			return new \WP_REST_Response([
+				'error_message' => __('Metadata with this ID was not found', 'tainacan'),
+				'item_id' => $item_id
+			], 400);
+		}
+		
+		$metadatum_trashed = $this->metadatum_repository->trash($metadatum);
 
 		$prepared = $this->prepare_item_for_response($metadatum_trashed, $request);
 
diff --git a/src/api/endpoints/class-tainacan-rest-taxonomies-controller.php b/src/api/endpoints/class-tainacan-rest-taxonomies-controller.php
index 00c852cf7..acd67582b 100644
--- a/src/api/endpoints/class-tainacan-rest-taxonomies-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-taxonomies-controller.php
@@ -182,7 +182,14 @@ class REST_Taxonomies_Controller extends REST_Controller {
 		$taxonomy_id = $request['taxonomy_id'];
 
 		$taxonomy = $this->taxonomy_repository->fetch($taxonomy_id);
-
+		
+		if (! $taxonomy instanceof Entities\Taxonomy) {
+			return new \WP_REST_Response([
+				'error_message' => __('A taxonomy with this ID was not found', 'tainacan' ),
+				'taxonomy_id'   => $taxonomy_id
+			], 400);
+		}
+		
 		$taxonomy_prepared = $this->prepare_item_for_response($taxonomy, $request);
 
 		return new \WP_REST_Response($taxonomy_prepared, 200);
@@ -218,11 +225,20 @@ class REST_Taxonomies_Controller extends REST_Controller {
 	public function delete_item( $request ) {
 		$taxonomy_id = $request['taxonomy_id'];
 		$permanently = $request['permanently'];
-
+		
+		$taxonomy = $this->taxonomy_repository->fetch($taxonomy_id);
+		
+		if (! $taxonomy instanceof Entities\Taxonomy) {
+			return new \WP_REST_Response([
+				'error_message' => __('A taxonomy with this ID was not found', 'tainacan' ),
+				'taxonomy_id'   => $taxonomy_id
+			], 400);
+		}
+		
 		if($permanently == true){
-			$deleted = $this->taxonomy_repository->delete($taxonomy_id);
+			$deleted = $this->taxonomy_repository->delete($taxonomy);
 		} else {
-			$deleted = $this->taxonomy_repository->trash($taxonomy_id);
+			$deleted = $this->taxonomy_repository->trash($taxonomy);
 		}
 
 		if ( $deleted instanceof \WP_Error ) {
diff --git a/src/api/endpoints/class-tainacan-rest-terms-controller.php b/src/api/endpoints/class-tainacan-rest-terms-controller.php
index 9e0b34891..16c35c483 100644
--- a/src/api/endpoints/class-tainacan-rest-terms-controller.php
+++ b/src/api/endpoints/class-tainacan-rest-terms-controller.php
@@ -149,19 +149,20 @@ class REST_Terms_Controller extends REST_Controller {
 	public function delete_item( $request ) {
 		$term_id = $request['term_id'];
 		$taxonomy_id = $request['taxonomy_id'];
+		
+		$taxonomy = $this->taxonomy_repository->fetch($taxonomy_id);
 
-		$taxonomy = $this->taxonomy_repository->fetch( $taxonomy_id );
-		$taxonomy_name = $taxonomy->get_db_identifier();
-
-		if(!$taxonomy_name){
+		$term = $this->terms_repository->fetch($term_id, $taxonomy);
+		
+		if ( ! $term instanceof Entities\Term ) {
 			return new \WP_REST_Response([
-				'error_message' => 'The ID of taxonomy may be incorrect.'
-			]);
+				'error_message' => __('A term with this ID was not found', 'tainacan' ),
+				'taxonomy_id'   => $taxonomy_id,
+				'term_id'   => $term_id
+			], 400);
 		}
 
-		$delete_args = ['term_id' => $term_id, 'taxonomy' => $taxonomy_name];
-
-		$is_deleted = $this->terms_repository->delete($delete_args);
+		$is_deleted = $this->terms_repository->delete($term);
 
 		return new \WP_REST_Response($is_deleted, 200);
 	}
@@ -375,6 +376,14 @@ class REST_Terms_Controller extends REST_Controller {
 		$taxonomy = $this->taxonomy_repository->fetch($tax_id);
 
 		$term = $this->terms_repository->fetch($term_id, $taxonomy);
+		
+		if ( ! $term instanceof Entities\Term ) {
+			return new \WP_REST_Response([
+				'error_message' => __('A term with this ID was not found', 'tainacan' ),
+				'taxonomy_id'   => $tax_id,
+				'term_id'   => $term_id
+			], 400);
+		}
 
 		return new \WP_REST_Response($this->prepare_item_for_response($term, $request), 200);
 	}
diff --git a/src/assets/css/fonts/TainacanIcons.eot b/src/assets/css/fonts/TainacanIcons.eot
index 3bd535bff..afd4168ff 100644
Binary files a/src/assets/css/fonts/TainacanIcons.eot and b/src/assets/css/fonts/TainacanIcons.eot differ
diff --git a/src/assets/css/fonts/TainacanIcons.otf b/src/assets/css/fonts/TainacanIcons.otf
index b77d36833..925cf21db 100644
Binary files a/src/assets/css/fonts/TainacanIcons.otf and b/src/assets/css/fonts/TainacanIcons.otf differ
diff --git a/src/assets/css/fonts/TainacanIcons.svg b/src/assets/css/fonts/TainacanIcons.svg
index 7b5227799..3f9a5de29 100644
--- a/src/assets/css/fonts/TainacanIcons.svg
+++ b/src/assets/css/fonts/TainacanIcons.svg
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 <metadata>
-Created by FontForge 20170910 at Thu Apr 11 17:41:05 2019
+Created by FontForge 20170910 at Wed May 22 19:09:21 2019
  By Jimmy Wärting
 </metadata>
 <defs>
@@ -15,7 +15,7 @@ Created by FontForge 20170910 at Thu Apr 11 17:41:05 2019
     panose-1="0 0 0 0 0 0 0 0 0 0"
     ascent="750"
     descent="-250"
-    bbox="42 -208 958 708"
+    bbox="42 -209 958 708"
     underline-thickness="50"
     underline-position="-125"
     unicode-range="U+000D-2421"
@@ -51,10 +51,10 @@ t-39.5 27t-48.5 10t-48.5 -10t-39.5 -27t-27 -39.5t-10 -48.5t10 -48.5t27 -39.5t39.
     <glyph glyph-name="uni21B8" unicode="home" 
 d="M208 -125v333h-125l417 375l417 -375h-125v-333h-209v250h-166v-250h-209z" />
     <glyph glyph-name="tour" unicode="tour" 
-d="M792 668q35 0 59 -24.5t24 -59.5v-583q0 -35 -24 -59.5t-59 -24.5h-167l-125 -125l-125 125h-167q-35 0 -59 24.5t-24 59.5v583q0 35 24 59.5t59 24.5h584zM542 84h-84v-83h84v83zM628 324q18 18 28.5 42t10.5 52q0 35 -13 65t-36 52.5t-53 35.5t-65 13q-34 0 -64.5 -13
-t-53.5 -35.5t-36 -52.5t-13 -65h84q0 34 24 58.5t59 24.5t59 -24.5t24 -58.5q0 -35 -24 -59l-52 -53q-23 -23 -36 -53t-13 -65v-20h84q0 23 3.5 40t9.5 30.5t15 24.5t20 22z" />
+d="M125 583q0 35 24 59.5t59 24.5h584q35 0 59 -24.5t24 -59.5v-583q0 -35 -24 -59t-59 -24h-167l-125 -125l-125 125h-167q-35 0 -59 24t-24 59v583zM410 0l90 -90l90 90h202v583h-584v-583h202zM333 375q0 35 13 65t36 53t53.5 36t64.5 13q35 0 65 -13t53 -36t36 -53
+t13 -65q0 -39 -19.5 -63.5t-43 -45t-43 -42.5t-19.5 -57h-84q0 34 9.5 56.5t23 39t30 28t30 23.5t23 26t9.5 35q0 35 -24 59t-59 24t-59 -24t-24 -59h-84zM458 125h84v-83h-84v83z" />
     <glyph glyph-name="processes" unicode="processes" 
-d="M542 458h-126v-291h-83v291h-125l167 167zM792 42l-167 -167l-167 167h126v291h83v-291h125z" />
+d="M458 42h126v291h83v-291h125l-167 -167zM375 625l167 -167h-126v-291h-83v291h-125z" />
     <glyph glyph-name="help" unicode="help" 
 d="M458 83h84v-83h-84v83zM500 666q86 0 162 -32.5t132.5 -89t89.5 -132.5t33 -162t-33 -162t-89.5 -132.5t-132.5 -89.5t-162 -33t-162 33t-132.5 89.5t-89.5 132.5t-33 162t33 162t89.5 132.5t132.5 89t162 32.5zM500 -84q69 0 129.5 26.5t106 71.5t71.5 106t26 130
 t-26 129.5t-71.5 105.5t-106 71.5t-129.5 26.5t-129.5 -26.5t-106 -71.5t-71.5 -105.5t-26 -129.5t26 -130t71.5 -106t106 -71.5t129.5 -26.5zM500 500q35 0 65 -13t53 -36t36 -53t13 -65q0 -39 -19.5 -63.5t-43 -45t-43 -42.5t-19.5 -57h-84q0 34 9.5 56.5t23 39t30 28
@@ -95,9 +95,9 @@ t24 -59.5t59 -24.5zM625 500q0 27 -9.5 49.5t-26.5 39.5t-39.5 26.5t-49.5 9.5t-49.5
 d="M709 417h-417v-84h417v84zM709 250h-417v-83h417v83zM583 83h-291v-83h291v83zM500 584q-17 0 -29.5 -12.5t-12.5 -29.5t12.5 -29.5t29.5 -12.5t29.5 12.5t12.5 29.5t-12.5 29.5t-29.5 12.5zM792 584q35 0 59 -24.5t24 -59.5v-584q0 -35 -24 -59t-59 -24h-584
 q-35 0 -59 24t-24 59v584q0 35 24 59.5t59 24.5h174q14 36 45.5 59.5t72.5 23.5t72.5 -23.5t45.5 -59.5h174z" />
     <glyph glyph-name="download" unicode="download" 
-d="M208 1h584v-84h-584v84zM500 84l-292 292h167v250h250v-250h167z" />
+d="M375 376v250h250v-250h167l-292 -292l-292 292h167zM208 1h584v-84h-584v84z" />
     <glyph glyph-name="upload" unicode="upload" 
-d="M792 500h-584v84h584v-84zM500 417l292 -292h-167v-250h-250v250h-167z" />
+d="M208 125l292 292l292 -292h-167v-250h-250v250h-167zM792 584v-84h-584v84h584z" />
     <glyph glyph-name="playfill" unicode="playfill" 
 d="M500 667q86 0 162 -33t132.5 -89.5t89.5 -132.5t33 -162t-33 -162t-89.5 -132.5t-132.5 -89.5t-162 -33t-162 33t-132.5 89.5t-89.5 132.5t-33 162t33 162t89.5 132.5t132.5 89.5t162 33zM667 250l-250 188v-376z" />
     <glyph glyph-name="play" unicode="play" 
@@ -130,7 +130,7 @@ d="M542 0h-84v84h84v-84zM542 500v-334h-84v334h84z" />
 d="M500 667q87 0 163 -32.5t132.5 -89t89 -132.5t32.5 -163t-32.5 -163t-89 -132.5t-132.5 -89t-163 -32.5t-163 32.5t-132.5 89t-89 132.5t-32.5 163t32.5 163t89 132.5t132.5 89t163 32.5zM559 250l150 150l-59 59l-150 -150l-150 150l-59 -59l150 -150l-150 -150l59 -59
 l150 150l150 -150l59 59z" />
     <glyph glyph-name="repproved" unicode="repproved" 
-d="M559 251l233 -233l-59 -59l-233 233l-233 -233l-59 59l233 233l-233 233l59 59l233 -233l233 233l59 -59z" />
+d="M208 484l59 59l233 -233l233 233l59 -59l-233 -233l233 -233l-59 -59l-233 233l-233 -233l-59 59l233 233z" />
     <glyph glyph-name="arrowleft" unicode="arrowleft" 
 d="M584 42l-209 209l209 209v-418z" />
     <glyph glyph-name="arrowright" unicode="arrowright" 
@@ -168,7 +168,7 @@ t20 29.5t7.5 36v0q0 19 -7.5 36t-20 29.5t-29.5 20t-36 7.5v0z" />
     <glyph glyph-name="notifications" unicode="notifications" 
 d="M500 -167q-35 0 -59 24.5t-24 58.5h166q0 -34 -24 -58.5t-59 -24.5zM833 0v-42h-666v42l83 83v208q0 48 12.5 91t36.5 78t59 59.5t80 34.5v28q0 26 18 44.5t44 18.5t44 -18.5t18 -44.5v-28q45 -10 80 -34.5t59 -59.5t36.5 -78t12.5 -91v-208zM667 291q0 39 -11.5 73
 t-33 59.5t-52.5 40t-70 14.5t-70 -14.5t-52 -40t-32.5 -59.5t-11.5 -73v-250h333v250z" />
-    <glyph glyph-name="more" unicode="more" 
+    <glyph glyph-name="plus" unicode="plus" 
 d="M792 209h-250v-250h-84v250h-250v84h250v250h84v-250h250v-84z" />
     <glyph glyph-name="menu" unicode="menu" 
 d="M125 83h750v-83h-750v83zM125 292h750v-84h-750v84zM875 500v-83h-750v83h750z" />
@@ -188,13 +188,13 @@ d="M459 666h-375v-499h375v499zM917 -167h-375v500h375v-500zM459 -167h-375v250h375
     <glyph glyph-name="viewgallery" unicode="viewgallery" 
 d="M917 418h-167v-334h167v334zM250 84h-167v334h167v-334zM667 -41h-334v584h334v-584z" />
     <glyph glyph-name="sortasc" unicode="sortasc" 
-d="M667 417h-166v83h166v-83zM792 167h-291v83h291v-83zM917 -83h-416v84h416v-84zM251 625l-166 -167h125v-541h83v541h125z" />
+d="M85 457l166 167l167 -167h-125v-541h-83v541h-125zM917 416h-416v83h416v-83zM792 166h-291v83h291v-83zM501 -84v84h166v-84h-166z" />
     <glyph glyph-name="sortdesc" unicode="sortdesc" 
-d="M667 416h-167v84h167v-84zM792 166h-292v84h292v-84zM917 -84h-417v83h417v-83zM292 -1v542h-84v-542h-125l167 -166l167 166h-125z" />
+d="M208 0v542h84v-542h125l-167 -166l-167 166h125zM500 417v84h417v-84h-417zM792 251v-84h-292v84h292zM500 -83v83h167v-83h-167z" />
     <glyph glyph-name="viewrecords" unicode="viewrecords" 
 d="M333 543h-208v-584h208v584zM625 -41h-208v584h208v-584zM917 -41h-208v584h208v-584z" />
     <glyph glyph-name="close" unicode="close" 
-d="M559 251l233 -233l-59 -59l-233 233l-233 -233l-59 59l233 233l-233 233l59 59l233 -233l233 233l59 -59z" />
+d="M208 484l59 59l233 -233l233 233l59 -59l-233 -233l233 -233l-59 -59l-233 233l-233 -233l-59 59l233 233z" />
     <glyph glyph-name="heartoutline" unicode="heartoutline" 
 d="M504 -23q75 68 135.5 124.5t103.5 107t66.5 96.5t23.5 91q0 31 -11 58t-30.5 46.5t-46 30.5t-57.5 11q-24 0 -47.5 -7.5t-43 -20.5t-35 -31.5t-23.5 -39.5h-78q-8 21 -23.5 39.5t-35 31.5t-42.5 20.5t-47 7.5q-31 0 -58 -11t-46.5 -30.5t-30.5 -46.5t-11 -58
 q0 -45 23.5 -91t66.5 -96.5t103.5 -107t134.5 -124.5l5 -4zM688 625q48 0 90 -17.5t72.5 -48.5t48.5 -73t18 -90q0 -59 -25.5 -114t-72.5 -112t-112.5 -119.5t-146.5 -135.5l-60 -55l-60 55q-81 73 -146.5 135.5t-112.5 119.5t-72.5 112t-25.5 114q0 48 18 90t49 73t73 48.5
@@ -238,6 +238,38 @@ d="M936 500q-37 -56 -89 -93v-23q0 -89 -33.5 -179.5t-98 -164t-159.5 -119.5t-218 -
 q18 -9 38.5 -14.5t42.5 -5.5q-36 23 -57.5 62t-21.5 86q0 24 6.5 46.5t17.5 42.5q66 -81 161 -131t207 -55q-4 17 -4 41q0 37 14 69.5t38 56.5t56.5 38t69.5 14q80 0 131 -56q31 6 59.5 17t54.5 26q-22 -65 -79 -99q27 4 53 11t50 18z" />
     <glyph glyph-name="facebook" unicode="facebook" 
 d="M707 668v-167h-83q-22 0 -32 -20.5t-10 -41.5v-105h125v-166h-125v-334h-166v334h-125v166h125v167q0 35 13 65t35.5 53t53 36t64.5 13h125z" />
+    <glyph glyph-name="item" unicode="item" 
+d="M542 625l250 -250v-417q0 -35 -24.5 -59t-59.5 -24h-417q-35 0 -59 24t-24 59l1 584q0 34 24 58.5t59 24.5h250zM500 333h229l-229 229v-229z" />
+    <glyph glyph-name="dincol" unicode="dincol" 
+d="M457 85q1 -6 1 -11.5v-11.5q0 -16 -1.5 -31t-6.5 -30h301v84h-294zM167 502v-219q-47 -12 -84 -43v262h84zM834 542q34 0 58.5 -24.5t24.5 -59.5v-249q0 -35 -24.5 -59.5t-58.5 -24.5h-385q-9 34 -28 63t-45 50.5t-58 35.5t-68 17l1 251q0 35 24 59t59 24h208l83 -83h209
+zM351 -18q5 8 10 19q14 28 14 61q0 6 -0.5 11.5t-1.5 11.5q-2 11 -5 21t-8 19q-18 39 -53.5 61t-77.5 22q-31 0 -62 -13q-34 -17 -56.5 -48t-26.5 -70q-1 -1 0 -2q-1 -5 -1 -13q0 -30 11.5 -56.5t31.5 -46.5t46.5 -31.5t56.5 -11.5q23 0 43 6.5t37 17.5l24 -23v-1l84 -83
+l41 42zM229 0q-26 0 -44.5 18t-18.5 44t18.5 44.5t44.5 18.5t44.5 -18.5t18.5 -44.5t-18.5 -44t-44.5 -18z" />
+    <glyph glyph-name="dinitems" unicode="dinitems" 
+d="M610 669v-87h-307v-318q-31 9 -66 9h-11t-11 -1v310q0 36 26 61.5t62 25.5h307zM917 231v-351q0 -36 -25.5 -62t-62.5 -26h-306l43 43l-106 105q18 42 18 92q0 57 -23.5 105t-63.5 81v188q0 36 25.5 62t61.5 26h176zM806 231l-196 197v-197h196zM478 -165l-44 -44
+l-113 113q-18 -12 -39.5 -19t-44.5 -7q-32 0 -60 12t-49 33t-33 49t-12 60t12.5 60t33.5 49t49 33t59 12q32 0 60 -12t49 -33t33 -49t12 -60q0 -23 -7 -44.5t-19 -39.5zM303 32q0 27 -19.5 46.5t-46.5 19.5q-6 0 -11.5 -1t-10.5 -3q-19 -7 -31.5 -23.5t-12.5 -38.5
+q0 -27 19.5 -46.5t46.5 -19.5t46.5 19.5t19.5 46.5z" />
+    <glyph glyph-name="dinterms" unicode="dinterms" 
+d="M893 183l-88 -100q-15 -20 -37 -30.5t-47 -10.5h-264q1 5 1 10v10q0 45 -16 85t-44 70.5t-66 49.5t-82 23v59q0 23 8.5 43t23 34.5t34.5 23t42 8.5h363q25 0 47 -10.5t37 -30.5l88 -99q24 -30 24 -68t-24 -67zM166 627q-34 0 -58.5 -24t-24.5 -59v-305q36 30 83 44v261
+h501v83h-501zM458 -125l-41 -42l-84 83v1l-24 23q-17 -11 -37 -17.5t-43 -6.5q-30 0 -57 11.5t-46.5 31.5t-31 46.5t-11.5 56.5t11.5 57t31 46.5t46.5 31t57 11.5h10.5t10.5 -2q27 -4 49.5 -16.5t39.5 -32t26.5 -44t9.5 -51.5q0 -22 -6.5 -42.5t-17.5 -37.5l23 -24h1z
+M292 62q0 26 -18.5 44.5t-44.5 18.5t-44.5 -18.5t-18.5 -44.5t18.5 -44t44.5 -18t44.5 18t18.5 44z" />
+    <glyph glyph-name="slideritems" unicode="slideritems" 
+d="M769 250l-186 188v-188h186zM875 250v-333q0 -35 -24.5 -59.5t-59.5 -24.5h-334q-16 0 -30 6q14 26 22.5 56.5t8.5 63.5q0 56 -23 104t-61 82l1 272q0 35 24 59t59 24h166zM291 667h292v-83h-292v-389q-40 14 -84 14v375q0 34 24.5 58.5t59.5 24.5zM42 -41l125 124v-250z
+M375 -42l-125 -124v249z" />
+    <glyph glyph-name="sliderterms" unicode="sliderterms" 
+d="M893 97l-88 -100q-15 -20 -37 -30.5t-47 -10.5h-219q0 51 -20 96.5t-54 79.5t-79.5 53.5t-96.5 19.5h-2v58q0 23 8.5 42.5t23.5 34.5t34.5 23.5t41.5 8.5h363q25 0 47 -10.5t37 -30.5l88 -99q24 -30 24 -68t-24 -67zM167 541q-35 0 -59 -24.5t-24 -58.5v-318q37 34 83 50
+v268h500v83h-500zM292 83v-250l125 125zM209 -167l-1 250l-125 -125z" />
+    <glyph glyph-name="slidercol" unicode="slidercol" 
+d="M485 45q15 -39 15 -84h250v84h-265zM167 463v-266q-47 -16 -84 -50v316h84zM834 502q34 0 58.5 -24t24.5 -59v-250q0 -35 -24.5 -59.5t-58.5 -24.5h-367q-32 57 -89.5 91.5t-127.5 34.5v291q0 35 24.5 59.5t58.5 24.5h209l83 -84h209zM417 -39l-125 -125v250zM83 -39
+l125 125l1 -253z" />
+    <glyph glyph-name="instagram" unicode="instagram" 
+d="M325 667h350q50 0 94 -19t77 -52t52 -77t19 -94v-350q0 -50 -19 -94t-52 -77t-77 -52t-94 -19h-350q-50 0 -94 19t-77 52t-52 77t-19 94v350q0 50 19 94t52 77t77 52t94 19zM317 584q-31 0 -58.5 -12t-48 -32.5t-32.5 -48t-12 -58.5v-366q0 -31 12 -58.5t32.5 -48
+t48 -32.5t58.5 -12h366q31 0 58.5 12t48 32.5t32.5 48t12 58.5v366q0 31 -12 58.5t-32.5 48t-48 32.5t-58.5 12h-366zM719 521q22 0 37 -15t15 -37t-15 -37t-37 -15t-37 15t-15 37t15 37t37 15zM500 458q43 0 81 -16.5t66.5 -44.5t45 -66t16.5 -81t-16.5 -81t-45 -66.5
+t-66.5 -45t-81 -16.5t-81 16.5t-66 45t-44.5 66.5t-16.5 81t16.5 81t44.5 66t66 44.5t81 16.5zM500 375q-26 0 -48.5 -10t-39.5 -27t-27 -39.5t-10 -48.5t10 -48.5t27 -39.5t39.5 -27t48.5 -10t48.5 10t39.5 27t27 39.5t10 48.5t-10 48.5t-27 39.5t-39.5 27t-48.5 10z" />
+    <glyph glyph-name="youtube" unicode="youtube" 
+d="M417 125l216 125l-216 125v-250zM910 372q2 -25 3 -46.5t1 -40.5l3 -35q0 -69 -5 -119t-14 -82q-15 -57 -72 -72q-18 -6 -53 -9t-74 -4.5t-75.5 -2t-57.5 -0.5l-66 -3q-132 0 -213 5t-113 14q-57 15 -72 72q-5 15 -8 37t-5 45t-2.5 45.5t-0.5 38.5l-3 35q0 69 5 119
+t14 82q15 57 72 72q18 6 53 9t74 4.5t75.5 2t57.5 0.5l66 3q132 0 213 -5t113 -14q27 -7 43 -22.5t24.5 -36.5t12 -44.5t4.5 -47.5z" />
+    <glyph glyph-name="minus" unicode="minus" 
+d="M789 208h-584v84h584v-84z" />
     <glyph glyph-name=".notdef" horiz-adv-x="500" 
  />
     <glyph glyph-name="uni0000" horiz-adv-x="0" 
diff --git a/src/assets/css/fonts/TainacanIcons.ttf b/src/assets/css/fonts/TainacanIcons.ttf
index bdb1a8672..8e38c8888 100644
Binary files a/src/assets/css/fonts/TainacanIcons.ttf and b/src/assets/css/fonts/TainacanIcons.ttf differ
diff --git a/src/assets/css/fonts/TainacanIcons.vfc b/src/assets/css/fonts/TainacanIcons.vfc
new file mode 100644
index 000000000..08816e002
Binary files /dev/null and b/src/assets/css/fonts/TainacanIcons.vfc differ
diff --git a/src/assets/css/fonts/TainacanIcons.woff b/src/assets/css/fonts/TainacanIcons.woff
index f730f5cb0..bc0706e41 100644
Binary files a/src/assets/css/fonts/TainacanIcons.woff and b/src/assets/css/fonts/TainacanIcons.woff differ
diff --git a/src/assets/css/fonts/TainacanIcons.woff2 b/src/assets/css/fonts/TainacanIcons.woff2
index 4b4d6f2b7..ca7dae174 100644
Binary files a/src/assets/css/fonts/TainacanIcons.woff2 and b/src/assets/css/fonts/TainacanIcons.woff2 differ
diff --git a/src/assets/css/fonts/tainacanicons.css b/src/assets/css/fonts/tainacanicons.css
index 18289ed4d..7a67b608b 100644
--- a/src/assets/css/fonts/tainacanicons.css
+++ b/src/assets/css/fonts/tainacanicons.css
@@ -147,8 +147,11 @@
 .tainacan-icon-metadata:before {
     content: "metadata";
 }
-.tainacan-icon-more:before {
-    content: "more";
+.tainacan-icon-plus:before {
+    content: "plus";
+}
+.tainacan-icon-minus:before {
+    content: "minus";
 }
 .tainacan-icon-showmore:before {
     content: "showmore";
@@ -279,6 +282,27 @@
 .tainacan-icon-twitter:before {
     content: "twitter";
 }
+.tainacan-icon-youtube:before {
+    content: "facebook";
+}
+.tainacan-icon-slidercol:before {
+    content: "slidercol";
+}
+.tainacan-icon-slideritems:before {
+    content: "slideritems";
+}
+.tainacan-icon-sliderterms:before {
+    content: "sliderterms";
+}
+.tainacan-icon-dincol:before {
+    content: "dincol";
+}
+.tainacan-icon-dinitems:before {
+    content: "dinitems";
+}
+.tainacan-icon-dinterms:before {
+    content: "dinterms";
+}
 
 .tainacan-icon-18px.tainacan-icon-set, 
 .tainacan-icon-18px.tainacan-icon:before {
diff --git a/src/assets/css/tainacan-gutenberg-block-collections-list.css b/src/assets/css/tainacan-gutenberg-block-collections-list.css
index 3215fbfea..b514aeaf4 100644
--- a/src/assets/css/tainacan-gutenberg-block-collections-list.css
+++ b/src/assets/css/tainacan-gutenberg-block-collections-list.css
@@ -72,6 +72,9 @@
           width: 95%; } }
       .wp-block-tainacan-modal .modal-search-area .components-base-control label {
         text-align: center; }
+  .wp-block-tainacan-modal .modal-radio-area-label {
+    font-weight: bold;
+    margin-left: 1.75rem; }
   .wp-block-tainacan-modal .modal-checkbox-list,
   .wp-block-tainacan-modal .modal-radio-list .components-base-control__field {
     padding: 0;
diff --git a/src/assets/css/tainacan-gutenberg-block-collections-list.css.map b/src/assets/css/tainacan-gutenberg-block-collections-list.css.map
index a923d8255..a8899682b 100644
--- a/src/assets/css/tainacan-gutenberg-block-collections-list.css.map
+++ b/src/assets/css/tainacan-gutenberg-block-collections-list.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../../gutenberg-blocks/gutenberg-blocks-style.scss","../../gutenberg-blocks/tainacan-collections/collections-list/collections-list.scss"],
 "names": [],
 "file": "tainacan-gutenberg-block-collections-list.css"
diff --git a/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css b/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css
index 65088a82b..e8e666a93 100644
--- a/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css
+++ b/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css
@@ -72,6 +72,9 @@
           width: 95%; } }
       .wp-block-tainacan-modal .modal-search-area .components-base-control label {
         text-align: center; }
+  .wp-block-tainacan-modal .modal-radio-area-label {
+    font-weight: bold;
+    margin-left: 1.75rem; }
   .wp-block-tainacan-modal .modal-checkbox-list,
   .wp-block-tainacan-modal .modal-radio-list .components-base-control__field {
     padding: 0;
@@ -179,7 +182,7 @@
     display: flex;
     width: 100%;
     align-items: stretch;
-    text-decoration: none; }
+    text-decoration: none !important; }
     .wp-block-tainacan-dynamic-items-list .dynamic-items-collection-header:hover {
       text-decoration: none; }
     .wp-block-tainacan-dynamic-items-list .dynamic-items-collection-header .collection-name {
@@ -268,6 +271,7 @@
           border-color: #dbdbdb !important; } }
     .wp-block-tainacan-dynamic-items-list .dynamic-items-search-bar button {
       margin-right: 0.75rem;
+      padding: 0 0.35rem;
       min-height: 28px;
       z-index: 2;
       border: none;
diff --git a/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css.map b/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css.map
index 6afab6e58..19c80e746 100644
--- a/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css.map
+++ b/src/assets/css/tainacan-gutenberg-block-dynamic-items-list.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../../gutenberg-blocks/gutenberg-blocks-style.scss","../../gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list.scss"],
 "names": [],
 "file": "tainacan-gutenberg-block-dynamic-items-list.css"
diff --git a/src/assets/css/tainacan-gutenberg-block-facets-list.css b/src/assets/css/tainacan-gutenberg-block-facets-list.css
new file mode 100644
index 000000000..76167e77c
--- /dev/null
+++ b/src/assets/css/tainacan-gutenberg-block-facets-list.css
@@ -0,0 +1,484 @@
+.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 .modal-search-area {
+    display: flex;
+    justify-content: center;
+    margin-bottom: 24px; }
+    .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 label {
+        text-align: center; }
+  .wp-block-tainacan-modal .modal-radio-area-label {
+    font-weight: bold;
+    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; }
+    .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-facets-list {
+  margin: 2rem 0px; }
+  .wp-block-tainacan-facets-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-facets-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-facets-list .facets-collection-header {
+    display: flex;
+    width: 100%;
+    align-items: stretch;
+    text-decoration: none !important; }
+    .wp-block-tainacan-facets-list .facets-collection-header:hover {
+      text-decoration: none; }
+    .wp-block-tainacan-facets-list .facets-collection-header .collection-name {
+      width: auto;
+      min-width: 350px;
+      flex-grow: 1;
+      padding: 1rem 100px 1rem 1rem;
+      text-align: right;
+      line-height: 1.5rem;
+      min-height: 165px;
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+      background-color: #454647; }
+      .wp-block-tainacan-facets-list .facets-collection-header .collection-name h3 {
+        color: white;
+        text-decoration: none;
+        font-size: 1.3rem; }
+        .wp-block-tainacan-facets-list .facets-collection-header .collection-name h3:hover {
+          text-decoration: none; }
+      .wp-block-tainacan-facets-list .facets-collection-header .collection-name span.label {
+        font-weight: normal;
+        font-size: 1rem; }
+      .wp-block-tainacan-facets-list .facets-collection-header .collection-name.only-collection-name {
+        justify-content: center;
+        padding: 1rem; }
+        .wp-block-tainacan-facets-list .facets-collection-header .collection-name.only-collection-name h3 {
+          text-align: center;
+          font-size: 1.75rem; }
+    .wp-block-tainacan-facets-list .facets-collection-header .collection-thumbnail {
+      height: 145px;
+      width: 145px;
+      background-size: cover;
+      background-position: center;
+      border-radius: 80px;
+      border: 4px solid white;
+      margin: 10px;
+      flex-shrink: 0;
+      position: relative;
+      margin-left: -155px;
+      left: 82px;
+      background-color: #dbdbdb; }
+    .wp-block-tainacan-facets-list .facets-collection-header .collection-header-image {
+      width: auto;
+      min-width: 150px;
+      min-height: 165px;
+      flex-grow: 2;
+      background-size: cover;
+      background-position: center;
+      background-color: #dbdbdb; }
+    @media only screen and (max-width: 1024px) {
+      .wp-block-tainacan-facets-list .facets-collection-header {
+        flex-wrap: wrap-reverse; }
+        .wp-block-tainacan-facets-list .facets-collection-header .collection-name {
+          width: 100% !important;
+          min-width: 100% !important;
+          justify-content: center !important;
+          text-align: center !important;
+          padding: 64px 1rem 0rem 1rem; }
+          .wp-block-tainacan-facets-list .facets-collection-header .collection-name h3 {
+            margin-bottom: 1rem; }
+        .wp-block-tainacan-facets-list .facets-collection-header .collection-thumbnail {
+          left: calc(-50% + 78px) !important;
+          top: -78px !important; }
+        .wp-block-tainacan-facets-list .facets-collection-header .collection-header-image {
+          background-color: transparent; } }
+  .wp-block-tainacan-facets-list .facets-search-bar {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #cbcbcb;
+    padding: 1.00rem 0.5rem 0.75rem 0.5rem; }
+    @media only screen and (max-width: 768px) {
+      .wp-block-tainacan-facets-list .facets-search-bar {
+        flex-wrap: wrap; }
+        .wp-block-tainacan-facets-list .facets-search-bar .search-button {
+          order: 4;
+          position: absolute;
+          margin-top: 37px; }
+        .wp-block-tainacan-facets-list .facets-search-bar input {
+          width: 100% !important;
+          order: 5;
+          margin-top: 8px;
+          margin-left: 0px !important;
+          padding-left: 4px !important;
+          border-color: #dbdbdb !important; } }
+    .wp-block-tainacan-facets-list .facets-search-bar button {
+      margin-right: 0.75rem;
+      padding: 0 0.35rem;
+      min-height: 28px;
+      z-index: 2;
+      border: none;
+      background: transparent;
+      cursor: pointer; }
+      .wp-block-tainacan-facets-list .facets-search-bar button svg {
+        fill: #cbcbcb;
+        transition: fill 0.4s ease; }
+      .wp-block-tainacan-facets-list .facets-search-bar button:hover svg {
+        fill: #545758; }
+      .wp-block-tainacan-facets-list .facets-search-bar button:focus, .wp-block-tainacan-facets-list .facets-search-bar button:active {
+        border: none;
+        box-shadow: none; }
+      .wp-block-tainacan-facets-list .facets-search-bar button.sorting-button-selected svg {
+        fill: #545758; }
+      .wp-block-tainacan-facets-list .facets-search-bar button.next-button {
+        margin-right: 0rem;
+        padding: 0; }
+        .wp-block-tainacan-facets-list .facets-search-bar button.next-button svg {
+          fill: #298596; }
+      .wp-block-tainacan-facets-list .facets-search-bar button.previous-button {
+        margin-left: auto;
+        margin-right: 1rem;
+        padding: 0; }
+        .wp-block-tainacan-facets-list .facets-search-bar button.previous-button svg {
+          fill: #298596; }
+      .wp-block-tainacan-facets-list .facets-search-bar button[disabled] svg {
+        fill: #f2f2f2;
+        cursor: not-allowed; }
+    .wp-block-tainacan-facets-list .facets-search-bar input {
+      height: 32px;
+      width: 20%;
+      border-radius: 0;
+      margin-left: -52px;
+      padding-left: 52px;
+      border: 1px solid white;
+      transition: border-color 0.7s ease, width 0.5s ease-in; }
+      .wp-block-tainacan-facets-list .facets-search-bar input:focus, .wp-block-tainacan-facets-list .facets-search-bar input:active, .wp-block-tainacan-facets-list .facets-search-bar input:hover {
+        width: 100%;
+        border: 1px solid #cbcbcb;
+        box-shadow: none; }
+  .wp-block-tainacan-facets-list ul.facets-list.facets-layout-grid,
+  .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-grid {
+    padding: 0;
+    display: -ms-grid;
+    display: grid;
+    grid-template-columns: repeat(auto-fill, 220px);
+    grid-gap: 0px;
+    justify-content: space-evenly;
+    list-style-type: none; }
+    .wp-block-tainacan-facets-list ul.facets-list.facets-layout-grid li.facet-list-item,
+    .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-grid li.facet-list-item {
+      position: relative;
+      display: block;
+      margin: 12px;
+      width: 185px; }
+      .wp-block-tainacan-facets-list ul.facets-list.facets-layout-grid li.facet-list-item a,
+      .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-grid li.facet-list-item a {
+        color: #454647;
+        font-weight: bold;
+        line-height: normal; }
+      .wp-block-tainacan-facets-list ul.facets-list.facets-layout-grid li.facet-list-item img,
+      .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-grid li.facet-list-item img {
+        height: auto;
+        width: 185px;
+        min-width: 185px;
+        padding: 0px;
+        margin-bottom: 0.5rem; }
+      .wp-block-tainacan-facets-list ul.facets-list.facets-layout-grid li.facet-list-item span.facet-item-count,
+      .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-grid li.facet-list-item span.facet-item-count {
+        color: #cbcbcb; }
+      .wp-block-tainacan-facets-list ul.facets-list.facets-layout-grid li.facet-list-item.facet-without-image img,
+      .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-grid li.facet-list-item.facet-without-image img {
+        display: none; }
+      .wp-block-tainacan-facets-list ul.facets-list.facets-layout-grid li.facet-list-item:hover a,
+      .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-grid li.facet-list-item:hover a {
+        color: #454647;
+        text-decoration: none; }
+  .wp-block-tainacan-facets-list ul.facets-list-edit li.facet-list-item {
+    display: flex;
+    align-items: flex-start; }
+    .wp-block-tainacan-facets-list ul.facets-list-edit li.facet-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-facets-list ul.facets-list-edit li.facet-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-facets-list ul.facets-list-edit li.facet-list-item:hover button:hover {
+      background-color: white !important;
+      border: 1px solid #cbcbcb !important; }
+  @media only screen and (max-width: 498px) {
+    .wp-block-tainacan-facets-list ul.facets-list.facets-layout-grid,
+    .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-grid {
+      grid-template-columns: repeat(auto-fill, 100%); }
+      .wp-block-tainacan-facets-list ul.facets-list.facets-layout-grid li.facet-list-item,
+      .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-grid li.facet-list-item {
+        width: 100%; }
+        .wp-block-tainacan-facets-list ul.facets-list.facets-layout-grid li.facet-list-item img,
+        .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-grid li.facet-list-item img {
+          width: 100%; } }
+  .wp-block-tainacan-facets-list ul.facets-list.facets-layout-list,
+  .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-list {
+    padding: 0;
+    display: block;
+    list-style-type: none; }
+    .wp-block-tainacan-facets-list ul.facets-list.facets-layout-list li.facet-list-item,
+    .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-list li.facet-list-item {
+      position: relative;
+      display: inline-block;
+      margin: 12px;
+      min-height: 24px;
+      min-width: 22%;
+      width: 22%; }
+      .wp-block-tainacan-facets-list ul.facets-list.facets-layout-list li.facet-list-item a,
+      .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-list li.facet-list-item a {
+        color: #454647;
+        display: flex;
+        align-items: center;
+        height: 54px; }
+      .wp-block-tainacan-facets-list ul.facets-list.facets-layout-list li.facet-list-item img,
+      .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-list li.facet-list-item img {
+        height: auto;
+        width: 54px;
+        min-width: 54px;
+        padding: 0px;
+        margin-right: 20px; }
+      .wp-block-tainacan-facets-list ul.facets-list.facets-layout-list li.facet-list-item.facet-without-image,
+      .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-list li.facet-list-item.facet-without-image {
+        min-height: 0.875rem; }
+        .wp-block-tainacan-facets-list ul.facets-list.facets-layout-list li.facet-list-item.facet-without-image a,
+        .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-list li.facet-list-item.facet-without-image a {
+          height: 0.875rem; }
+        .wp-block-tainacan-facets-list ul.facets-list.facets-layout-list li.facet-list-item.facet-without-image img,
+        .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-list li.facet-list-item.facet-without-image img {
+          display: none; }
+      .wp-block-tainacan-facets-list ul.facets-list.facets-layout-list li.facet-list-item span.facet-item-count,
+      .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-list li.facet-list-item span.facet-item-count {
+        color: #cbcbcb; }
+      .wp-block-tainacan-facets-list ul.facets-list.facets-layout-list li.facet-list-item:hover a,
+      .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-list li.facet-list-item:hover a {
+        color: #454647;
+        text-decoration: none; }
+  .wp-block-tainacan-facets-list ul.facets-list.facets-layout-cloud,
+  .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-cloud {
+    padding: 0;
+    display: block;
+    list-style-type: none;
+    text-align: center; }
+    .wp-block-tainacan-facets-list ul.facets-list.facets-layout-cloud li.facet-list-item,
+    .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-cloud li.facet-list-item {
+      position: relative;
+      display: inline-block;
+      margin: 5px 12px;
+      line-height: normal;
+      vertical-align: middle; }
+      .wp-block-tainacan-facets-list ul.facets-list.facets-layout-cloud li.facet-list-item a,
+      .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-cloud li.facet-list-item a {
+        color: #454647;
+        display: flex;
+        align-items: center;
+        height: 54px; }
+      .wp-block-tainacan-facets-list ul.facets-list.facets-layout-cloud li.facet-list-item img,
+      .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-cloud li.facet-list-item img {
+        height: auto;
+        width: 54px;
+        min-width: 54px;
+        padding: 0px;
+        margin-right: 20px; }
+      .wp-block-tainacan-facets-list ul.facets-list.facets-layout-cloud li.facet-list-item.facet-without-image img,
+      .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-cloud li.facet-list-item.facet-without-image img {
+        display: none; }
+      .wp-block-tainacan-facets-list ul.facets-list.facets-layout-cloud li.facet-list-item span.facet-item-count,
+      .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-cloud li.facet-list-item span.facet-item-count {
+        color: #cbcbcb; }
+      .wp-block-tainacan-facets-list ul.facets-list.facets-layout-cloud li.facet-list-item:hover a,
+      .wp-block-tainacan-facets-list ul.facets-list-edit.facets-layout-cloud li.facet-list-item:hover a {
+        color: #298596;
+        text-decoration: none; }
+  .wp-block-tainacan-facets-list .show-more-button {
+    margin: 12px auto;
+    padding: 0.25rem;
+    display: block;
+    background: #298596;
+    border: none;
+    height: 24px;
+    width: 24px;
+    cursor: pointer; }
+    .wp-block-tainacan-facets-list .show-more-button[disabled] {
+      background-color: #cbcbcb; }
+    .wp-block-tainacan-facets-list .show-more-button i > svg {
+      fill: white; }
+
+/*# sourceMappingURL=tainacan-gutenberg-block-facets-list.css.map */
diff --git a/src/assets/css/tainacan-gutenberg-block-facets-list.css.map b/src/assets/css/tainacan-gutenberg-block-facets-list.css.map
new file mode 100644
index 000000000..11a7a7f05
--- /dev/null
+++ b/src/assets/css/tainacan-gutenberg-block-facets-list.css.map
@@ -0,0 +1,7 @@
+{
+"version": 3,
+"mappings": "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",
+"sources": ["../../gutenberg-blocks/gutenberg-blocks-style.scss","../../gutenberg-blocks/tainacan-facets/facets-list/facets-list.scss"],
+"names": [],
+"file": "tainacan-gutenberg-block-facets-list.css"
+}
diff --git a/src/assets/css/tainacan-gutenberg-block-items-list.css b/src/assets/css/tainacan-gutenberg-block-items-list.css
index cc613e8a4..f11674c8e 100644
--- a/src/assets/css/tainacan-gutenberg-block-items-list.css
+++ b/src/assets/css/tainacan-gutenberg-block-items-list.css
@@ -72,6 +72,9 @@
           width: 95%; } }
       .wp-block-tainacan-modal .modal-search-area .components-base-control label {
         text-align: center; }
+  .wp-block-tainacan-modal .modal-radio-area-label {
+    font-weight: bold;
+    margin-left: 1.75rem; }
   .wp-block-tainacan-modal .modal-checkbox-list,
   .wp-block-tainacan-modal .modal-radio-list .components-base-control__field {
     padding: 0;
diff --git a/src/assets/css/tainacan-gutenberg-block-items-list.css.map b/src/assets/css/tainacan-gutenberg-block-items-list.css.map
index 07c6318a8..1a58292e0 100644
--- a/src/assets/css/tainacan-gutenberg-block-items-list.css.map
+++ b/src/assets/css/tainacan-gutenberg-block-items-list.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../../gutenberg-blocks/gutenberg-blocks-style.scss","../../gutenberg-blocks/tainacan-items/items-list/items-list.scss"],
 "names": [],
 "file": "tainacan-gutenberg-block-items-list.css"
diff --git a/src/assets/css/tainacan-gutenberg-block-terms-list.css b/src/assets/css/tainacan-gutenberg-block-terms-list.css
index 4b21c0bbe..71716e83a 100644
--- a/src/assets/css/tainacan-gutenberg-block-terms-list.css
+++ b/src/assets/css/tainacan-gutenberg-block-terms-list.css
@@ -72,6 +72,9 @@
           width: 95%; } }
       .wp-block-tainacan-modal .modal-search-area .components-base-control label {
         text-align: center; }
+  .wp-block-tainacan-modal .modal-radio-area-label {
+    font-weight: bold;
+    margin-left: 1.75rem; }
   .wp-block-tainacan-modal .modal-checkbox-list,
   .wp-block-tainacan-modal .modal-radio-list .components-base-control__field {
     padding: 0;
diff --git a/src/assets/css/tainacan-gutenberg-block-terms-list.css.map b/src/assets/css/tainacan-gutenberg-block-terms-list.css.map
index d88afdebe..a73a9c4e6 100644
--- a/src/assets/css/tainacan-gutenberg-block-terms-list.css.map
+++ b/src/assets/css/tainacan-gutenberg-block-terms-list.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../../gutenberg-blocks/gutenberg-blocks-style.scss","../../gutenberg-blocks/tainacan-terms/terms-list/terms-list.scss"],
 "names": [],
 "file": "tainacan-gutenberg-block-terms-list.css"
diff --git a/src/classes/class-tainacan-media.php b/src/classes/class-tainacan-media.php
index db7d587da..18e1e5172 100644
--- a/src/classes/class-tainacan-media.php
+++ b/src/classes/class-tainacan-media.php
@@ -167,11 +167,10 @@ class Media {
 	 * @return blob           bitstream of the image in jpg format
 	 */
 	public function get_pdf_cover($filepath) {
-		
 		$blob = apply_filters('tainacan-extract-pdf-cover', null, $filepath);
-        if ($blob) {
-            return $blob;
-        }
+		if ($blob) {
+			return $blob;
+		}
 		
 		if (!class_exists('\Imagick')) {
 			return null;
@@ -180,13 +179,31 @@ class Media {
 		if ( mime_content_type($filepath) != 'application/pdf') {
 			return null;
 		}
+
+		if ( !is_readable( realpath($filepath) ) ) {
+			return null;
+		}
 		
-		$imagick = new \Imagick();
-		$imagick->setResolution(72,72);
-		$imagick->readImage($filepath . '[0]');  
-        //$imagick->setIteratorIndex(0);
-        $imagick->setImageFormat('jpg');
-        return $imagick->getImageBlob();
+		try {
+			register_shutdown_function(array($this, 'shutdown_function'));
+			$this->THROW_EXCPTION_ON_FATAL_ERROR = true; 
+			$imagick = new \Imagick();
+			$imagick->setResolution(72,72);
+			$imagick->readImage($filepath . '[0]');
+			//$imagick->setIteratorIndex(0);
+			$imagick->setImageFormat('jpg');
+			$this->THROW_EXCPTION_ON_FATAL_ERROR = false;
+			return $imagick->getImageBlob();
+		} catch(\Exception $e) {
+			return null;
+		} catch (\Error $ex) {
+			return null;
+		}
+	}
+
+	private $THROW_EXCPTION_ON_FATAL_ERROR = false;
+	public function shutdown_function() {
+		if( $this->THROW_EXCPTION_ON_FATAL_ERROR ) 
+			throw new \Exception("fatal error");
 	}
-	
 }
\ No newline at end of file
diff --git a/src/classes/entities/class-tainacan-filter.php b/src/classes/entities/class-tainacan-filter.php
index 2700a706b..f34a4bdc2 100644
--- a/src/classes/entities/class-tainacan-filter.php
+++ b/src/classes/entities/class-tainacan-filter.php
@@ -16,6 +16,7 @@ class Filter extends Entity {
         $order,
         $color,
         $metadatum,
+        $metadatum_id,
         $max_options,
         $filter_type,
         $filter_type_options;
@@ -40,17 +41,21 @@ class Filter extends Entity {
 	 */
 	public function _toArray(){
 		$filter_array = parent::_toArray();
-		$metadatum_id = $filter_array['metadatum'];
+		$metadatum_id = $filter_array['metadatum_id'];
 		$metadatum = $this->get_metadatum();
 
 		$filter_array['metadatum'] = [];
 		$filter_array['metadatum']['metadatum_id'] = $metadatum_id;
-		$filter_array['metadatum']['metadatum_name'] = $metadatum->get_name();
-		$meta_object = $metadatum->get_metadata_type_object();
-		if (is_object($meta_object)) {
-			$filter_array['metadatum']['metadata_type_object'] = $meta_object->_toArray();
+		
+		if ($metadatum instanceof Metadatum) {
+			$filter_array['metadatum']['metadatum_name'] = $metadatum->get_name();
+			$meta_object = $metadatum->get_metadata_type_object();
+			if (is_object($meta_object)) {
+				$filter_array['metadatum']['metadata_type_object'] = $meta_object->_toArray();
+			}
 		}
 		
+		
 		return apply_filters('tainacan-filter-to-array', $filter_array, $this);
 	}
 
@@ -106,14 +111,32 @@ class Filter extends Entity {
     }
 
 	/**
-	 * Return the metadatum
+	 * Return the metadatum ID
 	 *
-	 * @return Metadatum
+	 * @return integer Metadatum ID
+	 */
+    function get_metadatum_id() {
+        return $this->get_mapped_property('metadatum_id');
+    }
+    
+    /**
+	 * Return the metadatum object
+	 *
+	 * @return Metadatum | null
 	 * @throws \Exception
 	 */
     function get_metadatum() {
-        $id = $this->get_mapped_property('metadatum');
-        return new Metadatum( $id );
+        if (isset($this->metadatum)) {
+            return $this->metadatum;
+        }
+        $id = $this->get_metadatum_id();
+        $metadatum = \Tainacan\Repositories\Metadata::get_instance()->fetch((int) $id);
+        if ($metadatum instanceof Metadatum) {
+            $this->metadatum = $metadatum;
+            return $metadatum;
+        } else {
+            return null;
+        }
     }
 
     /**
@@ -124,12 +147,12 @@ class Filter extends Entity {
     function get_filter_type_object(){
         $class_name = $this->get_filter_type();
 
-        if( !class_exists( $class_name ) ){
-            return false;
-        }
+		if( !class_exists( $class_name ) ){
+			return null;
+		}
 
         $object_type = new $class_name();
-        $object_type->set_options(  $this->get_filter_options() );
+        $object_type->set_options(  $this->get_filter_type_options() );
         return $object_type;
     }
 
@@ -147,7 +170,7 @@ class Filter extends Entity {
      *
      * @return array Configurations for the filter type object
      */
-    function get_filter_options(){
+    function get_filter_type_options(){
         return $this->get_mapped_property('filter_type_options');
     }
 
@@ -192,15 +215,27 @@ class Filter extends Entity {
     }
 
     /**
-     * Define the filter metadatum
+     * Define the filter metadatum passing an object
      * 
      * @param \Tainacan\Entities\Metadatum
      * @return void
      */
-    function set_metadatum( $value ){
-    	$id = ( $value instanceof Metadatum ) ? $value->get_id() : $value;
+    function set_metadatum( \Tainacan\Entities\Metadatum $value ){
+    	$id = $value->get_id();
 
-        $this->set_mapped_property('metadatum', $id);
+        $this->set_metadatum_id($id);
+        $this->metadatum = $value;
+    }
+    
+    /**
+     * Define the filter metadatum passing an ID
+     * 
+     * @param int $value the metadatum ID
+     * @return void
+     */
+    function set_metadatum_id( $value ){
+        unset($this->metadatum);
+        $this->set_mapped_property('metadatum_id', $value);
     }
 
     /**
@@ -258,6 +293,18 @@ class Filter extends Entity {
             $this->add_error($metadatum, $message);
         }
 
+        $this->add_error('filter_type_options', $is_valid);
+
         return false;
     }
+
+    /**
+     * Set Filter type options
+     *
+     * @param [string || integer] $value
+     * @return void
+     */
+    function set_filter_type_options( $value ){
+        $this->set_mapped_property('filter_type_options', $value);
+    }
 }
\ 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 86e4de177..70e965372 100644
--- a/src/classes/entities/class-tainacan-metadatum.php
+++ b/src/classes/entities/class-tainacan-metadatum.php
@@ -172,9 +172,11 @@ class Metadatum extends Entity {
      */
     function get_metadata_type_object(){
         $class_name = $this->get_metadata_type();
-		if (empty($class_name)) {
+
+		if( !class_exists( $class_name ) ){
 			return null;
-		}
+        }
+        
         $object_type = new $class_name();
         $object_type->set_options(  $this->get_metadata_type_options() );
     	return $object_type;
diff --git a/src/classes/filter-types/autocomplete/class-tainacan-autocomplete.php b/src/classes/filter-types/autocomplete/class-tainacan-autocomplete.php
index 28c150617..a0d75df4d 100644
--- a/src/classes/filter-types/autocomplete/class-tainacan-autocomplete.php
+++ b/src/classes/filter-types/autocomplete/class-tainacan-autocomplete.php
@@ -8,12 +8,10 @@ defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
  */
 class Autocomplete extends Filter_Type {
 
-    //protected $default_max_options = -1;
-    protected $use_max_options = false;
-
     function __construct(){
         $this->set_supported_types(['string','long_string','item']);
         $this->set_component('tainacan-filter-autocomplete');
+        $this->set_use_max_options(false);
         $this->set_preview_template('
             <div>
                 <div class="taginput control is-expanded has-selected">
@@ -50,7 +48,6 @@ class Autocomplete extends Filter_Type {
     public function render( $filter ){
         return '<tainacan-filter-autocomplete name="'.$filter->get_name().'"
                                         collection_id="'.$filter->get_collection_id().'"
-                                        filter_type="'.$filter->get_metadatum()->get_metadata_type().'"
                                         metadatum_id="'.$filter->get_metadatum()->get_id().'"></tainacan-filter-autocomplete>';
     }
 }
\ No newline at end of file
diff --git a/src/classes/filter-types/checkbox/class-tainacan-checkbox.php b/src/classes/filter-types/checkbox/class-tainacan-checkbox.php
index 1e2befc3d..1354eff94 100644
--- a/src/classes/filter-types/checkbox/class-tainacan-checkbox.php
+++ b/src/classes/filter-types/checkbox/class-tainacan-checkbox.php
@@ -64,8 +64,7 @@ class Checkbox extends Filter_Type {
 
     public function render( $filter ){
         return '<tainacan-filter-checkbox name="'.$filter->get_name().'"
-                                        filter_type="'.$filter->get_metadatum()->get_metadata_type().'"
                                         collection_id="'.$filter->get_collection_id().'"
-                                        metadatum_id="'.$filter->get_metadatum()->get_id().'"></tainacan-filter-selectbox>';
+                                        metadatum_id="'.$filter->get_metadatum_id().'"></tainacan-filter-selectbox>';
     }
 }
\ No newline at end of file
diff --git a/src/classes/filter-types/custom-interval/CustomInterval.vue b/src/classes/filter-types/custom-interval/CustomInterval.vue
index 610ef39cb..18e310397 100644
--- a/src/classes/filter-types/custom-interval/CustomInterval.vue
+++ b/src/classes/filter-types/custom-interval/CustomInterval.vue
@@ -9,7 +9,19 @@
                     size="is-small"
                     @focus="isTouched = true"
                     @input="validate_values()"
-                    icon="calendar-today"/>
+                    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"
@@ -18,26 +30,34 @@
                     size="is-small"
                     @input="validate_values()"
                     @focus="isTouched = true"
-                    icon="calendar-today"/>
+                    editable
+                    :date-formatter="(date) => dateFormatter(date)"
+                    :date-parser="(date) => dateParser(date)"
+                    icon="calendar-today"
+                    :day-names="[
+                        $i18n.get('datepicker_short_sunday'),
+                        $i18n.get('datepicker_short_monday'),
+                        $i18n.get('datepicker_short_tuesday'),
+                        $i18n.get('datepicker_short_wednesday'),
+                        $i18n.get('datepicker_short_thursday'),
+                        $i18n.get('datepicker_short_friday'),
+                        $i18n.get('datepicker_short_saturday'),
+                    ]"/>
         </div>
 
         <!-- Numeric -->
         <div v-else>
-            <b-input
+            <b-numberinput
                     :aria-labelledby="labelId"
                     size="is-small"
-                    type="number"
                     step="any"
-                    autocomplete="off"
                     @input="validate_values()"
                     v-model="value_init"/>
             <p class="is-size-7 has-text-centered is-marginless">{{ $i18n.get('label_until') }}</p>
-            <b-input
+            <b-numberinput
                     :aria-labelledby="labelId"
                     size="is-small"
-                    type="number"
                     step="any"
-                    autocomplete="off"
                     @input="validate_values()"
                     @focus="isTouched = true"
                     v-model="value_end"/>
@@ -47,12 +67,12 @@
 
 <script>
     import { tainacan as axios } from '../../../js/axios/axios';
-    import { wpAjax } from "../../../admin/js/mixins";
+    import { wpAjax, dateInter } from "../../../admin/js/mixins";
+    import moment from 'moment';
 
     export default {
-        mixins: [ wpAjax ],
-        created(){
-            const vm = this;
+        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;
 
@@ -66,9 +86,9 @@
                 .then( res => {
                     let result = res.data;
                     if( result && result.metadata_type ){
-                        vm.metadatum_object = result;
-                        vm.type = ( result.metadata_type === 'Tainacan\\Metadata_Types\\Date') ? 'date' : 'numeric';
-                        vm.selectedValues();
+                        this.metadatum_object = result;
+                        this.type = ( result.metadata_type === 'Tainacan\\Metadata_Types\\Date') ? 'date' : 'numeric';
+                        this.selectedValues();
                     }
                 })
                 .catch(error => {
@@ -89,7 +109,7 @@
                 type: 'numeric',
                 collection: '',
                 metadatum: '',
-                metadatum_object: {},
+                metadatum_object: {}
             }
         },
         props: {
@@ -140,7 +160,7 @@
                         return;
                     }
                 }
-                this.emit( this );
+                this.emit();
             }, 1000),
             // message for error
             error_message(){
@@ -148,11 +168,17 @@
 
                 this.$toast.open({
                     duration: 3000,
-                    message: `First value should be lower than second value`,
+                    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;
@@ -174,7 +200,7 @@
                     if (metadata.value[0] != undefined && metadata.value[1] != undefined) {
                         this.$eventBusSearch.$emit( 'sendValuesToTags', {
                             filterId: this.filter.id,
-                            value: metadata.value[0] + ' - ' + metadata.value[1]
+                            value: this.parseDateToNavigatorLanguage(metadata.value[0]) + ' - ' + this.parseDateToNavigatorLanguage(metadata.value[1])
                         });
                     }
 
@@ -222,69 +248,68 @@
                     this.isTouched = false;
                 }
             },
-
             // emit the operation for listeners
-            emit: ( vm ) => {
+            emit() {
                 let values = [];
                 let type = '';
 
-                if( vm.type === 'date' ){
+                if( this.type === 'date' ){
 
-                    if( vm.date_init === null && vm.date_end === null ){
+                    if( this.date_init === null && this.date_end === null ){
                       values = [];
                       type = 'DATE';
-                      vm.isValid = false;
-                      vm.clear = true;
+                      this.isValid = false;
+                      this.clear = true;
                     } else {
-                      let date_init = vm.date_init.getUTCFullYear() + '-' +
-                          ('00' + (vm.date_init.getUTCMonth() + 1)).slice(-2) + '-' +
-                          ('00' + vm.date_init.getUTCDate()).slice(-2);
-                      let date_end = vm.date_end.getUTCFullYear() + '-' +
-                          ('00' + (vm.date_end.getUTCMonth() + 1)).slice(-2) + '-' +
-                          ('00' + vm.date_end.getUTCDate()).slice(-2);
+                      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';
-                      vm.isValid = true;
-                      vm.clear = false;
+                      this.isValid = true;
+                      this.clear = false;
                     }
                 } else {
-                    if( vm.value_init === null || vm.value_end === null
-                      || vm.value_init === '' || vm.value_end === ''){
+                    if( this.value_init === null || this.value_end === null
+                      || this.value_init === '' || this.value_end === ''){
                         return;
                     } else {
-                        values =  [ vm.value_init, vm.value_end ];
+                        values =  [ this.value_init, this.value_end ];
 
-                        if(vm.value_init !== vm.value_end && (vm.value_init % 1 !== 0 && vm.value_end % 1 == 0)) {
+                        if(this.value_init !== this.value_end && (this.value_init % 1 !== 0 && this.value_end % 1 == 0)) {
                             type = 'DECIMAL';
-                        } else if(vm.value_init !== vm.value_end &&
-                            vm.value_init % 1 !== 0 &&
-                            vm.value_end % 1 !== 0) {
+                        } else if(this.value_init !== this.value_end &&
+                            this.value_init % 1 !== 0 &&
+                            this.value_end % 1 !== 0) {
 
                             type = '';
-                        } else if(vm.value_init !== vm.value_end &&
-                            !(vm.value_init % 1 == 0 && vm.value_end % 1 !== 0)){
+                        } else if(this.value_init !== this.value_end &&
+                            !(this.value_init % 1 == 0 && this.value_end % 1 !== 0)){
                             type = 'DECIMAL';
                         } else {
                             type = '';
                         }
-                        //vm.isValid = true;
-                        //vm.clear = false;
+                        //this.isValid = true;
+                        //this.clear = false;
                     }
                 }
 
-                vm.$emit('input', {
+                this.$emit('input', {
                     filter: 'range',
                     type: type,
                     compare: 'BETWEEN',
-                    metadatum_id: vm.metadatum,
-                    collection_id: ( vm.collection_id ) ? vm.collection_id : vm.filter.collection_id,
+                    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) {
-                    vm.$eventBusSearch.$emit( 'sendValuesToTags', {
-                        filterId: vm.filter.id,
-                        value: values[0] + ' - ' + values[1]
+                    this.$eventBusSearch.$emit( 'sendValuesToTags', {
+                        filterId: this.filter.id,
+                        value: this.parseDateToNavigatorLanguage(values[0]) + ' - ' + this.parseDateToNavigatorLanguage(values[1])
                     });
                 }
             }
@@ -294,3 +319,12 @@
         }
     }
 </script>
+
+<style scoped>
+    .field {
+        margin-bottom: 0.125rem !important;
+    }
+    p.is-size-7 {
+        margin-bottom: 0.125rem !important;
+    }
+</style>
diff --git a/src/classes/filter-types/custom-interval/class-tainacan-custom-interval.php b/src/classes/filter-types/custom-interval/class-tainacan-custom-interval.php
index 236079ba3..ac7d82869 100644
--- a/src/classes/filter-types/custom-interval/class-tainacan-custom-interval.php
+++ b/src/classes/filter-types/custom-interval/class-tainacan-custom-interval.php
@@ -12,14 +12,47 @@ class Custom_Interval extends Filter_Type {
     function __construct(){
         $this->set_supported_types(['float','date']);
         $this->set_component('tainacan-filter-custom-interval');
+        $this->set_use_max_options(false);
         $this->set_preview_template('
             <div>
-                <div class="control is-small is-clearfix">
-                    <input type="number" step="any" value="6" class="input is-small"> 
-                </div> 
+                <div class="b-numberinput field is-grouped">
+                    <p class="control">
+                        <button type="button" class="button is-primary is-small">
+                            <span class="icon is-small">
+                                <i class="mdi mdi-minus"></i>
+                            </span>
+                        </button>
+                    </p>
+                    <div class="control is-small is-clearfix">
+                        <input type="number" step="0.01" class="input is-small" value="6">
+                    </div>
+                    <p class="control">
+                        <button type="button" class="button is-primary is-small">
+                            <span class="icon is-small">
+                                <i class="mdi mdi-plus"></i>
+                            </span>
+                        </button>
+                    </p>
+                </div>
                 <p class="is-size-7 has-text-centered is-marginless">until</p> 
-                <div class="control is-small is-clearfix">
-                    <input type="number" step="any" value="10" class="input is-small"> 
+                <div class="b-numberinput field is-grouped">
+                    <p class="control">
+                        <button type="button" class="button is-primary is-small">
+                            <span class="icon is-small">
+                                <i class="mdi mdi-minus"></i>
+                            </span>
+                        </button>
+                    </p>
+                    <div class="control is-small is-clearfix">
+                        <input type="number" step="0.01" class="input is-small" value="10">
+                    </div>
+                    <p class="control">
+                        <button type="button" class="button is-primary is-small">
+                            <span class="icon is-small">
+                                <i class="mdi mdi-plus"></i>
+                            </span>
+                        </button>
+                    </p>
                 </div>
             </div>
         ');
@@ -34,7 +67,6 @@ class Custom_Interval extends Filter_Type {
          $type = ( $filter->get_metadatum()->get_metadata_type() === 'Tainacan\Metadata_Types\Date' ) ? 'date' : 'numeric';
          return '<tainacan-filter-custom-interval 
                                         name="'.$filter->get_name().'"
-                                        typeRange="'.$type.'"
                                         collection_id="'.$filter->get_collection_id().'"
                                         metadatum_id="'.$filter->get_metadatum()->get_id().'"></tainacan-filter-custom-interval>';
     }
diff --git a/src/classes/filter-types/date/Date.vue b/src/classes/filter-types/date/Date.vue
new file mode 100644
index 000000000..95018c64c
--- /dev/null
+++ b/src/classes/filter-types/date/Date.vue
@@ -0,0 +1,270 @@
+<template>
+    <div class="date-filter-container">
+         <b-dropdown
+                :mobile-modal="true"
+                @input="onChangeComparator($event)"
+                aria-role="list">
+            <button
+                    :aria-label="$i18n.get('label_comparator')"
+                    class="button is-white"
+                    slot="trigger">
+                <span class="icon is-small">
+                    <i v-html="comparatorSymbol" />
+                </span>
+                <span class="icon">
+                    <i class="tainacan-icon tainacan-icon-20px tainacan-icon-arrowdown" />
+                </span>
+            </button>
+            <b-dropdown-item
+                    role="button"
+                    :class="{ 'is-active': comparator == '=' }"
+                    :value="'='"
+                    aria-role="listitem">
+                &#61;&nbsp; {{ $i18n.get('is_equal_to') }}
+            </b-dropdown-item>
+            <b-dropdown-item
+                    role="button"
+                    :class="{ 'is-active': comparator == '!=' }"
+                    :value="'!='"
+                    aria-role="listitem">
+                &#8800;&nbsp; {{ $i18n.get('is_not_equal_to') }}
+            </b-dropdown-item>
+            <b-dropdown-item
+                    role="button"
+                    :class="{ 'is-active': comparator == '>' }"
+                    :value="'>'"
+                    aria-role="listitem">
+                &#62;&nbsp; {{ $i18n.get('after') }}
+            </b-dropdown-item>
+            <b-dropdown-item
+                    role="button"
+                    :class="{ 'is-active': comparator == '>=' }"
+                    :value="'>='"
+                    aria-role="listitem">
+                &#8805;&nbsp; {{ $i18n.get('after_or_on_day') }}
+            </b-dropdown-item>
+            <b-dropdown-item
+                    role="button"
+                    :class="{ 'is-active': comparator == '<' }"
+                    :value="'<'"
+                    aria-role="listitem">
+                &#60;&nbsp; {{ $i18n.get('before') }}
+            </b-dropdown-item>
+            <b-dropdown-item
+                    role="button"
+                    :class="{ 'is-active': comparator == '<=' }"
+                    :value="'<='"
+                    aria-role="listitem">
+                &#8804;&nbsp; {{ $i18n.get('before_or_on_day') }}
+            </b-dropdown-item>
+        </b-dropdown>
+
+        <b-datepicker
+                position="is-bottom-left"
+                :aria-labelledby="labelId"
+                :placeholder="$i18n.get('instruction_select_a_date')"
+                v-model="value"
+                @input="emit()"
+                editable
+                :date-formatter="(date) => dateFormatter(date)"
+                :date-parser="(date) => dateParser(date)"
+                size="is-small"
+                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>
+</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 : (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);
+        },
+        mounted() {
+            this.selectedValues();
+        },
+        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,
+        },
+        computed: {
+            comparatorSymbol() {
+                switch(this.comparator) {
+                    case '=': return '&#61;';
+                    case '!=': return '&#8800;';
+                    case '>': return '&#62;';
+                    case '>=': return '&#8805;';
+                    case '<': return '&#60;';
+                    case '<=': return '&#8804;';
+                    default: return '';
+                }
+            }
+        },
+        methods: {
+            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.value = Array.isArray(metadata.value) ? new Date(metadata.value[0]) : new Date(metadata.value);
+
+                    if ( metadata.compare)
+                        this.comparator = metadata.compare;
+
+                    if (this.value != undefined) {
+                        this.$eventBusSearch.$emit( 'sendValuesToTags', {
+                            filterId: this.filter.id,
+                            value: this.comparator + ' ' + this.parseDateToNavigatorLanguage(Array.isArray(metadata.value) ? metadata.value[0] : metadata.value)
+                        });
+                    }
+
+                } else {
+                    return false;
+                }
+
+            },
+            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);
+            },
+            dateParser(dateString) { 
+                return moment(dateString, this.dateFormat).toDate(); 
+            },
+            // emit the operation for listeners
+            emit() {
+
+                if ( this.value == undefined || this.value == null || this.value === '')
+                    this.value = new Date();
+
+                let valueQuery = this.value.getUTCFullYear() + '-' +
+                          ('00' + (this.value.getUTCMonth() + 1)).slice(-2) + '-' +
+                          ('00' + this.value.getUTCDate()).slice(-2);
+
+                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: valueQuery
+                });
+
+                this.$eventBusSearch.$emit( 'sendValuesToTags', {
+                    filterId: this.filter.id,
+                    value: this.comparator + ' ' + this.parseDateToNavigatorLanguage(valueQuery)
+                });
+                
+            },
+            onChangeComparator(newComparator) {
+                this.comparator = newComparator;
+                this.emit();
+            }
+        },
+        beforeDestroy() {
+            this.$eventBusSearch.$off('removeFromFilterTag', this.cleanSearchFromTags);
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+
+    .date-filter-container {
+        display: flex;
+        height: 30px;
+
+        @media screen and (min-width: 769px) and (max-width: 1500px) {
+            flex-wrap: wrap;
+            height: 60px;
+        }
+        
+        .dropdown {
+            width: auto;
+            flex-grow: 2;
+
+            .dropdown-trigger button {
+                padding: 0 0.5rem !important;
+                height: 30px !important;
+
+                i:not(.tainacan-icon-arrowdown) {
+                    margin-top: -3px;
+                    font-size: 1.25rem;
+                    font-style: normal;
+                    color: #555758;
+                }
+            }
+        }
+    }
+
+</style>
\ 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
new file mode 100644
index 000000000..f19ac894a
--- /dev/null
+++ b/src/classes/filter-types/date/class-tainacan-date.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Tainacan\Filter_Types;
+
+defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
+
+/**
+ * Class TainacanFilterType
+ */
+class Date extends Filter_Type {
+
+    function __construct(){
+        $this->set_supported_types(['date']);
+        $this->set_component('tainacan-filter-date');
+        $this->set_use_max_options(false);
+        $this->set_preview_template('
+            <div>
+                <div>
+                    <div class="date-filter-container">
+                        <div class="dropdown is-active">
+                            <div role="button" class="dropdown-trigger">
+                                <button class="button is-white">
+                                    <span class="icon is-small">
+                                        <i>=</i>
+                                    </span>
+                                    <span class="icon">
+                                        <i class="tainacan-icon tainacan-icon-20px tainacan-icon-arrowdown"></i>
+                                    </span>
+                                </button>
+                            </div>
+                            <div class="background" style="display: none;"></div>
+                            <div class="dropdown-menu" style="display: none;">
+                                <div role="list" class="dropdown-content">
+                                    <a class="dropdown-item is-active">=&nbsp; ' . __('Equal', 'tainacan') .'</a>
+                                    <a class="dropdown-item">≠&nbsp; '. __('Not equal', 'tainacan') .'</a>
+                                    <a class="dropdown-item">&gt;&nbsp; '. __('After', 'tainacan') .'</a>
+                                    <a class="dropdown-item">≥&nbsp; '. __('After (inclusive)', 'tainacan') .'</a>
+                                    <a class="dropdown-item">&lt;&nbsp; '. __('Before', 'tainacan') .'</a>
+                                    <a class="dropdown-item">≤&nbsp;  '. __('Before (inclusive)', 'tainacan') .'</a>
+                                </div>
+                            </div>
+                        </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>
+                    </div>
+                </div>
+            </div>
+        ');
+    }
+
+    /**
+     * @param $filter
+     * @return string
+     * @internal param $metadatum
+     */
+    public function render( $filter ){
+        return '<tainacan-filter-date
+                                        name="'.$filter->get_name().'"
+                                        collection_id="'.$filter->get_collection_id().'"
+                                        metadatum_id="'.$filter->get_metadatum_id().'"></tainacan-filter-date>';
+    }
+
+}
\ No newline at end of file
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 c7cc814e4..c9eef012e 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
@@ -5,11 +5,41 @@ use Tainacan\Metadata_Types;
 
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 
+/**
+ * Class TainacanFilterType
+ */
 abstract class Filter_Type {
 
     private $supported_types = [];
+
+    /**
+     * Array of options specific to this filter type. Stored in filter_type_options property of the Filter object
+     * @var array
+     */
     private $options = [];
+
+    /**
+     * The default values for the filter type options array
+     * @var array
+     */
+    private $default_options = [];
+
+    /**
+     * The name of the web component used by this filter type
+     * @var string
+     */
     private $component;
+
+    /**
+     * The name of the web component used by the Form
+     * @var bool | string
+     */
+    private $form_component = false;
+
+    /**
+     * The html template featuring a preview of how this metadata type componenet
+     * @var string
+     */
     private $preview_template = '';
     protected $use_max_options = true;
 
@@ -72,11 +102,13 @@ abstract class Filter_Type {
     public function _toArray(){
         $attributes = [];
 
-        $attributes['className'] = get_class($this);
-        $attributes['component'] = $this->get_component();
-        $attributes['supported_types'] = $this->get_supported_types();
+        $attributes['className']        = get_class($this);
+        $attributes['component']        = $this->get_component();
+        $attributes['options']          = $this->get_options();
+        $attributes['supported_types']  = $this->get_supported_types();
         $attributes['preview_template'] = $this->get_preview_template();
-        $attributes['use_max_options'] = $this->get_use_max_options();
+        $attributes['use_max_options']  = $this->get_use_max_options();
+        $attributes['form_component']   = $this->get_form_component();
 
         return $attributes;
     }
@@ -88,6 +120,10 @@ abstract class Filter_Type {
 	    $this->options = ( is_array( $options ) ) ? $options : (!is_array(unserialize( $options )) ? [] : unserialize( $options ));
     }
 
+    public function set_default_options(Array $options) {
+        $this->default_options = $options;
+    }
+
 	/**
 	 * Validates the options Array
 	 *
@@ -121,11 +157,13 @@ abstract class Filter_Type {
 		$this->component = $component;
 	}
 
-	/**
-	 * @return mixed
-	 */
-	public function get_options() {
-		return $this->options;
+    /**
+     * Gets the options for this filter types including default values for options
+     * that were not set yet.
+     * @return array Filter type options
+     */
+    public function get_options() {
+        return array_merge($this->default_options, $this->options);
     }
 
     public function set_use_max_options($use_max_options) {
@@ -135,4 +173,38 @@ abstract class Filter_Type {
     public function get_use_max_options() {
         return $this->use_max_options;
     }
+
+    /**
+     * Gets one option from the options array.
+     *
+     * Checks if option exist or if it have a default value. Otherwise return an empty string
+     * 
+     * @param  string $key the desired option
+     * @return mixed the option value, the default value or an empty string
+     */
+    public function get_option($key) {
+        $options = $this->get_options();
+        return isset($options[$key]) ? $options[$key] : '';
+    }
+
+    /**
+     * allow i18n from messages
+     */
+    public function get_form_labels(){
+        return [];
+    }
+
+    /**
+     * @return string 
+     */
+    public function get_form_component() {
+        return $this->form_component;
+    }
+
+    /**
+     * @param $form_component The web component that will render the filter options form
+     */
+    public function set_form_component($form_component){
+    	$this->form_component = $form_component;
+    }
 }
\ 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 f30366fed..8093cec3d 100644
--- a/src/classes/filter-types/filter-types-mixin.js
+++ b/src/classes/filter-types/filter-types-mixin.js
@@ -1,7 +1,6 @@
 import qs from 'qs';
 import axios from '../../js/axios/axios';
 import { mapGetters } from 'vuex';
-import { resolve } from 'bluebird';
 
 export const filter_type_mixin = {
     data () {
@@ -18,7 +17,6 @@ export const filter_type_mixin = {
         },
         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
-        filter_type: [String], // not required, but overrides the filter metadatum type if is set
         id: '',
         query: {}
     },
@@ -26,9 +24,6 @@ export const filter_type_mixin = {
         // 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);
-    },
-    mounted() {
-        
     },
     computed: {
         facetsFromItemSearch() {
diff --git a/src/classes/filter-types/numeric/FormNumeric.vue b/src/classes/filter-types/numeric/FormNumeric.vue
new file mode 100644
index 000000000..8c7a992fc
--- /dev/null
+++ b/src/classes/filter-types/numeric/FormNumeric.vue
@@ -0,0 +1,99 @@
+<template>
+    <div>
+        <b-field :addons="false">
+            <label class="label is-inline">
+                {{ $i18n.getHelperTitle('tainacan-filter-numeric', 'step') }}<span>&nbsp;*&nbsp;</span>
+                <help-button
+                        :title="$i18n.getHelperTitle('tainacan-filter-numeric', 'step')"
+                        :message="$i18n.getHelperMessage('tainacan-filter-numeric', 'step')"/>
+            </label>
+            <div
+                    v-if="!showEditStepOptions"
+                    class="is-flex">
+                <b-select
+                        name="step_options"
+                        v-model="step"
+                        @input="onUpdateStep">
+                    <option value="0.001">0.001</option>
+                    <option value="0.01">0.01</option>
+                    <option value="0.1">0.1</option>
+                    <option value="1">1</option>
+                    <option value="2">2</option>
+                    <option value="5">5</option>
+                    <option value="10">10</option>
+                    <option value="100">100</option>
+                    <option value="1000">1000</option>
+                    <option
+                            v-if="step && ![0.001,0.01,0.1,1,2,5,10,100,1000].find( (element) => element == step )"
+                            :value="step">
+                        {{ step }}</option>
+                </b-select>
+                <button
+                        class="button is-white is-pulled-right"
+                        :aria-label="$i18n.get('edit')"
+                        @click.prevent="showEditStepOptions = true">
+                    <span 
+                            v-tooltip="{
+                                content: $i18n.get('edit'),
+                                autoHide: true,
+                                placement: 'bottom'
+                            }"
+                            class="icon">
+                        <i class="tainacan-icon tainacan-icon-18px tainacan-icon-edit has-text-secondary"/>
+                    </span>
+                </button>
+            </div>
+            <div
+                    v-if="showEditStepOptions"
+                    class="is-flex">
+                <b-input
+                        name="max_options"
+                        v-model="step"
+                        @input="onUpdateStep"
+                        type="number"
+                        step="1" />
+                <button
+                        @click.prevent="showEditStepOptions = false"
+                        class="button is-white is-pulled-right">
+                    <span 
+                            v-tooltip="{
+                                content: $i18n.get('close'),
+                                autoHide: true,
+                                placement: 'bottom'
+                            }"
+                            class="icon">
+                        <i class="tainacan-icon tainacan-icon-18px tainacan-icon-close has-text-secondary"/>
+                    </span>
+                </button>
+            </div>
+        </b-field>
+    </div>
+</template>
+
+<script>
+
+    export default {
+        props: {
+            filter: {
+                type: Object
+            },
+            value: [String, Number, Array],
+            id: '',
+            disabled: false,
+        },
+        data() {
+            return {
+                step: [Number, String],
+                showEditStepOptions: false
+            }
+        },
+        methods: {
+            onUpdateStep(value) {
+                this.$emit('input', { step: value });
+            },
+        },
+        created() {
+            this.step = this.value && this.value.step ? this.value.step : 1;
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/classes/filter-types/numeric/Numeric.vue b/src/classes/filter-types/numeric/Numeric.vue
new file mode 100644
index 000000000..ed686b739
--- /dev/null
+++ b/src/classes/filter-types/numeric/Numeric.vue
@@ -0,0 +1,247 @@
+<template>
+    <div class="numeric-filter-container">
+         <b-dropdown
+                :mobile-modal="true"
+                @input="onChangeComparator($event)"
+                aria-role="list">
+            <button
+                    :aria-label="$i18n.get('label_comparator')"
+                    class="button is-white"
+                    slot="trigger">
+                <span class="icon is-small">
+                    <i v-html="comparatorSymbol" />
+                </span>
+                <span class="icon">
+                    <i class="tainacan-icon tainacan-icon-20px tainacan-icon-arrowdown" />
+                </span>
+            </button>
+            <b-dropdown-item
+                    role="button"
+                    :class="{ 'is-active': comparator == '=' }"
+                    :value="'='"
+                    aria-role="listitem">
+                &#61;&nbsp; {{ $i18n.get('is_equal_to') }}
+            </b-dropdown-item>
+            <b-dropdown-item
+                    role="button"
+                    :class="{ 'is-active': comparator == '!=' }"
+                    :value="'!='"
+                    aria-role="listitem">
+                &#8800;&nbsp; {{ $i18n.get('is_not_equal_to') }}
+            </b-dropdown-item>
+            <b-dropdown-item
+                    role="button"
+                    :class="{ 'is-active': comparator == '>' }"
+                    :value="'>'"
+                    aria-role="listitem">
+                &#62;&nbsp; {{ $i18n.get('greater_than') }}
+            </b-dropdown-item>
+            <b-dropdown-item
+                    role="button"
+                    :class="{ 'is-active': comparator == '>=' }"
+                    :value="'>='"
+                    aria-role="listitem">
+                &#8805;&nbsp; {{ $i18n.get('greater_than_or_equal_to') }}
+            </b-dropdown-item>
+            <b-dropdown-item
+                    role="button"
+                    :class="{ 'is-active': comparator == '<' }"
+                    :value="'<'"
+                    aria-role="listitem">
+                &#60;&nbsp; {{ $i18n.get('less_than') }}
+            </b-dropdown-item>
+            <b-dropdown-item
+                    role="button"
+                    :class="{ 'is-active': comparator == '<=' }"
+                    :value="'<='"
+                    aria-role="listitem">
+                &#8804;&nbsp; {{ $i18n.get('less_than_or_equal_to') }}
+            </b-dropdown-item>
+        </b-dropdown>
+
+        <b-numberinput
+                :aria-labelledby="labelId"
+                size="is-small"
+                :step="Number(options.step)"
+                @input="emit()"
+                v-model="value"/>
+    </div>
+</template>
+
+<script>
+    import { tainacan as axios } from '../../../js/axios/axios';
+    import { wpAjax } from "../../../admin/js/mixins";
+
+    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);
+        },
+        mounted() {
+            this.selectedValues();
+        },
+        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,
+        },
+        computed: {
+            comparatorSymbol() {
+                switch(this.comparator) {
+                    case '=': return '&#61;';
+                    case '!=': return '&#8800;';
+                    case '>': return '&#62;';
+                    case '>=': return '&#8805;';
+                    case '<': return '&#60;';
+                    case '<=': return '&#8804;';
+                    default: return '';
+                }
+            }
+        },
+        methods: {
+            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.value = Array.isArray(metadata.value) ? Number(metadata.value[0]) : Number(metadata.value);
+
+                    if ( metadata.compare)
+                        this.comparator = metadata.compare;
+
+                    if (this.value != undefined) {
+                        this.$eventBusSearch.$emit( 'sendValuesToTags', {
+                            filterId: this.filter.id,
+                            value: this.comparator + ' ' + this.value
+                        });
+                    }
+
+                } else {
+                    return false;
+                }
+
+            },
+            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: ''
+                });
+
+                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,
+                    value: this.value
+                });
+
+                this.$eventBusSearch.$emit( 'sendValuesToTags', {
+                    filterId: this.filter.id,
+                    value: this.comparator + ' ' + this.value
+                });
+                
+            },
+            onChangeComparator(newComparator) {
+                this.comparator = newComparator;
+                this.emit();
+            }
+        },
+        beforeDestroy() {
+            this.$eventBusSearch.$off('removeFromFilterTag', this.cleanSearchFromTags);
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+
+    .numeric-filter-container {
+        display: flex;
+        height: 30px;
+
+        @media screen and (min-width: 769px) and (max-width: 1500px) {
+            flex-wrap: wrap;
+            height: 60px;
+        }
+        
+        .dropdown {
+            width: auto;
+            flex-grow: 2;
+
+            .dropdown-trigger button {
+                padding: 0 0.5rem !important;
+                height: 30px !important;
+
+                i:not(.tainacan-icon-arrowdown) {
+                    margin-top: -3px;
+                    font-size: 1.25rem;
+                    font-style: normal;
+                    color: #555758;
+                }
+            }
+        }
+
+        .b-numberinput.is-grouped {
+            flex-grow: 1;
+        }
+    }
+
+</style>
\ No newline at end of file
diff --git a/src/classes/filter-types/numeric/class-tainacan-numeric.php b/src/classes/filter-types/numeric/class-tainacan-numeric.php
new file mode 100644
index 000000000..cb2e4ae34
--- /dev/null
+++ b/src/classes/filter-types/numeric/class-tainacan-numeric.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace Tainacan\Filter_Types;
+
+defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
+
+/**
+ * Class TainacanMetadatumType
+ */
+class Numeric extends Filter_Type {
+
+    function __construct(){
+        $this->set_supported_types(['float']);
+        $this->set_component('tainacan-filter-numeric');
+        $this->set_form_component('tainacan-filter-form-numeric');
+        $this->set_use_max_options(false);
+        $this->set_default_options([
+            'step' => 1
+        ]);
+        $this->set_preview_template('
+            <div>
+                <div>
+                    <div class="numeric-filter-container">
+                        <div class="dropdown is-active">
+                            <div role="button" class="dropdown-trigger">
+                                <button class="button is-white">
+                                    <span class="icon is-small">
+                                        <i>=</i>
+                                    </span>
+                                    <span class="icon">
+                                        <i class="tainacan-icon tainacan-icon-20px tainacan-icon-arrowdown"></i>
+                                    </span>
+                                </button>
+                            </div>
+                            <div class="background" style="display: none;"></div>
+                            <div class="dropdown-menu" style="display: none;">
+                                <div role="list" class="dropdown-content">
+                                    <a class="dropdown-item is-active">=&nbsp; ' . __('Equal', 'tainacan') .'</a>
+                                    <a class="dropdown-item">≠&nbsp; '. __('Not equal', 'tainacan') .'</a>
+                                    <a class="dropdown-item">&gt;&nbsp; '. __('Greater than', 'tainacan') .'</a>
+                                    <a class="dropdown-item">≥&nbsp; '. __('Greater than or equal to', 'tainacan') .'</a>
+                                    <a class="dropdown-item">&lt;&nbsp; '. __('Less than', 'tainacan') .'</a>
+                                    <a class="dropdown-item">≤&nbsp;  '. __('Less than or equal to', 'tainacan') .'</a>
+                                </div>
+                            </div>
+                        </div>
+                    <div class="b-numberinput field is-grouped">
+                        <p class="control">
+                            <button type="button" class="button is-primary is-small">
+                                <span class="icon is-small">
+                                    <i class="mdi mdi-minus"></i>
+                                </span>
+                            </button>
+                        </p>
+                        <div class="control is-small is-clearfix">
+                            <input type="number" step="0.01" class="input is-small" value="1.5">
+                        </div>
+                        <p class="control">
+                            <button type="button" class="button is-primary is-small">
+                                <span class="icon is-small">
+                                    <i class="mdi mdi-plus"></i>
+                                </span>
+                            </button>
+                        </p>
+                    </div>
+                </div>
+            </div>
+        ');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function get_form_labels(){
+        return [
+            'step' => [
+                'title' => __( 'Step', 'tainacan' ),
+                'description' => __( 'The amount to be increased or decreased when clicking on filter control buttons.', 'tainacan' ),
+            ]
+        ];
+    }
+    /**
+     * @param $filter
+     * @return string
+     * @internal param $metadatum
+     */
+    public function render( $filter ){
+        return '<tainacan-filter-numeric
+                                        step="' . $this->get_option('step') . '" 
+                                        name="'.$filter->get_name().'"
+                                        collection_id="'.$filter->get_collection_id().'"
+                                        metadatum_id="'.$filter->get_metadatum_id().'"></tainacan-filter-numeric>';
+    }
+
+
+    /**
+     * @param \Tainacan\Entities\Filter $filter
+     * @return array|bool true if is validate or array if has error
+     */
+    public function validate_options(\Tainacan\Entities\Filter $filter) {
+        if ( !in_array($filter->get_status(), apply_filters('tainacan-status-require-validation', ['publish','future','private'])) )
+            return true;
+
+        if ( empty($this->get_option('step')) ) {
+            return [
+                'step' => __('"Step" value is required','tainacan')
+            ];
+        }
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/classes/filter-types/selectbox/class-tainacan-selectbox.php b/src/classes/filter-types/selectbox/class-tainacan-selectbox.php
index cdbe915b3..a9cc6bbc3 100644
--- a/src/classes/filter-types/selectbox/class-tainacan-selectbox.php
+++ b/src/classes/filter-types/selectbox/class-tainacan-selectbox.php
@@ -8,10 +8,10 @@ defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
  */
 class Selectbox extends Filter_Type {
 
-    protected $use_max_options = false;
     function __construct(){
         $this->set_supported_types(['string', 'long_string']);
         $this->set_component('tainacan-filter-selectbox');
+        $this->set_use_max_options(false);
         $this->set_preview_template('
             <div>
                 <div class="control is-expanded">
@@ -32,8 +32,7 @@ class Selectbox extends Filter_Type {
 
     public function render( $filter ){
         return '<tainacan-filter-selectbox name="'.$filter->get_name().'"
-                                        filter_type="'.$filter->get_metadatum()->get_metadata_type().'"
                                         collection_id="'.$filter->get_collection_id().'"
-                                        metadatum_id="'.$filter->get_metadatum()->get_id().'"></tainacan-filter-selectbox>';
+                                        metadatum_id="'.$filter->get_metadatum_id().'"></tainacan-filter-selectbox>';
     }
 }
\ 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 ba00475d5..518c5dd03 100644
--- a/src/classes/filter-types/taginput/class-tainacan-taginput.php
+++ b/src/classes/filter-types/taginput/class-tainacan-taginput.php
@@ -11,6 +11,7 @@ class Taginput extends Filter_Type {
     function __construct(){
         $this->set_supported_types(['string','long_string','item']);
         $this->set_component('tainacan-filter-taginput');
+        $this->set_use_max_options(false);
         $this->set_preview_template('
             <div>
                 <p class="has-text-gray">'. __('Selected values') . ': </p> 
@@ -61,8 +62,7 @@ class Taginput extends Filter_Type {
 
     public function render( $filter ){
         return '<tainacan-filter-taginput name="'.$filter->get_name().'"
-                                        filter_type="'.$filter->get_metadatum()->get_metadata_type().'"
                                         collection_id="'.$filter->get_collection_id().'"
-                                        metadatum_id="'.$filter->get_metadatum()->get_id().'"></tainacan-filter-taginput>';
+                                        metadatum_id="'.$filter->get_metadatum_id().'"></tainacan-filter-taginput>';
     }
 }
\ No newline at end of file
diff --git a/src/classes/filter-types/tainacan-filter-item.vue b/src/classes/filter-types/tainacan-filter-item.vue
index 7697bc28f..ab94c6f6b 100644
--- a/src/classes/filter-types/tainacan-filter-item.vue
+++ b/src/classes/filter-types/tainacan-filter-item.vue
@@ -99,52 +99,137 @@
     .filter-item-forms {
 
         .datepicker {
+            width: 100%;
 
             .datepicker-content {
                 height: auto;
+                
+                input {
+                    height: 30px;
+                }
             }
 
-            .dropdown-item {
-                background-color: white !important;
+            .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;
+                }
             }
 
             @media screen and (min-width: 1024px) {
 
                 .datepicker-header {
-                
-                    .pagination-list {
-                        .field.has-addons {
-                            display: table-cell !important;
-                            width: 78px !important;
+                    margin-bottom: 0.5rem;
+                    padding-top: 0.15rem;
+                    padding-bottom: 0.5rem;
+                    
+                    .pagination {
+                        flex-wrap: wrap;
+                    
+                        .pagination-list {
+                            margin-bottom: 0.5rem;
 
-                            .control {
-                                height: 24px !important;
-                                width: 74px !important;
+                            .field.has-addons {
+                                width: 100% !important;
 
-                                select {
-                                    padding-left: 1px !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; 
-                    }
+                        .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;
+                        .pagination-next {
+                            margin: 0;
+                            height: 24px;
+                            padding: 0;
+                            font-size: 0.75rem;
+                        }
                     }
                 }
 
                 .dropdown-item {
-                    padding: 0.8em;
+                    padding: 0.8rem !important;
                 }
 
                 .dropdown-menu {
@@ -157,7 +242,7 @@
                     margin-bottom: 0px;
                     
                     .datepicker-cell {
-                        padding: 0.2rem 0.1rem !important;
+                        padding: 0.15rem 0.175rem !important;
                     }
                 }
                 
@@ -174,6 +259,7 @@
                     max-width: 165px !important;
                     border-radius: 2px !important;
                     padding: 0px;
+                    max-height: inherit !important;
                 }
             }
         }
@@ -257,6 +343,7 @@
             display: unset;
             white-space: nowrap;
             text-overflow: ellipsis;
+            height: 30px;
         }
 
         .control:not(.taginput) {
diff --git a/src/classes/filter-types/taxonomy/Checkbox.vue b/src/classes/filter-types/taxonomy/Checkbox.vue
index 515836c47..770ccfe5e 100644
--- a/src/classes/filter-types/taxonomy/Checkbox.vue
+++ b/src/classes/filter-types/taxonomy/Checkbox.vue
@@ -55,7 +55,7 @@
         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_type ) ? this.filter_type : this.filter.metadatum.metadata_type;
+            this.type = this.filter.metadatum.metadata_type;
 
             this.loadOptions();
             this.$eventBusSearch.$on('removeFromFilterTag', this.cleanSearchFromTag);
@@ -91,7 +91,6 @@
             },
             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
-            filter_type: [String],  // not required, but overrides the filter metadatum type if is set
             labelId: '',
             query: {
                 type: Object // concentrate all attributes metadatum id and type
diff --git a/src/classes/filter-types/taxonomy/Taginput.vue b/src/classes/filter-types/taxonomy/Taginput.vue
index 8c06f712e..2ac4c5ecd 100644
--- a/src/classes/filter-types/taxonomy/Taginput.vue
+++ b/src/classes/filter-types/taxonomy/Taginput.vue
@@ -42,7 +42,7 @@
         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_type ) ? this.filter_type : this.filter.metadatum.metadata_type;
+            this.type = this.filter.metadatum.metadata_type;
 
             let in_route = '/collection/' + this.collection + '/metadata/' +  this.metadatum;
 
@@ -77,7 +77,6 @@
             },
             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
-            filter_type: [String],  // not required, but overrides the filter metadatum type if is set
             labelId: '',
             query: {
                 type: Object // concentrate all attributes metadatum id and type
diff --git a/src/classes/filter-types/taxonomy/class-tainacan-taxonomycheckbox.php b/src/classes/filter-types/taxonomy/class-tainacan-taxonomycheckbox.php
index 40691f32a..9070a8c42 100644
--- a/src/classes/filter-types/taxonomy/class-tainacan-taxonomycheckbox.php
+++ b/src/classes/filter-types/taxonomy/class-tainacan-taxonomycheckbox.php
@@ -64,8 +64,7 @@ class TaxonomyCheckbox extends Filter_Type {
 
     public function render( $filter ){
         return '<tainacan-filter-taxonomy-checkbox name="'.$filter->get_name().'"
-                                        filter_type="'.$filter->get_metadatum()->get_metadata_type().'"
                                         collection_id="'.$filter->get_collection_id().'"
-                                        metadatum_id="'.$filter->get_metadatum()->get_id().'"></tainacan-filter-taxonomy-checkbox>';
+                                        metadatum_id="'.$filter->get_metadatum_id().'"></tainacan-filter-taxonomy-checkbox>';
     }
 }
\ No newline at end of file
diff --git a/src/classes/filter-types/taxonomy/class-tainacan-taxonomytaginput.php b/src/classes/filter-types/taxonomy/class-tainacan-taxonomytaginput.php
index 1e8706fa4..158751856 100644
--- a/src/classes/filter-types/taxonomy/class-tainacan-taxonomytaginput.php
+++ b/src/classes/filter-types/taxonomy/class-tainacan-taxonomytaginput.php
@@ -11,6 +11,7 @@ class TaxonomyTaginput extends Filter_Type {
     function __construct(){
         $this->set_supported_types(['term']);
         $this->set_component('tainacan-filter-taxonomy-taginput');
+        $this->set_use_max_options(false);
         $this->set_preview_template('
             <div>
                 <p class="has-text-gray">'. __('Selected values') . ': </p> 
@@ -61,8 +62,7 @@ class TaxonomyTaginput extends Filter_Type {
 
     public function render( $filter ){
         return '<tainacan-filter-taxonomy-taginput name="'.$filter->get_name().'"
-                                        filter_type="'.$filter->get_metadatum()->get_metadata_type().'"
                                         collection_id="'.$filter->get_collection_id().'"
-                                        metadatum_id="'.$filter->get_metadatum()->get_id().'"></tainacan-filter-taxonomy-taginput>';
+                                        metadatum_id="'.$filter->get_metadatum_id().'"></tainacan-filter-taxonomy-taginput>';
     }
 }
\ No newline at end of file
diff --git a/src/classes/metadata-types/date/Date.vue b/src/classes/metadata-types/date/Date.vue
index 5f67b6bea..7f964cc0c 100644
--- a/src/classes/metadata-types/date/Date.vue
+++ b/src/classes/metadata-types/date/Date.vue
@@ -46,22 +46,12 @@
     export default {
         mixins: [ dateInter ],
         created(){
-            let locale = navigator.language;
-
-            moment.locale(locale);
-
-            let localeData = moment.localeData();
-            this.dateFormat = localeData.longDateFormat('L');
-
-            if( this.value ){
+            if (this.value)
                 this.dateValue = this.parseDateToNavigatorLanguage(this.value);
-            }
         },
         data() {
             return {
                 dateValue: '',
-                dateMask: this.getDateLocaleMask(),
-                dateFormat: '',
                 isInvalidDate: false,
             }
         },
@@ -80,7 +70,7 @@
             onInput: _.debounce(function ($event) {
                 let dateISO = '';
 
-                if($event && $event instanceof Date) {
+                if ($event && $event instanceof Date) {
                     dateISO = moment(this.dateValue, this.dateFormat).toISOString() ? moment(this.dateValue, this.dateFormat).toISOString().split('T')[0] : false;
                 } else if($event.target.value && $event.target.value.length === this.dateMask.length) {
                     dateISO = moment(this.dateValue, this.dateFormat).toISOString() ? moment($event.target.value,  this.dateFormat).toISOString().split('T')[0] : false;
@@ -95,12 +85,7 @@
 
                 this.$emit('input', dateISO);
                 this.$emit('blur');
-            }, 300),
-            parseDateToNavigatorLanguage(date){
-                date = new Date(date.replace(/-/g, '/'));
-
-                return moment(date, moment.ISO_8601).format(this.dateFormat);
-            }
+            }, 300)
         }
     }
 </script>
diff --git a/src/classes/metadata-types/metadata-type/class-tainacan-metadata-type.php b/src/classes/metadata-types/metadata-type/class-tainacan-metadata-type.php
index a706f349a..9504cb511 100644
--- a/src/classes/metadata-types/metadata-type/class-tainacan-metadata-type.php
+++ b/src/classes/metadata-types/metadata-type/class-tainacan-metadata-type.php
@@ -23,6 +23,16 @@ abstract class Metadata_Type  {
      */
     private $primitive_type;
     
+    /**
+     * When primitive type points to an entity, such as item or term, this indidicates which repository to use 
+     * to fetch that entity 
+     *
+     * default is false: no repository
+     * 
+     * @var bool | \Tainacan\Repositories\Repository 
+     */
+    private $repository = false;
+    
     /**
      * Array of options specific to this metadatum type. Stored in metadata_type_options property of the Metadatum object
      * @var array
@@ -245,6 +255,14 @@ abstract class Metadata_Type  {
 	public function set_core($core){
 		$this->core = $core;
 	}
+    
+    public function get_repository() {
+		return $this->repository;
+	}
+
+	public function set_repository($repository){
+		$this->repository = $repository;
+	}
 	
 	/**
 	* Gets a slug based on the class name to represent the metadata type
diff --git a/src/classes/metadata-types/numeric/Numeric.vue b/src/classes/metadata-types/numeric/Numeric.vue
index 2a0ec4544..4c0377e60 100644
--- a/src/classes/metadata-types/numeric/Numeric.vue
+++ b/src/classes/metadata-types/numeric/Numeric.vue
@@ -3,6 +3,7 @@
             :disabled="disabled"
             :class="{'has-content': inputValue !== undefined && inputValue !== ''}"
             :id="id"
+            lang="en"
             type="number"
             :value="inputValue"
             step="0.01"
diff --git a/src/classes/metadata-types/relationship/FormRelationship.vue b/src/classes/metadata-types/relationship/FormRelationship.vue
index b75e76034..f6a59f0ff 100644
--- a/src/classes/metadata-types/relationship/FormRelationship.vue
+++ b/src/classes/metadata-types/relationship/FormRelationship.vue
@@ -179,8 +179,8 @@
                         if( metadata.length > 0 ){
                             this.metadata = [];
 
-                            for( let metadatum of metadata ){
-                               if( metadatum.metadata_type !== "Tainacan\\Metadata_Types\\Relationship"){
+                            for (let metadatum of metadata) {
+                               if (metadatum.metadata_type !== "Tainacan\\Metadata_Types\\Relationship" && metadatum.metadata_type !== "Tainacan\\Metadata_Types\\Taxonomy") {
                                    this.metadata.push( metadatum );
                                    this.hasMetadata = true;
                                    this.checkMetadata()
diff --git a/src/classes/metadata-types/relationship/class-tainacan-relationship.php b/src/classes/metadata-types/relationship/class-tainacan-relationship.php
index 74d5954ec..797985d2e 100644
--- a/src/classes/metadata-types/relationship/class-tainacan-relationship.php
+++ b/src/classes/metadata-types/relationship/class-tainacan-relationship.php
@@ -13,6 +13,7 @@ class Relationship extends Metadata_Type {
         // call metadatum type constructor
         parent::__construct();
         $this->set_primitive_type('item');
+        $this->set_repository( \Tainacan\Repositories\Items::get_instance() );
         $this->set_component('tainacan-relationship');
         $this->set_form_component('tainacan-form-relationship');
         $this->set_name( __('Relationship', 'tainacan') );
diff --git a/src/classes/metadata-types/taxonomy/class-tainacan-taxonomy.php b/src/classes/metadata-types/taxonomy/class-tainacan-taxonomy.php
index c1e016b2d..a01bff51a 100644
--- a/src/classes/metadata-types/taxonomy/class-tainacan-taxonomy.php
+++ b/src/classes/metadata-types/taxonomy/class-tainacan-taxonomy.php
@@ -17,6 +17,7 @@ class Taxonomy extends Metadata_Type {
         // call metadatum type constructor
         parent::__construct();
         $this->set_primitive_type('term');
+        $this->set_repository( \Tainacan\Repositories\Terms::get_instance() );
         
         $this->set_default_options([
             'allow_new_terms' => 'no'
diff --git a/src/classes/repositories/class-tainacan-collections.php b/src/classes/repositories/class-tainacan-collections.php
index d31817d1f..b11374521 100644
--- a/src/classes/repositories/class-tainacan-collections.php
+++ b/src/classes/repositories/class-tainacan-collections.php
@@ -294,40 +294,6 @@ class Collections extends Repository {
 		return $this->insert( $object );
 	}
 
-	/**
-	 * @param $collection_id
-	 *
-	 * @return mixed|Collection
-	 */
-	public function delete( $collection_id ) {
-		$deleted = new Entities\Collection( wp_delete_post( $collection_id, true ) );
-
-		if ( $deleted && $this->use_logs) {
-			$this->logs_repository->insert_log( $deleted, [], false, true );
-
-			do_action( 'tainacan-deleted', $deleted );
-		}
-
-		return $deleted;
-	}
-
-	/**
-	 * @param $collection_id
-	 *
-	 * @return mixed|Collection
-	 */
-	public function trash( $collection_id ) {
-		$trashed = new Entities\Collection( wp_trash_post( $collection_id ) );
-
-		if ( $trashed && $this->use_logs) {
-			$this->logs_repository->insert_log( $trashed, [], false, false, true );
-
-			do_action( 'tainacan-trashed', $trashed );
-		}
-
-		return $trashed;
-	}
-
 	/**
 	 * fetch collection based on ID or WP_Query args
 	 *
diff --git a/src/classes/repositories/class-tainacan-filters.php b/src/classes/repositories/class-tainacan-filters.php
index cbc11e83a..33588309c 100644
--- a/src/classes/repositories/class-tainacan-filters.php
+++ b/src/classes/repositories/class-tainacan-filters.php
@@ -24,6 +24,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 );
 	}
 
 	public function get_map() {
@@ -39,7 +40,7 @@ class Filters extends Repository {
 			'order'               => [
 				'map'         => 'menu_order',
 				'title'       => __( 'Order', 'tainacan' ),
-				'type'        => 'string',
+				'type'        => 'string/integer',
 				'description' => __( 'Filter order. This metadata is used if filters were manually ordered.', 'tainacan' ),
 				'validation'  => ''
 			],
@@ -76,11 +77,11 @@ class Filters extends Repository {
 			'color'               => [
 				'map'         => 'meta',
 				'title'       => __( 'Color', 'tainacan' ),
-				'type'        => 'integer',
+				'type'        => 'integer/string',
 				'description' => __( 'Filter color', 'tainacan' ),
 				'validation'  => ''
 			],
-			'metadatum'           => [
+			'metadatum_id'           => [
 				'map'         => 'meta',
 				'title'       => __( 'Metadata', 'tainacan' ),
 				'type'        => 'integer',
@@ -187,40 +188,6 @@ class Filters extends Repository {
         return new Entities\Filter($metadatum->WP_Post);
     }*/
 
-	/**
-	 * @param $filter_id
-	 *
-	 * @return Entities\Filter
-	 */
-	public function delete( $filter_id ) {
-		$deleted = new Entities\Filter( wp_delete_post( $filter_id, true ) );
-
-		if ( $deleted && $this->use_logs) {
-			$this->logs_repository->insert_log( $deleted, [], false, true );
-
-			do_action( 'tainacan-deleted', $deleted );
-		}
-
-		return $deleted;
-	}
-
-	/**
-	 * @param $filter_id
-	 *
-	 * @return mixed|Entities\Filter
-	 */
-	public function trash( $filter_id ) {
-		$trashed = new Entities\Filter( wp_trash_post( $filter_id ) );
-
-		if ( $trashed && $this->use_logs) {
-			$this->logs_repository->insert_log( $trashed, [], false, false, true );
-
-			do_action( 'tainacan-trashed', $trashed );
-		}
-
-		return $trashed;
-	}
-
 	public function update( $object, $new_values = null ) {
 		return $this->insert( $object );
 	}
@@ -540,4 +507,22 @@ class Filters extends Repository {
 
 		return $result;
 	}
+	
+	public function hook_delete_when_metadata_deleted($filter, $permanent) {
+		
+		if ( $filter instanceof Entities\Metadatum ) {
+			$metadatum_id = $filter->get_id();
+			$filters = $this->fetch(['metadatum_id' => $metadatum_id, 'post_status' => 'any'], 'OBJECT');
+			foreach ($filters as $filter) {
+				if ($permanent) {
+					$this->delete($filter);
+				} else {
+					$this->trash($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 bbba4f980..ff0fef9ed 100644
--- a/src/classes/repositories/class-tainacan-item-metadata.php
+++ b/src/classes/repositories/class-tainacan-item-metadata.php
@@ -128,22 +128,6 @@ class Item_Metadata extends Repository {
 
 	}
 
-	/**
-	 * @param $item_metadata_id
-	 *
-	 * @return mixed|void
-	 */
-	public function delete( $item_metadata_id ) {
-	}
-
-	/**
-	 * @param $item_metadata_id
-	 *
-	 * @return mixed|void
-	 */
-	public function trash( $item_metadata_id ) {
-	}
-
 	/**
 	 * @param Entities\Item_Metadata_Entity $item_metadata
 	 *
diff --git a/src/classes/repositories/class-tainacan-items.php b/src/classes/repositories/class-tainacan-items.php
index d61ef5fb3..a78c2e391 100644
--- a/src/classes/repositories/class-tainacan-items.php
+++ b/src/classes/repositories/class-tainacan-items.php
@@ -284,7 +284,12 @@ class Items extends Repository {
 		$args = $this->parse_fetch_args( $args );
 
 		$args['post_type'] = $cpt;
-
+		
+		// In progress...
+		// if (isset($args['meta_query'])) {
+		// 	$args = $this->transform_meta_query_to_tax_query($args);
+		// }
+		
 		$args = apply_filters( 'tainacan_fetch_args', $args, 'items' );
 
 		$wp_query = new \WP_Query( $args );
@@ -318,39 +323,6 @@ class Items extends Repository {
 		return $this->insert( $object );
 	}
 
-	/**
-	 * @param $item_id
-	 *
-	 * @return mixed|Item
-	 */
-	public function delete( $item_id ) {
-		$deleted = new Entities\Item( wp_delete_post( $item_id, true ) );
-
-		if ( $deleted && $this->use_logs) {
-			$this->logs_repository->insert_log( $deleted, [], false, true );
-
-			do_action( 'tainacan-deleted', $deleted );
-		}
-
-		return $deleted;
-	}
-
-	/**
-	 * @param $item_id
-	 *
-	 * @return mixed|Item
-	 */
-	public function trash( $item_id ) {
-		$trashed = new Entities\Item( wp_trash_post( $item_id ) );
-
-		if ( $trashed && $this->use_logs) {
-			$this->logs_repository->insert_log( $trashed, [], false, false, true );
-
-			do_action( 'tainacan-trashed', $trashed );
-		}
-
-		return $trashed;
-	}
 
 	/**
 	 * allow wp query filter post by array of titles
@@ -407,6 +379,76 @@ class Items extends Repository {
 
 		return $where;
 	}
+	
+	public function transform_meta_query_to_tax_query($args) {
+		
+		if (!isset($args['meta_query']) || !is_array($args['meta_query'])) {
+			return $args;
+		}
+		
+		$metas = [];
+		
+		foreach ($args['meta_query'] as $i => $meta_q) {
+			if (is_array($meta_q) && isset($meta_q['key']) && is_numeric($meta_q['key'])) {
+				$metas[$meta_q['key']] = $i;
+			}
+		}
+		
+		$metadata = Metadata::get_instance()->fetch([
+			'metadata_type' => 'Tainacan\Metadata_Types\Taxonomy',
+			'post__in' => array_keys($metas)
+		], 'OBJECT');
+		
+		if (empty($metadata)) {
+			return $args;
+		}
+		
+		if (!isset($args['tax_query'])) {
+			$args['tax_query'] = [];
+		}
+		
+		foreach ($metadata as $metadatum) {
+			if ( isset($metas[$metadatum->get_id()]) ) {
+				$index = $metas[$metadatum->get_id()];
+				$metaquery = $args['meta_query'][$index];
+				$options = $metadatum->get_metadata_type_options();
+				$tax_id = $options['taxonomy_id'];
+				$tax_slug = Taxonomies::get_instance()->get_db_identifier_by_id($tax_id);
+				
+				if (!isset($metaquery['compare']) || $metaquery['compare'] == '=' || $metaquery['compare'] == 'IN' ) {
+					
+					$args['tax_query'][] = [
+						'taxonomy' => $tax_slug,
+						'field' => 'name',
+						'terms' => $terms,
+					];
+					
+				} elseif ( strtoupper($metaquery['compare']) == 'LIKE') {
+					$search['search'] = $metaquery['value'];
+					
+					$terms = get_terms([
+						'taxonomy' => $tax_slug,
+						'fields' => 'ids',
+						'search' => $metaquery['value']
+					]);
+					
+					$args['tax_query'][] = [
+						'taxonomy' => $tax_slug,
+						'terms' => $terms,
+					];
+					
+				} else {
+					continue;
+				}
+				
+				unset( $args['meta_query'][$index] );
+				
+			}
+		}
+		
+		return $args;
+		
+	}
 
 	/**
 	 * Get a default thumbnail ID from the item document.
diff --git a/src/classes/repositories/class-tainacan-logs.php b/src/classes/repositories/class-tainacan-logs.php
index 1170555cd..1c0b89777 100644
--- a/src/classes/repositories/class-tainacan-logs.php
+++ b/src/classes/repositories/class-tainacan-logs.php
@@ -215,12 +215,6 @@ class Logs extends Repository {
 		}
 	}
 
-	public function delete( $object ) {
-	}
-
-	public function trash( $object ) {
-	}
-
 	public function update( $object, $new_values = null ) {
 		return $this->insert( $object );
 	}
diff --git a/src/classes/repositories/class-tainacan-metadata.php b/src/classes/repositories/class-tainacan-metadata.php
index 0c7647d03..a809f8f4b 100644
--- a/src/classes/repositories/class-tainacan-metadata.php
+++ b/src/classes/repositories/class-tainacan-metadata.php
@@ -550,44 +550,6 @@ class Metadata extends Repository {
 		return $this->insert( $object );
 	}
 
-	/**
-	 * @param $metadatum_id
-	 *
-	 * @return mixed|void
-	 * @throws \Exception
-	 */
-	public function delete( $metadatum_id ) {
-		$deleted = new Entities\Metadatum( wp_delete_post( $metadatum_id, true ) );
-
-		if ( $deleted && $this->use_logs) {
-			$this->logs_repository->insert_log( $deleted, [], false, true );
-
-			do_action( 'tainacan-deleted', $deleted );
-		}
-
-		return $deleted;
-	}
-
-	/**
-	 * @param $metadatum_id
-	 *
-	 * @return mixed|Entities\Metadatum
-	 * @throws \Exception
-	 */
-	public function trash( $metadatum_id ) {
-		$this->delete_taxonomy_metadatum( $metadatum_id );
-
-		$trashed = new Entities\Metadatum( wp_trash_post( $metadatum_id ) );
-
-		if ( $trashed && $this->use_logs) {
-			$this->logs_repository->insert_log( $trashed, [], false, false, true );
-
-			do_action( 'tainacan-trashed', $trashed );
-		}
-
-		return $trashed;
-	}
-
 	/**
 	 * fetch all registered metadatum type classes
 	 *
@@ -1389,9 +1351,16 @@ class Metadata extends Repository {
 
 		}
 	}
+	
+	/**
+	 * @inheritDoc
+	 */
+	public function delete( Entities\Entity $entity, $permanent = true ) {
+		$this->delete_taxonomy_metadatum($entity);
+		return parent::delete($entity, $permanent);
+	}
 
-	private function delete_taxonomy_metadatum( $metadatum_id ) {
-		$metadatum     = $this->fetch( $metadatum_id );
+	private function delete_taxonomy_metadatum( $metadatum ) {
 		$metadata_type = $metadatum->get_metadata_type_object();
 
 		if ( $metadata_type->get_primitive_type() == 'term' ) {
diff --git a/src/classes/repositories/class-tainacan-repository.php b/src/classes/repositories/class-tainacan-repository.php
index 9a36a23c1..295eda8db 100644
--- a/src/classes/repositories/class-tainacan-repository.php
+++ b/src/classes/repositories/class-tainacan-repository.php
@@ -595,20 +595,44 @@ abstract class Repository {
 
 		return false;
 	}
+	
+	/**
+	 * Shortcut to delete($entity, false)
+	 * 
+	 * @param Entities\Entity $entity
+	 *
+	 * @return mixed|Entity @see https://developer.wordpress.org/reference/functions/wp_delete_post/
+	 */
+	public function trash( Entities\Entity $entity ) {
+		return $this->delete( $entity, false );
+	}
 
 	/**
-	 * @param $object
+	 * @param Entities\Entity $entity
+	 * @param bool $permanent If false, sendo to trash, if true, permanently delete. Default true
 	 *
-	 * @return mixed
+	 * @return mixed|Entity @see https://developer.wordpress.org/reference/functions/wp_delete_post/
 	 */
-	public abstract function delete( $object );
+	public function delete( Entities\Entity $entity, $permanent = true ) {
+		if ($permanent === true) {
+			$return = wp_delete_post( $entity->get_id(), $permanent );
+		} elseif ($permanent === false) {
+			$return = wp_trash_post( $entity->get_id() );
+		}
+		
 
-	/**
-	 * @param $object
-	 *
-	 * @return mixed
-	 */
-	public abstract function trash( $object );
+		if ( $return instanceof \WP_Post && $this->use_logs) {
+			$this->logs_repository->insert_log( $entity, [], false, false, true );
+			
+			do_action( 'tainacan-deleted', $entity, $permanent );
+			do_action( 'tainacan-deleted-' . $entity->get_post_type(), $entity, $permanent );
+			
+			$return = $this->get_entity_by_post($return);
+			
+		}
+
+		return $return;
+	}
 
 	/**
 	 * @param $args
diff --git a/src/classes/repositories/class-tainacan-taxonomies.php b/src/classes/repositories/class-tainacan-taxonomies.php
index 8f26780e3..d3a18f2c2 100644
--- a/src/classes/repositories/class-tainacan-taxonomies.php
+++ b/src/classes/repositories/class-tainacan-taxonomies.php
@@ -245,8 +245,8 @@ class Taxonomies extends Repository {
 		return $this->insert( $object );
 	}
 
-	public function delete( $taxonomy_id ) {
-		$taxonomy_name = $this->fetch( $taxonomy_id )->get_db_identifier();
+	public function delete( Entities\Entity $taxonomy, $permanent = true ) {
+		$taxonomy_name = $taxonomy->get_db_identifier();
 
 		/* TODO: Investigate the cause of taxonomies aren't been registered
 		 *
@@ -254,48 +254,16 @@ class Taxonomies extends Repository {
 		 *
 		 * This condition is a temporary solution
 		 */
-		if ( taxonomy_exists( $taxonomy_name ) ) {
+		if ( taxonomy_exists( $taxonomy_name ) && $permanent ) {
 			$unregistered = unregister_taxonomy( $taxonomy_name );
 
 			if ( $unregistered instanceof \WP_Error ) {
 				return $unregistered;
 			}
 		}
-
-		$deleted = new Entities\Taxonomy( wp_delete_post( $taxonomy_id, true ) );
-
-		if ( ! $deleted ) {
-			return $deleted;
-		}
-
-		if($this->use_logs){
-			$this->logs_repository->insert_log( $deleted, [], false, true );
-		}
-
-		do_action( 'tainacan-deleted', $deleted );
-
-		return $deleted;
-	}
-
-	/**
-	 * @param $taxonomy_id
-	 *
-	 * @return mixed|Entities\Taxonomy
-	 */
-	public function trash( $taxonomy_id ) {
-		$trashed = new Entities\Taxonomy( wp_trash_post( $taxonomy_id ) );
-
-		if ( ! $trashed ) {
-			return $trashed;
-		}
-
-		if($this->use_logs){
-			$this->logs_repository->insert_log( $trashed, [], false, false, true );
-		}
-
-		do_action( 'tainacan-trashed', $trashed );
-
-		return $trashed;
+		
+		return parent::delete($taxonomy, $permanent);
+		
 	}
 
 	public function added_collection( $taxonomy_id, $collection_id ) {
diff --git a/src/classes/repositories/class-tainacan-terms.php b/src/classes/repositories/class-tainacan-terms.php
index 66e9cbb53..3390ddc16 100644
--- a/src/classes/repositories/class-tainacan-terms.php
+++ b/src/classes/repositories/class-tainacan-terms.php
@@ -177,7 +177,7 @@ class Terms extends Repository {
 
 
 		do_action( 'tainacan-insert', $term, $diffs, $is_update );
-		do_action( 'tainacan-insert-Term', $term );
+		do_action( 'tainacan-insert-term', $term );
 
 		return new Entities\Term( $term_saved['term_id'], $term->get_taxonomy() );
 	}
@@ -260,24 +260,22 @@ class Terms extends Repository {
 	}
 
 	/**
-	 * @param Array $delete_args has ['term_id', 'taxonomy']
+	 * @param Entities\Term $term
+	 * @param bool $permanent this parameter is not used by Terms repository
 	 *
 	 * @return bool|int|mixed|\WP_Error
 	 */
-	public function delete( $delete_args ) {
-		$deleted = wp_delete_term( $delete_args['term_id'], $delete_args['taxonomy'] );
+	public function delete( Entities\Entity $term, $permanent = true ) {
+		$deleted = $term;
+		$return = wp_delete_term( $term->get_id(), $term->get_taxonomy() );
 
-		if ( $deleted ) {
-			$deleted_term_tainacan = new Entities\Term( $delete_args['term_id'], $delete_args['taxonomy'] );
-
-			if($this->use_logs){
-				$this->logs_repository->insert_log( $deleted_term_tainacan, [], false, true );
-			}
-
-			do_action( 'tainacan-deleted', $deleted_term_tainacan );
+		if ( $deleted && $this->use_logs ) {
+			$this->logs_repository->insert_log( $deleted, [], false, true );
+			do_action( 'tainacan-deleted', $deleted );
+			do_action( 'tainacan-deleted-term', $deleted );
 		}
 
-		return $deleted;
+		return $return;
 	}
 	
 	/**
@@ -341,13 +339,6 @@ class Terms extends Repository {
 		
 	}
 
-	/**
-	 * @param $term_id
-	 *
-	 * @return mixed|void
-	 */
-	public function trash( $term_id ) {
-	}
 
 	public function register_post_type() {
 	}
diff --git a/src/classes/tainacan-creator.php b/src/classes/tainacan-creator.php
index 3f63c8c92..82af1c2a1 100644
--- a/src/classes/tainacan-creator.php
+++ b/src/classes/tainacan-creator.php
@@ -133,6 +133,8 @@ $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');
 $Tainacan_Filters->register_filter_type('Tainacan\Filter_Types\Autocomplete');
 $Tainacan_Filters->register_filter_type('Tainacan\Filter_Types\Taginput');
diff --git a/src/classes/traits/class-tainacan-formatter-text.php b/src/classes/traits/class-tainacan-formatter-text.php
index 08cdffc72..f89350aec 100644
--- a/src/classes/traits/class-tainacan-formatter-text.php
+++ b/src/classes/traits/class-tainacan-formatter-text.php
@@ -16,8 +16,10 @@ trait Formatter_Text {
 	 * @return string Texts with url's transformed in html tag <a>
 	 */
 	public function make_clickable_links($text) {
-		$url = '~((http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/)?www\.[^"<\s]+)(?![^<>]*>|[^"]*?<\/a)~i';
+		$url = '~((www\.|http:\/\/www\.|http:\/\/|https:\/\/www\.|https:\/\/|ftp:\/\/www\.|ftp:\/\/|ftps:\/\/www\.|ftps:\/\/)[^"<\s]+)(?![^<>]*>|[^"]*?<\/a)~i';
 		$text = preg_replace($url, '<a href="$0" target="_blank" title="$0">$0</a>', $text);
+		$text = str_replace('href="www.', 'href="http://www.', $text);
+
 		return $text;
 	}
 }
\ No newline at end of file
diff --git a/src/exporter/class-tainacan-csv.php b/src/exporter/class-tainacan-csv.php
index b1de606e2..34d4d9f7e 100644
--- a/src/exporter/class-tainacan-csv.php
+++ b/src/exporter/class-tainacan-csv.php
@@ -52,6 +52,8 @@ class CSV extends Exporter {
 		
 		$line[] = $this->get_attachments_cell($item);
 		
+		$line[] = $item->get_comment_status();
+		
 		$line_string = $this->str_putcsv($line, $this->get_option('delimiter'), $this->get_option('enclosure'));
 		
 		
@@ -111,6 +113,7 @@ class CSV extends Exporter {
 		$line[] = 'special_item_status';
 		$line[] = 'special_document';
 		$line[] = 'special_attachments';
+		$line[] = 'special_comment_status';
 		
 		$line_string = $this->str_putcsv($line, $this->get_option('delimiter'), $this->get_option('enclosure'));
 		
diff --git a/src/exporter/class-tainacan-exporter.php b/src/exporter/class-tainacan-exporter.php
index deb93b334..43910df11 100644
--- a/src/exporter/class-tainacan-exporter.php
+++ b/src/exporter/class-tainacan-exporter.php
@@ -629,7 +629,8 @@ class Exporter extends CommunImportExport {
 		$filters = [
 			'posts_per_page' => 1,
 			'paged'   => $index+1,
-			'order'   => 'DESC'
+			'order'   => 'DESC',
+			'orderby' => 'ID'
 		];
 
 		$this->add_log('Proccessing item index ' . $index . ' in collection ' . $collection_definition['id'] );
diff --git a/src/gutenberg-blocks/class-tainacan-gutenberg-block.php b/src/gutenberg-blocks/class-tainacan-gutenberg-block.php
index a6fd8d06e..43b3c0fc3 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_collections_list');
+	add_action('init', 'tainacan_blocks_register_tainacan_facets_list');
 
 	add_action('init', 'tainacan_blocks_add_plugin_settings');
 	
@@ -59,6 +60,36 @@ function tainacan_blocks_register_tainacan_terms_list(){
 	}
 }
 
+function tainacan_blocks_register_tainacan_facets_list(){
+	global $TAINACAN_BASE_URL;
+
+	wp_enqueue_script(
+		'facets-list-theme',
+		$TAINACAN_BASE_URL . '/assets/gutenberg_facets_list_theme-components.js',
+		array('wp-components')
+	);
+
+	wp_register_script(
+		'facets-list',
+		$TAINACAN_BASE_URL . '/assets/gutenberg_facets_list-components.js',
+		array('wp-blocks', 'wp-element', 'wp-components', 'wp-editor')
+	);
+
+	wp_register_style(
+		'facets-list',
+		$TAINACAN_BASE_URL . '/assets/css/tainacan-gutenberg-block-facets-list.css',
+		array('wp-edit-blocks')
+	);
+
+	if (function_exists('register_block_type')) {
+		register_block_type( 'tainacan/facets-list', array(
+			'editor_script' => 'facets-list',
+			'style'         => 'facets-list',
+			'script'		=> 'facets-list-theme'
+		) );
+	}
+}
+
 function tainacan_blocks_register_tainacan_items_list(){
 	global $TAINACAN_BASE_URL;
 
@@ -139,10 +170,12 @@ function tainacan_blocks_get_plugin_js_settings(){
 	global $TAINACAN_BASE_URL;
 
 	$settings = [
-		'root'     => esc_url_raw( rest_url() ) . 'tainacan/v2',
-		'nonce'    => wp_create_nonce( 'wp_rest' ),
-		'base_url' => $TAINACAN_BASE_URL,
-		'admin_url' => admin_url()
+		'root'     	=> esc_url_raw( rest_url() ) . 'tainacan/v2',
+		'nonce'   	=> wp_create_nonce( 'wp_rest' ),
+		'base_url' 	=> $TAINACAN_BASE_URL,
+		'admin_url' => admin_url(),
+		'site_url'	=> site_url(),
+		'theme_items_list_url' => esc_url_raw( get_site_url() ) . '/' . \Tainacan\Theme_Helper::get_instance()->get_items_list_slug(),
 	];
 
 	return $settings;
@@ -156,4 +189,5 @@ 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( 'collections-list', 'tainacan_plugin', $settings );
+	wp_localize_script( 'facets-list', 'tainacan_plugin', $settings );
 }
diff --git a/src/gutenberg-blocks/gutenberg-blocks-style.scss b/src/gutenberg-blocks/gutenberg-blocks-style.scss
index dc5daf4ff..2121e8eba 100644
--- a/src/gutenberg-blocks/gutenberg-blocks-style.scss
+++ b/src/gutenberg-blocks/gutenberg-blocks-style.scss
@@ -94,6 +94,11 @@
         }
     }
 
+    .modal-radio-area-label {
+        font-weight: bold;
+        margin-left: 1.75rem;
+    }
+
     .modal-checkbox-list,
     .modal-radio-list .components-base-control__field {
         padding: 0;
diff --git a/src/gutenberg-blocks/tainacan-collections/collections-list/index.js b/src/gutenberg-blocks/tainacan-collections/collections-list/index.js
index 291dc25c3..22040662d 100644
--- a/src/gutenberg-blocks/tainacan-collections/collections-list/index.js
+++ b/src/gutenberg-blocks/tainacan-collections/collections-list/index.js
@@ -13,6 +13,7 @@ registerBlockType('tainacan/collections-list', {
     icon:
         <svg width="24" height="24" viewBox="0 -5 12 16">
             <path
+                fill="#298596"
                 d="M10,8.8v1.3H1.2C0.6,10.1,0,9.5,0,8.8V2.5h1.3v6.3H10z M6.9,0H3.8C3.1,0,2.5,0.6,2.5,1.3l0,5c0,0.7,0.6,1.2,1.3,1.2h7.5
                 c0.7,0,1.3-0.6,1.3-1.2V2.5c0-0.7-0.6-1.2-1.3-1.2H8.2L6.9,0z"/>       
         </svg>,
diff --git a/src/gutenberg-blocks/tainacan-facets/facets-list/facets-list-theme.js b/src/gutenberg-blocks/tainacan-facets/facets-list/facets-list-theme.js
new file mode 100644
index 000000000..5e71d0071
--- /dev/null
+++ b/src/gutenberg-blocks/tainacan-facets/facets-list/facets-list-theme.js
@@ -0,0 +1,84 @@
+import Vue from 'vue';
+import FacetsListTheme from './facets-list-theme.vue';
+
+// This is rendered on the theme side.
+document.addEventListener("DOMContentLoaded", () => {
+
+    // Configure Vue logic before passing it to constructor:
+    let vueOptions = {
+        data: {
+            metadatumId: '',
+            metadatumType: '', 
+            collectionId: '',
+            collectionSlug: '',  
+            showImage: true,
+            showItemsCount: true,
+            showSearchBar: false,
+            showLoadMore: false,
+            layout: 'grid',
+            cloudRate: 1,
+            gridMargin: 0,
+            maxFacetsNumber: 12,
+            tainacanApiRoot: '',
+            tainacanBaseUrl: '',
+            tainacanSiteUrl: '',
+            className: ''
+        },
+        render(h){ 
+            return h(FacetsListTheme, {
+                props: {
+                    metadatumId: this.metadatumId,
+                    metadatumType: this.metadatumType, 
+                    collectionId: this.collectionId,
+                    collectionSlug: this.collectionSlug,  
+                    showImage: this.showImage,
+                    showItemsCount: this.showItemsCount,
+                    showSearchBar: this.showSearchBar,
+                    showLoadMore: this.showLoadMore,
+                    layout: this.layout,
+                    cloudRate: this.cloudRate,
+                    gridMargin: this.gridMargin,
+                    maxFacetsNumber: this.maxFacetsNumber,
+                    tainacanApiRoot: this.tainacanApiRoot,
+                    tainacanBaseUrl: this.tainacanBaseUrl,
+                    tainacanSiteUrl: this.tainacanSiteUrl,
+                    className: this.className    
+                }
+            });
+        },
+        beforeMount () {
+            this.metadatumId = this.$el.attributes['metadatum-id'] != undefined ? this.$el.attributes['metadatum-id'].value : undefined;
+            this.metadatumType = this.$el.attributes['metadatum-type'] != undefined ? this.$el.attributes['metadatum-type'].value : undefined;
+            this.collectionId = this.$el.attributes['collection-id'] != undefined ? this.$el.attributes['collection-id'].value : undefined;
+            this.collectionSlug = this.$el.attributes['collection-slug'] != undefined ? this.$el.attributes['collection-slug'].value : undefined;
+            this.showImage = this.$el.attributes['show-image'] != undefined ? this.$el.attributes['show-image'].value == 'true' : true;
+            this.showItemsCount = this.$el.attributes['show-items-count'] != undefined ? this.$el.attributes['show-items-count'].value == 'true' : true;
+            this.showSearchBar = this.$el.attributes['show-search-bar'] != undefined ? this.$el.attributes['show-search-bar'].value == 'true' : false;
+            this.showLoadMore = this.$el.attributes['show-load-more'] != undefined ? this.$el.attributes['show-load-more'].value == 'true' : false;
+            this.layout = this.$el.attributes['layout'] != undefined ? this.$el.attributes['layout'].value : undefined;
+            this.cloudRate = this.$el.attributes['cloud-rate'] != undefined ? Number(this.$el.attributes['cloud-rate'].value) : undefined;
+            this.gridMargin = this.$el.attributes['grid-margin'] != undefined ? Number(this.$el.attributes['grid-margin'].value) : undefined;
+            this.maxFacetsNumber = this.$el.attributes['max-facets-number'] != undefined ? this.$el.attributes['max-facets-number'].value : undefined;
+            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;
+            this.tainacanSiteUrl = this.$el.attributes['tainacan-site-url'] != undefined ? this.$el.attributes['tainacan-site-url'].value : undefined;
+            this.className = this.$el.attributes.class != undefined ? this.$el.attributes.class.value : undefined;
+        },
+        methods: {
+            __(text, domain) {
+                return wp.i18n.__(text, domain);
+            }
+        }
+    };
+    // Gets all divs with content created by our block;
+    let blocks = document.getElementsByClassName('wp-block-tainacan-facets-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) {
+            new Vue( Object.assign({ el: '#' + blockId }, jQuery.extend(true, {}, vueOptions)) );
+        }
+    }
+});
\ No newline at end of file
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
new file mode 100644
index 000000000..be8e24a2b
--- /dev/null
+++ b/src/gutenberg-blocks/tainacan-facets/facets-list/facets-list-theme.vue
@@ -0,0 +1,289 @@
+<template>
+    <div :class="className">
+        <div
+                v-if="showSearchBar"
+                class="facets-search-bar"> 
+            <button
+                    :label="$root.__('Search', 'tainacan')"
+                    class="search-button">
+                <span class="icon">
+                    <i>
+                        <svg    
+                                width="24"
+                                height="24"
+                                viewBox="-2 -2 20 20">
+                            <path
+                                    class="st0"
+                                    d="M0,5.8C0,5,0.2,4.2,0.5,3.5s0.7-1.3,1.2-1.8s1.1-0.9,1.8-1.2C4.2,0.1,5,0,5.8,0S7.3,0.1,8,0.5
+                                    c0.7,0.3,1.3,0.7,1.8,1.2s0.9,1.1,1.2,1.8c0.5,1.2,0.5,2.5,0.2,3.7c0,0.2-0.1,0.4-0.2,0.6c0,0.1-0.2,0.6-0.2,0.6
+                                    c0.6,0.6,1.3,1.3,1.9,1.9c0.7,0.7,1.3,1.3,2,2c0,0,0.3,0.2,0.3,0.3c0,0.3-0.1,0.7-0.3,1c-0.2,0.6-0.8,1-1.4,1.2
+                                    c-0.1,0-0.6,0.2-0.6,0.1c0,0-4.2-4.2-4.2-4.2c0,0-0.8,0.3-0.8,0.4c-1.3,0.4-2.8,0.5-4.1-0.1c-0.7-0.3-1.3-0.7-1.8-1.2
+                                    C1.2,9.3,0.8,8.7,0.5,8S0,6.6,0,5.8z M1.6,5.8c0,0.4,0.1,0.9,0.2,1.3C2.1,8.2,3,9.2,4.1,9.6c0.5,0.2,1,0.3,1.6,0.3
+                                    c0.6,0,1.1-0.1,1.6-0.3C8.7,9,9.7,7.6,9.8,6c0.1-1.5-0.6-3.1-2-3.9c-0.9-0.5-2-0.6-3-0.4C4.6,1.8,4.4,1.9,4.1,2
+                                    c-0.5,0.2-1,0.5-1.4,0.9C2,3.7,1.6,4.7,1.6,5.8z"/>       
+                        </svg>
+                    </i>
+                </span>
+            </button>
+            <input
+                    :value="searchString"
+                    @input="(value) => applySearchString(value)"
+                    type="text">
+        </div>
+        <ul
+                v-if="isLoading"
+                :style="{
+                    gridTemplateColumns: layout == 'grid' ? 'repeat(auto-fill, ' + (gridMargin + 185) + 'px)' : 'inherit', 
+                    marginTop: showSearchBar ? '1.5rem' : '0px'
+                }"
+                class="facets-list"
+                :class="'facets-layout-' + layout + (!showName ? ' facets-list-without-margin' : '')">
+                <li
+                        :key="facet"
+                        v-for="facet in Number(maxFacetsNumber)"
+                        class="facet-list-item skeleton"
+                        :style="{ 
+                            marginBottom: layout == 'grid' && ((metadatumType == 'Relationship' || metadatumType == 'Taxonomy') && showImage) ? (showName ? gridMargin + 12 : gridMargin) + 'px' : '',
+                            height: getSkeletonHeight()
+                        }" />      
+        </ul>
+        <div v-else>
+            <ul 
+                    v-if="facets.length > 0"
+                    :style="{
+                        gridTemplateColumns: layout == 'grid' ? 'repeat(auto-fill, ' + (gridMargin + 185) + 'px)' : 'inherit', 
+                        marginTop: showSearchBar ? '1.5rem' : '0px'
+                    }"
+                    class="facets-list"
+                    :class="'facets-layout-' + layout">
+                <li
+                        :key="index"
+                        v-for="(facet, index) of facets"
+                        class="facet-list-item"
+                        :class="(!showImage ? 'facet-without-image' : '')"
+                        :style="{ marginBottom: layout == 'grid' ? gridMargin + 'px' : ''}">      
+                    <a 
+                            :id="isNaN(facet.id) ? facet.id : 'facet-id-' + facet.id"
+                            :href="facet.url"
+                            target="_blank"
+                            :style="{ fontSize: layout == 'cloud' && facet.total_items ? + (1 + (cloudRate/4) * Math.log(facet.total_items)) + 'rem' : ''}">
+                        <img
+                            v-if="metadatumType == 'Taxonomy'"
+                            :src=" 
+                                facet.entity && facet.entity['header_image']
+                                    ?    
+                                facet.entity['header_image']
+                                    : 
+                                `${tainacanBaseUrl}/admin/images/placeholder_square.png`
+                            "
+                            :alt="facet.title ? facet.title : $root.__('Thumbnail', 'tainacan')">
+                        <img
+                            v-if="metadatumType == 'Relationship'"
+                            :src=" 
+                                facet.entity.thumbnail && facet.entity.thumbnail['tainacan-medium'][0] && facet.entity.thumbnail['tainacan-medium'][0] 
+                                    ?
+                                facet.entity.thumbnail['tainacan-medium'][0] 
+                                    :
+                                (facet.entity.thumbnail && facet.entity.thumbnail['thumbnail'][0] && facet.entity.thumbnail['thumbnail'][0]
+                                    ?    
+                                facet.entity.thumbnail['thumbnail'][0] 
+                                    : 
+                                `${tainacanBaseUrl}/admin/images/placeholder_square.png`)
+                            "
+                            :alt="facet.title ? facet.title : $root.__('Thumbnail', 'tainacan')">
+                        <span>{{ facet.label ? facet.label : '' }}</span>
+                        <span 
+                                v-if="facet.total_items"
+                                class="facet-item-count"
+                                :style="{ display: !showItemsCount ? 'none' : '' }">
+                            &nbsp;({{ facet.total_items }})
+                        </span>
+                    </a>
+                </li>
+            </ul>
+
+            <button
+                    v-if="showLoadMore && facets.length > 0 && (facets.length < totalFacets || lastTerm != '')"
+                    @click="loadMore()"
+                    class="show-more-button"
+                    :label="$root.__('Show more', 'tainacan')">
+                <span class="icon">
+                    <i>
+                        <svg
+                                width="24"
+                                height="24"
+                                viewBox="4 3 24 24">
+                            <path d="M 7.41,8.295 6,9.705 l 6,6 6,-6 -1.41,-1.41 -4.59,4.58 z"/>
+                            <path
+                                    d="M0 0h24v24H0z"
+                                    fill="none"/>                        
+                        </svg>
+                    </i>
+                </span>
+            </button>
+            <div
+                    v-else
+                    class="spinner-container">
+                {{ facets.length > 0 ? '' : $root.__('Nothing found.', 'tainacan') }}
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import axios from 'axios';
+import qs from 'qs';
+import { debounce } from 'lodash';
+
+export default {
+    name: "FacetsListTheme",
+    data() {
+        return {
+            facets: [],
+            collection: undefined,
+            facetsRequestSource: undefined,
+            searchString: '',
+            isLoading: false,
+            isLoadingCollection: false,
+            localMaxFacetsNumber: undefined,
+            localOrder: undefined,
+            tainacanAxios: undefined,
+            offset: undefined,
+            totalFacets: 0,
+            lastTerm: undefined
+        }
+    },
+    props: {
+        metadatumId: String,  
+        metadatumType: String,  
+        collectionId: String,  
+        collectionSlug: String,  
+        showImage: Boolean,
+        showItemsCount: Boolean,
+        showSearchBar: Boolean,
+        showLoadMore: Boolean,
+        layout: String,
+        cloudRate: Number,
+        gridMargin: Number,
+        maxFacetsNumber: Number,
+        tainacanApiRoot: String,
+        tainacanBaseUrl: String,
+        tainacanSiteUrl: String,
+        className: String
+    },
+    methods: {
+        applySearchString: debounce(function(event) { 
+
+            let value = event.target.value;
+
+            if (this.searchString != value) {
+                this.searchString = value;
+                this.offset = 0;
+                this.lastTerm = '';
+                this.fetchFacets();
+            }
+        }, 500),
+        loadMore() {
+            this.offset += Number(this.maxFacetsNumber);
+            this.fetchFacets();
+        },
+        fetchFacets() {
+            if (this.offset == 0)
+                this.facets = [];
+
+            this.isLoading = true;
+            
+            if (this.facetsRequestSource != undefined && typeof this.facetsRequestSource == 'function')
+                this.facetsRequestSource.cancel('Previous facets search canceled.');
+
+            this.facetsRequestSource = axios.CancelToken.source();
+
+            let endpoint = '/facets/' + this.metadatumId;
+            let query = endpoint.split('?')[1];
+            let queryObject = qs.parse(query);
+
+            // Set up max facets to be shown
+            if (this.maxFacetsNumber != undefined && Number(this.maxFacetsNumber) > 0)
+                queryObject.number = this.maxFacetsNumber;
+            else if (queryObject.number != undefined && queryObject.number > 0)
+                this.localMaxFacetsNumber = queryObject.number;
+            else {
+                queryObject.number = 12;
+                this.localMaxFacetsNumber = 12;
+            }
+
+            // Set up searching string
+            if (this.searchString != undefined)
+                queryObject.search = this.searchString;
+            else if (queryObject.search != undefined)
+                this.searchString = queryObject.search;
+            else {
+                delete queryObject.search;
+                this.searchString = undefined;
+            }
+
+            // Set up paging
+            queryObject.offset = this.offset;
+            if (this.lastTerm != undefined)
+                queryObject.last_term = this.lastTerm;
+            
+            // Parameter fo tech entity object with image and url
+            queryObject['context'] = 'extended';
+
+            endpoint = endpoint.split('?')[0] + '?' + qs.stringify(queryObject);
+            
+            this.tainacanAxios.get(endpoint, { cancelToken: this.facetsRequestSource.token })
+                .then(response => {
+
+                    if (this.metadatumType == 'Taxonomy') {
+                        for (let facet of response.data.values) {
+                            this.facets.push(Object.assign({ 
+                                url: facet.entity && facet.entity.url ? facet.entity.url : this.tainacanSiteUrl + '/' + this.collectionSlug + '/#/?taxquery[0][compare]=IN&taxquery[0][taxonomy]=' + facet.taxonomy + '&taxquery[0][terms][0]=' + facet.value
+                            }, facet));
+                        }
+                    } else {
+                        for (let facet of response.data.values) {
+                            this.facets.push(Object.assign({ 
+                                url: this.tainacanSiteUrl + '/' + this.collectionSlug + '/#/?metaquery[0][key]=' + this.metadatumId + '&metaquery[0][value]=' + facet.value
+                            }, facet));
+                        }
+                    }
+ 
+                    this.isLoading = false;
+                    this.totalFacets = Number(response.headers['x-wp-total']);
+                    this.lastTerm = response.data.values.length > 0 ? response.data.last_term : '';
+
+                }).catch(() => { 
+                    this.isLoading = false;
+                    // console.log(error);
+                });
+        },
+        getSkeletonHeight() {
+            switch(this.layout) {
+                case 'grid':
+                    if ((this.metadatumType == 'Relationship' || this.metadatumType == 'Taxonomy') && this.showImage)
+                        return '230px';
+                    else
+                        return '24px'
+                case 'list':
+                    if ((this.metadatumType == 'Relationship' || this.metadatumType == 'Taxonomy') && this.showImage)
+                        return '54px';
+                    else
+                        return '24px'
+                default: return '54px';
+            }
+        }
+    },
+    created() {
+        this.tainacanAxios = axios.create({ baseURL: this.tainacanApiRoot });
+        this.offset = 0;
+        this.fetchFacets();
+    },
+}
+</script>
+
+<style lang="scss">
+
+    @import './facets-list.scss';
+
+</style>
diff --git a/src/gutenberg-blocks/tainacan-facets/facets-list/facets-list.scss b/src/gutenberg-blocks/tainacan-facets/facets-list/facets-list.scss
new file mode 100644
index 000000000..67483c613
--- /dev/null
+++ b/src/gutenberg-blocks/tainacan-facets/facets-list/facets-list.scss
@@ -0,0 +1,429 @@
+@import '../../gutenberg-blocks-style.scss';
+
+.wp-block-tainacan-facets-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;
+    }
+
+    // Collection header
+    .facets-collection-header {
+        display: flex;
+        width: 100%;
+        align-items: stretch;
+        text-decoration: none !important;
+        &:hover {
+            text-decoration: none;
+        }
+
+        .collection-name {
+            width: auto;
+            min-width: 350px;
+            flex-grow: 1;
+            padding: 1rem 100px 1rem 1rem;
+            text-align: right;
+            line-height: 1.5rem;
+            min-height: 165px;
+            display: flex;
+            justify-content: flex-end;
+            align-items: center;
+            background-color: #454647;
+
+            h3 { 
+                color: white; 
+                text-decoration: none;
+                font-size: 1.3rem;
+                &:hover {
+                    text-decoration: none;
+                }
+            }
+            span.label { 
+                font-weight: normal; 
+                font-size: 1rem;
+            }
+
+            &.only-collection-name {
+                justify-content: center;
+                padding: 1rem; 
+                h3 {
+                    text-align: center;
+                    font-size: 1.75rem;
+                }
+            }
+        }
+        .collection-thumbnail {
+            height: 145px;
+            width: 145px;
+            background-size: cover;
+            background-position: center;
+            border-radius: 80px;
+            border: 4px solid white;
+            margin: 10px;
+            flex-shrink: 0;
+            position: relative;
+            margin-left: -155px; 
+            left: 82px;
+            background-color: #dbdbdb;
+        }
+        .collection-header-image {
+            width: auto;
+            min-width: 150px;
+            min-height: 165px;
+            flex-grow: 2;
+            background-size: cover;
+            background-position: center;
+            background-color: #dbdbdb;
+        }
+
+        @media only screen and (max-width: 1024px) { 
+            flex-wrap: wrap-reverse;
+
+            .collection-name {
+                width: 100% !important;
+                min-width: 100% !important;
+                justify-content: center !important;
+                text-align: center !important;
+                padding: 64px 1rem 0rem 1rem;
+                h3 { margin-bottom: 1rem; }
+            }
+            .collection-thumbnail {
+                left: calc(-50% + 78px) !important;
+                top: -78px !important;
+            }
+            .collection-header-image {
+                background-color: transparent;
+            }
+        }
+    }
+
+    // Search control bar
+    .facets-search-bar {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        border-bottom: 1px solid #cbcbcb;
+        padding: 1.00rem 0.5rem 0.75rem 0.5rem;
+
+        @media only screen and (max-width: 768px) {
+            flex-wrap: wrap;
+
+            .search-button {
+                order: 4;
+                position: absolute;
+                margin-top: 37px;
+            }
+            input {
+                width: 100% !important;
+                order: 5;
+                margin-top: 8px;
+                margin-left: 0px !important;
+                padding-left: 4px !important;
+                border-color: #dbdbdb !important;
+            }
+        } 
+
+        button {
+            margin-right: 0.75rem;
+            padding: 0 0.35rem;
+            min-height: 28px;
+            z-index: 2;
+            border: none;
+            background: transparent;
+            cursor: pointer;
+
+            svg { 
+                fill: #cbcbcb; 
+                transition: fill 0.4s ease;
+            }
+            &:hover svg { fill: #545758; }
+            &:focus, &:active { border: none; box-shadow: none; }
+            &.sorting-button-selected svg {
+                fill: #545758;
+            }
+            &.next-button {
+                margin-right: 0rem;
+                padding: 0;
+
+                svg { fill: #298596; }
+            }
+            &.previous-button {
+                margin-left: auto;
+                margin-right: 1rem;
+                padding: 0;
+
+                svg { fill: #298596; }
+            }
+            &[disabled] svg {
+                fill: #f2f2f2;
+                cursor: not-allowed;
+            }
+        }
+        input {
+            height: 32px;
+            width: 20%;
+            border-radius: 0;
+            margin-left: -52px;
+            padding-left: 52px;
+            border: 1px solid white;
+            transition: border-color 0.7s ease, width 0.5s ease-in;
+
+            &:focus,
+            &:active,
+            &:hover {
+                width: 100%;
+                border: 1px solid #cbcbcb;
+                box-shadow: none;
+            }
+        }
+    }
+
+    // Grid View Mode ----------------------------------------------------
+    ul.facets-list.facets-layout-grid,
+    ul.facets-list-edit.facets-layout-grid {
+        padding: 0;
+        display: -ms-grid;
+        display: grid;
+        grid-template-columns: repeat(auto-fill, 220px);
+        grid-gap: 0px;
+        justify-content: space-evenly;
+        list-style-type: none;
+
+        li.facet-list-item {
+            position: relative;
+            display: block;
+            margin: 12px;
+            width: 185px;
+
+            a { 
+                color: #454647; 
+                font-weight: bold;
+                line-height: normal;
+            }
+
+            img {
+                height: auto;
+                width: 185px;
+                min-width: 185px;
+                padding: 0px;
+                margin-bottom: 0.5rem;
+            }
+
+            span.facet-item-count {
+                color: #cbcbcb;
+            }
+
+            &.facet-without-image img {
+                display: none;
+            }
+
+            &:hover a { 
+                color: #454647; 
+                text-decoration: none;
+            }
+        }
+    }
+    ul.facets-list-edit li.facet-list-item {
+        display: flex;
+        align-items: flex-start;
+
+        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;
+        }
+    }
+    @media only screen and (max-width: 498px) { 
+        
+        ul.facets-list.facets-layout-grid,
+        ul.facets-list-edit.facets-layout-grid {
+            grid-template-columns: repeat(auto-fill, 100%);
+
+            li.facet-list-item { 
+                width: 100%;
+                img { width: 100%; }
+            }
+        }
+    }
+
+    // List View Mode ----------------------------------------------------
+    ul.facets-list.facets-layout-list,
+    ul.facets-list-edit.facets-layout-list {
+        padding: 0;
+        display: block;
+        list-style-type: none;
+
+        li.facet-list-item {
+            position: relative;
+            display: inline-block;
+            margin: 12px;
+            min-height: 24px;
+            min-width: 22%;
+            width: 22%;
+
+            a { 
+                color: #454647; 
+                // overflow: hidden;
+                // text-overflow: ellipsis;
+                // white-space: nowrap;
+                display: flex;
+                align-items: center;
+                height: 54px;
+            }
+
+            img {
+                height: auto;
+                width: 54px;
+                min-width: 54px;
+                padding: 0px;
+                margin-right: 20px;
+            }
+
+            &.facet-without-image { 
+                min-height: 0.875rem;
+                a {
+                    height: 0.875rem;
+                }
+                img {
+                    display: none;
+                }
+            }
+            span.facet-item-count {
+                color: #cbcbcb;
+            }
+
+            &:hover a { 
+                color: #454647; 
+                text-decoration: none;
+            }
+        }
+    }
+
+    // Cloud View Mode ----------------------------------------------------
+    ul.facets-list.facets-layout-cloud,
+    ul.facets-list-edit.facets-layout-cloud {
+        padding: 0;
+        display: block;
+        list-style-type: none;
+        text-align: center;
+
+        li.facet-list-item {
+            position: relative;
+            display: inline-block;
+            margin: 5px 12px;
+            line-height: normal;
+            vertical-align: middle;
+
+            a { 
+                color: #454647; 
+                // overflow: hidden;
+                // text-overflow: ellipsis;
+                // white-space: nowrap;
+                display: flex;
+                align-items: center;
+                height: 54px;
+            }
+
+            img {
+                height: auto;
+                width: 54px;
+                min-width: 54px;
+                padding: 0px;
+                margin-right: 20px;
+            }
+
+            &.facet-without-image img {
+                display: none;
+            }
+            span.facet-item-count {
+                color: #cbcbcb;
+            }
+
+            &:hover a { 
+                color: #298596;
+                text-decoration: none;
+            }
+        }
+    }
+
+    .show-more-button {
+        margin: 12px auto;
+        padding: 0.25rem;
+        display: block;
+        background: #298596;
+        border: none;
+        height: 24px;
+        width: 24px;
+        cursor: pointer;
+
+        &[disabled] {
+            background-color: #cbcbcb;
+        }
+        
+        i>svg {
+            fill: white;
+        }
+    }
+}
diff --git a/src/gutenberg-blocks/tainacan-facets/facets-list/index.js b/src/gutenberg-blocks/tainacan-facets/facets-list/index.js
new file mode 100644
index 000000000..6910bfcd8
--- /dev/null
+++ b/src/gutenberg-blocks/tainacan-facets/facets-list/index.js
@@ -0,0 +1,673 @@
+const { registerBlockType } = wp.blocks;
+
+const { __ } = wp.i18n;
+
+const { RangeControl, Spinner, Button, ToggleControl, Tooltip, Placeholder, Toolbar, PanelBody } = wp.components;
+
+const { InspectorControls, BlockControls } = wp.editor;
+
+import MetadataModal from './metadata-modal.js';
+import tainacan from '../../api-client/axios.js';
+import axios from 'axios';
+import qs from 'qs';
+
+registerBlockType('tainacan/facets-list', {
+    title: __('Tainacan Facets List', '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,13.64,19.32,16a2.57,2.57,0,0,1-2,1H11a3.91,3.91,0,0,0,0-.49,5.49,5.49,0,0,0-5-5.47V9.64A2.59,2.59,0,0,1,8.59,7H17.3a2.57,2.57,0,0,1,2,1l2.11,2.38A2.59,2.59,0,0,1,21.43,13.64ZM4,3A2,2,0,0,0,2,5v7.3a5.32,5.32,0,0,1,2-1V5H16V3ZM11,21l-1,1L8.86,20.89,8,20H8l-.57-.57A3.42,3.42,0,0,1,5.5,20a3.5,3.5,0,0,1,0-7,2.74,2.74,0,0,1,.5,0A3.5,3.5,0,0,1,9,16a2.92,2.92,0,0,1,0,.51,3.42,3.42,0,0,1-.58,1.92L9,19H9l.85.85Zm-4-4.5A1.5,1.5,0,1,0,5.5,18,1.5,1.5,0,0,0,7,16.53Z"/>
+        </svg>,
+    category: 'tainacan-blocks',
+    keywords: [ __( 'facets', 'tainacan' ), __( 'search', 'tainacan' ), __( 'terms', 'tainacan' ) ],
+    attributes: {
+        content: {
+            type: 'array',
+            source: 'children',
+            selector: 'div'
+        },
+        collectionId: {
+            type: String,
+            default: undefined
+        },
+        collectionSlug: {
+            type: String,
+            default: undefined
+        },
+        facets: {
+            type: Array,
+            default: []
+        },
+        facetsObject: {
+            type: Array,
+            default: []
+        },
+        showImage: {
+            type: Boolean,
+            default: true
+        },
+        showItemsCount: {
+            type: Boolean,
+            default: true
+        },
+        showLoadMore: {
+            type: Boolean,
+            default: false
+        },
+        showSearchBar: {
+            type: Boolean,
+            value: false
+        },
+        layout: {
+            type: String,
+            default: 'grid'
+        },
+        cloudRate: {
+            type: Number,
+            default: 1
+        },
+        isModalOpen: {
+            type: Boolean,
+            default: false
+        },
+        gridMargin: {
+            type: Number,
+            default: 0
+        },
+        metadatumId: {
+            type: String,
+            default: undefined
+        },
+        metadatumType: {
+            type: String,
+            default: undefined
+        },
+        facetsRequestSource: {
+            type: String,
+            default: undefined
+        },
+        maxFacetsNumber: {
+            type: Number,
+            value: undefined
+        },
+        isLoading: {
+            type: Boolean,
+            value: false
+        },
+        isLoadingCollection: {
+            type: Boolean,
+            value: false
+        },
+        collection: {
+            type: Object,
+            value: undefined
+        },
+        searchString: {
+            type: String,
+            default: undefined
+        },
+        blockId: {
+            type: String,
+            default: undefined
+        },
+    },
+    supports: {
+        align: ['full', 'wide'],
+        html: false,
+    },
+    edit({ attributes, setAttributes, className, isSelected, clientId }){
+        let {
+            facets, 
+            facetsObject,
+            content, 
+            collectionId,
+            collectionSlug,    
+            showImage,
+            showItemsCount,
+            showLoadMore,
+            showSearchBar,
+            layout,
+            cloudRate,
+            isModalOpen,
+            gridMargin,
+            metadatumId,
+            metadatumType,
+            facetsRequestSource,
+            maxFacetsNumber,
+            searchString,
+            isLoading
+        } = attributes;
+
+        // Obtains block's client id to render it on save function
+        setAttributes({ blockId: clientId });
+    
+        function prepareFacet(facet) {
+            return (
+                <li 
+                    key={ facet.id }
+                    className={ 'facet-list-item' + (!showImage ? ' facet-without-image' : '') }
+                    style={{ marginBottom: layout == 'grid' ? gridMargin + 'px' : ''}}>      
+                    <a 
+                        id={ isNaN(facet.id) ? facet.id : 'facet-id-' + facet.id }
+                        href={ facet.url } 
+                        target="_blank"
+                        style={{ fontSize: layout == 'cloud' && facet.total_items ? + (1 + (cloudRate/4) * Math.log(facet.total_items)) + 'rem' : ''}}>
+                        { metadatumType == 'Taxonomy' ? 
+                            <img
+                                src={ 
+                                    facet.entity && facet.entity['header_image']
+                                        ?    
+                                    facet.entity['header_image']
+                                        : 
+                                    `${tainacan_plugin.base_url}/admin/images/placeholder_square.png`
+                                }
+                                alt={ facet.label ? facet.label : __( 'Thumbnail', 'tainacan' ) }/>
+                        : null 
+                        }
+                        { metadatumType == 'Relationship' ? 
+                            <img
+                                src={ 
+                                    facet.entity.thumbnail && facet.entity.thumbnail['tainacan-medium'][0] && facet.entity.thumbnail['tainacan-medium'][0] 
+                                        ?
+                                    facet.entity.thumbnail['tainacan-medium'][0] 
+                                        :
+                                    (facet.entity.thumbnail && facet.entity.thumbnail['thumbnail'][0] && facet.entity.thumbnail['thumbnail'][0]
+                                        ?    
+                                    facet.entity.thumbnail['thumbnail'][0] 
+                                        : 
+                                    `${tainacan_plugin.base_url}/admin/images/placeholder_square.png`)
+                                }
+                                alt={ facet.label ? facet.label : __( 'Thumbnail', 'tainacan' ) }/>
+                        : null 
+                        }
+                        <span>{ facet.label ? facet.label : '' }</span>
+                        { facet.total_items ? <span class="facet-item-count" style={{ display: !showItemsCount ? 'none' : '' }}>&nbsp;({ facet.total_items })</span> : null }
+                    </a>
+                </li>
+            );
+        }
+
+        function setContent(){
+
+            facets = [];
+            isLoading = true;
+            
+            if (facetsRequestSource != undefined && typeof facetsRequestSource == 'function')
+                facetsRequestSource.cancel('Previous facets search canceled.');
+
+            facetsRequestSource = axios.CancelToken.source();
+            
+            setAttributes({
+                isLoading: isLoading
+            });
+            
+            let endpoint = '/facets/' + metadatumId;
+            let query = endpoint.split('?')[1];
+            let queryObject = qs.parse(query);
+
+            // Set up max facets to be shown
+            if (maxFacetsNumber != undefined && maxFacetsNumber > 0)
+                queryObject.number = maxFacetsNumber;
+            else if (queryObject.number != undefined && queryObject.number > 0)
+                setAttributes({ maxFacetsNumber: queryObject.number });
+            else {
+                queryObject.number = 12;
+                setAttributes({ maxFacetsNumber: 12 });
+            }
+
+            // Set up searching string
+            if (searchString != undefined)
+                queryObject.search = searchString;
+            else if (queryObject.search != undefined)
+                setAttributes({ searchString: queryObject.search });
+            else {
+                delete queryObject.search;
+                setAttributes({ searchString: undefined });
+            }
+
+            // Parameter fo tech entity object with image and url
+            queryObject['context'] = 'extended';
+            
+            endpoint = endpoint.split('?')[0] + '?' + qs.stringify(queryObject);
+            
+            tainacan.get(endpoint, { cancelToken: facetsRequestSource.token })
+                .then(response => {
+                    facetsObject = [];
+
+                    if (metadatumType == 'Taxonomy') {
+                        for (let facet of response.data.values) {
+                            facetsObject.push(Object.assign({ 
+                                url: facet.entity && facet.entity.url ? facet.entity.url : tainacan_plugin.site_url + '/' + collectionSlug + '/#/?taxquery[0][compare]=IN&taxquery[0][taxonomy]=' + facet.taxonomy + '&taxquery[0][terms][0]=' + facet.value
+                            }, facet));
+                        }
+                    } else {
+                        for (let facet of response.data.values) {
+                            facetsObject.push(Object.assign({ 
+                                url: tainacan_plugin.site_url + '/' + collectionSlug + '/#/?metaquery[0][key]=' + metadatumId + '&metaquery[0][value]=' + facet.value
+                            }, facet));
+                        }
+                    }
+                    
+                    for (let facet of facetsObject)
+                        facets.push(prepareFacet(facet));
+
+                    setAttributes({
+                        content: <div></div>,
+                        facets: facets,
+                        facetsObject: facetsObject,
+                        isLoading: false,
+                        facetsRequestSource: facetsRequestSource
+                    });
+                });
+        }
+
+        function updateContent() {
+            facets = [];
+            for (let facet of facetsObject)
+                facets.push(prepareFacet(facet));
+
+            setAttributes({
+                content: <div></div>,
+                facets: facets
+            });
+        }
+
+        function openMetadataModal() {
+            isModalOpen = true;
+            setAttributes( { 
+                isModalOpen: isModalOpen
+            } );
+        }
+
+        function updateLayout(newLayout) {
+            layout = newLayout;
+
+            if (layout == 'grid')
+                showImage = true;
+
+            if (layout == 'list' || layout == 'cloud')
+                showImage = false;
+
+            setAttributes({ 
+                layout: layout, 
+                showImage: showImage
+            });
+            updateContent();
+        }
+
+        function applySearchString(event) {
+
+            let value = event.target.value;
+
+            if (searchString != value) {
+                searchString = value;
+                setAttributes({ searchString: searchString });
+                setContent();
+            }
+        }
+
+        // Executed only on the first load of page
+        if(content && content.length && content[0].type)
+            setContent();
+
+        const layoutControls = [
+            {
+                icon: 'grid-view',
+                title: __( 'Grid View' ),
+                onClick: () => updateLayout('grid'),
+                isActive: layout === 'grid',
+            },
+            {
+                icon: 'list-view',
+                title: __( 'List View' ),
+                onClick: () => updateLayout('list'),
+                isActive: layout === 'list',
+            },
+            {
+                icon: 'cloud',
+                title: __( 'Cloud View' ),
+                onClick: () => updateLayout('cloud'),
+                isActive: layout === 'cloud',
+            }
+        ];
+
+        return (
+            <div className={className}>
+
+                <div>
+                    <BlockControls>
+                        <Toolbar controls={ layoutControls } />
+                    </BlockControls>
+                </div>
+
+                <div>
+                    <InspectorControls>
+                        
+                        <PanelBody
+                                title={__('Search', 'tainacan')}
+                                initialOpen={ true }
+                            >
+                            <ToggleControl
+                                label={__('Display search bar', 'tainacan')}
+                                help={ showSearchBar ? __('Toggle to show search bar on block', 'tainacan') : __('Do not show search bar', 'tainacan')}
+                                checked={ showSearchBar }
+                                onChange={ ( isChecked ) => {
+                                        showSearchBar = isChecked;
+                                        setAttributes({ showSearchBar: showSearchBar });
+                                    } 
+                                }
+                            />
+                            <ToggleControl
+                                label={__('Display load more', 'tainacan')}
+                                help={ showLoadMore ? __('Toggle to show "load more" button on block', 'tainacan') : __('Do not show "load more" button', 'tainacan')}
+                                checked={ showLoadMore }
+                                onChange={ ( isChecked ) => {
+                                        showLoadMore = isChecked;
+                                        setAttributes({ showLoadMore: showLoadMore });
+                                    } 
+                                }
+                            />
+                        </PanelBody>
+                        <PanelBody
+                                title={__('Facets', 'tainacan')}
+                                initialOpen={ true }
+                            >
+                            <div>
+                                <RangeControl
+                                    label={__('Maximum number of facets', 'tainacan')}
+                                    value={ maxFacetsNumber }
+                                    onChange={ ( aMaxFacetsNumber ) => {
+                                        maxFacetsNumber = aMaxFacetsNumber;
+                                        setAttributes( { maxFacetsNumber: aMaxFacetsNumber } ) 
+                                        setContent();
+                                    }}
+                                    min={ 1 }
+                                    max={ 96 }
+                                />
+                            </div>
+                            <hr></hr>
+                            <div>
+                                { layout == 'list' && (metadatumType == 'Taxonomy' || metadatumType == 'Relationship') ? 
+                                    <ToggleControl
+                                        label={__('Image', 'tainacan')}
+                                        help={ showImage ? __("Toggle to show facet's image", 'tainacan') : __("Do not show facet's image", 'tainacan')}
+                                        checked={ showImage }
+                                        onChange={ ( isChecked ) => {
+                                                showImage = isChecked;
+                                                setAttributes({ showImage: showImage });
+                                                updateContent();
+                                            } 
+                                        }
+                                    /> 
+                                : null }
+                                { layout == 'grid' ?
+                                    <div>
+                                        { (metadatumType == 'Taxonomy' || metadatumType == 'Relationship') ? 
+                                            <ToggleControl
+                                                label={__('Image', 'tainacan')}
+                                                help={ showImage ? __("Toggle to show facet's image", 'tainacan') : __("Do not show facet's image", 'tainacan')}
+                                                checked={ showImage }
+                                                onChange={ ( isChecked ) => {
+                                                        showImage = isChecked;
+                                                        setAttributes({ showImage: showImage });
+                                                        updateContent();
+                                                    } 
+                                                }
+                                            /> : null
+                                        }
+                                        <div style={{ marginTop: '16px'}}>
+                                            <RangeControl
+                                                label={__('Margin between facets in pixels', 'tainacan')}
+                                                value={ gridMargin }
+                                                onChange={ ( margin ) => {
+                                                    gridMargin = margin;
+                                                    setAttributes( { gridMargin: margin } ) 
+                                                    updateContent();
+                                                }}
+                                                min={ 0 }
+                                                max={ 48 }
+                                            />
+                                        </div>
+                                    </div>
+                                : null }
+                                <ToggleControl
+                                        label={__('Items count', 'tainacan')}
+                                        help={ showItemsCount ? __("Toggle to show items counter", 'tainacan') : __("Do not show items counter", 'tainacan')}
+                                        checked={ showItemsCount }
+                                        onChange={ ( isChecked ) => {
+                                                showItemsCount = isChecked;
+                                                setAttributes({ showItemsCount: showItemsCount });
+                                                updateContent();
+                                            } 
+                                        }
+                                    /> 
+                            </div>
+                        </PanelBody>
+                        { layout == 'cloud' ? 
+                            <PanelBody
+                                    title={__('Cloud settings', 'tainacan')}
+                                    initialOpen={ true }
+                                >
+                                <div>
+                                    <RangeControl
+                                            label={__('Growth rate for facets according to items count.', 'tainacan')}
+                                            value={ cloudRate }
+                                            onChange={ ( rate ) => {
+                                                cloudRate = rate;
+                                                setAttributes( { cloudRate: rate } ) 
+                                                updateContent();
+                                            }}
+                                            min={ 0 }
+                                            max={ 10 }
+                                        />
+                                </div>
+                            </PanelBody>
+                        : null 
+                        }
+                    </InspectorControls>
+                </div>
+
+                { isSelected ? 
+                    (
+                    <div>
+                        { isModalOpen ? 
+                            <MetadataModal
+                                existingCollectionId={ collectionId } 
+                                existingCollectionSlug={ collectionSlug } 
+                                existingMetadatumId={ metadatumId } 
+                                existingMetadatumType={ metadatumType } 
+                                onSelectCollection={ (selectedCollection) => {
+                                    collectionId = selectedCollection.id;
+                                    collectionSlug = selectedCollection.slug;
+
+                                    setAttributes({ 
+                                        collectionSlug: collectionSlug,
+                                        collectionId: collectionId 
+                                    });
+                                }}
+                                onSelectMetadatum={ (selectedFacet) =>{
+                                    metadatumId = selectedFacet.metadatumId;
+                                    metadatumType = selectedFacet.metadatumType;
+                                    setAttributes({
+                                        metadatumId: metadatumId,
+                                        metadatumType: metadatumType,
+                                        isModalOpen: false
+                                    });
+                                    setContent();
+                                }}
+                                onCancelSelection={ () => setAttributes({ isModalOpen: false }) }/> 
+                            : null
+                        }
+                        
+                        { facets.length ? (
+                            <div className="block-control">
+                                <p>
+                                    <svg 
+                                            xmlns="http://www.w3.org/2000/svg" 
+                                            viewBox="0 0 24 24"
+                                            height="24px"
+                                            width="24px">
+                                        <path 
+                                                fill="#298596"
+                                                d="M21.43,13.64,19.32,16a2.57,2.57,0,0,1-2,1H11a3.91,3.91,0,0,0,0-.49,5.49,5.49,0,0,0-5-5.47V9.64A2.59,2.59,0,0,1,8.59,7H17.3a2.57,2.57,0,0,1,2,1l2.11,2.38A2.59,2.59,0,0,1,21.43,13.64ZM4,3A2,2,0,0,0,2,5v7.3a5.32,5.32,0,0,1,2-1V5H16V3ZM11,21l-1,1L8.86,20.89,8,20H8l-.57-.57A3.42,3.42,0,0,1,5.5,20a3.5,3.5,0,0,1,0-7,2.74,2.74,0,0,1,.5,0A3.5,3.5,0,0,1,9,16a2.92,2.92,0,0,1,0,.51,3.42,3.42,0,0,1-.58,1.92L9,19H9l.85.85Zm-4-4.5A1.5,1.5,0,1,0,5.5,18,1.5,1.5,0,0,0,7,16.53Z"/>
+                                    </svg>
+                                    {__('List facets from a Tainacan Collection or Repository', 'tainacan')}
+                                </p>
+                                <Button
+                                    isPrimary
+                                    type="submit"
+                                    onClick={ () => openMetadataModal() }>
+                                    {__('Configure search', 'tainacan')}
+                                </Button>    
+                            </div>
+                            ): null
+                        }
+                    </div>
+                    ) : null
+                }
+
+                {
+                    showSearchBar ?
+                    <div class="facets-search-bar">
+                        <Button
+                            onClick={ () => {  setContent(); }}
+                            label={__('Search', 'tainacan')}>
+                            <span class="icon">
+                                <i>
+                                    <svg width="24" height="24" viewBox="-2 -4 20 20">
+                                    <path class="st0" d="M0,5.8C0,5,0.2,4.2,0.5,3.5s0.7-1.3,1.2-1.8s1.1-0.9,1.8-1.2C4.2,0.1,5,0,5.8,0S7.3,0.1,8,0.5
+                                        c0.7,0.3,1.3,0.7,1.8,1.2s0.9,1.1,1.2,1.8c0.5,1.2,0.5,2.5,0.2,3.7c0,0.2-0.1,0.4-0.2,0.6c0,0.1-0.2,0.6-0.2,0.6
+                                        c0.6,0.6,1.3,1.3,1.9,1.9c0.7,0.7,1.3,1.3,2,2c0,0,0.3,0.2,0.3,0.3c0,0.3-0.1,0.7-0.3,1c-0.2,0.6-0.8,1-1.4,1.2
+                                        c-0.1,0-0.6,0.2-0.6,0.1c0,0-4.2-4.2-4.2-4.2c0,0-0.8,0.3-0.8,0.4c-1.3,0.4-2.8,0.5-4.1-0.1c-0.7-0.3-1.3-0.7-1.8-1.2
+                                        C1.2,9.3,0.8,8.7,0.5,8S0,6.6,0,5.8z M1.6,5.8c0,0.4,0.1,0.9,0.2,1.3C2.1,8.2,3,9.2,4.1,9.6c0.5,0.2,1,0.3,1.6,0.3
+                                        c0.6,0,1.1-0.1,1.6-0.3C8.7,9,9.7,7.6,9.8,6c0.1-1.5-0.6-3.1-2-3.9c-0.9-0.5-2-0.6-3-0.4C4.6,1.8,4.4,1.9,4.1,2
+                                        c-0.5,0.2-1,0.5-1.4,0.9C2,3.7,1.6,4.7,1.6,5.8z"/>       
+                                    </svg>
+                                </i>
+                            </span>
+                        </Button>
+                        <input
+                                value={ searchString }
+                                onChange={ (value) =>  { _.debounce(applySearchString(value), 300); } }
+                                type="text"/>
+                    </div>
+                : null
+                }
+
+                { !facets.length && !isLoading && !(searchString != undefined && searchString != '') ? (
+                    <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 
+                                        fill="#298596"
+                                        d="M21.43,13.64,19.32,16a2.57,2.57,0,0,1-2,1H11a3.91,3.91,0,0,0,0-.49,5.49,5.49,0,0,0-5-5.47V9.64A2.59,2.59,0,0,1,8.59,7H17.3a2.57,2.57,0,0,1,2,1l2.11,2.38A2.59,2.59,0,0,1,21.43,13.64ZM4,3A2,2,0,0,0,2,5v7.3a5.32,5.32,0,0,1,2-1V5H16V3ZM11,21l-1,1L8.86,20.89,8,20H8l-.57-.57A3.42,3.42,0,0,1,5.5,20a3.5,3.5,0,0,1,0-7,2.74,2.74,0,0,1,.5,0A3.5,3.5,0,0,1,9,16a2.92,2.92,0,0,1,0,.51,3.42,3.42,0,0,1-.58,1.92L9,19H9l.85.85Zm-4-4.5A1.5,1.5,0,1,0,5.5,18,1.5,1.5,0,0,0,7,16.53Z"/>
+                            </svg>
+                            {__('List facets from a Tainacan Collection or Repository', 'tainacan')}
+                        </p>
+                        <Button
+                            isPrimary
+                            type="submit"
+                            onClick={ () => openMetadataModal() }>
+                            {__('Select facets', 'tainacan')}
+                        </Button>   
+                    </Placeholder>
+                    ) : null
+                }
+                
+                { isLoading ? 
+                    <div class="spinner-container">
+                        <Spinner />
+                    </div> :
+                    <div>
+                        <ul 
+                            style={{ 
+                                gridTemplateColumns: layout == 'grid' ? 'repeat(auto-fill, ' +  (gridMargin + 185) + 'px)' : 'inherit', 
+                                marginTop: showSearchBar ? '1.5rem' : '0px'
+                            }}
+                            className={'facets-list-edit facets-layout-' + layout }>
+                            { facets }
+                        </ul>
+                    </div>
+                }
+
+                { showLoadMore && facets.length > 0 && !isLoading ?
+                    <Tooltip text={__('If necessary, the show more button will be available on post or page.', 'tainacan')}>
+                        <button
+                                class="show-more-button"
+                                disabled
+                                label={__('Show more', 'tainacan')}>
+                            <span class="icon">
+                                <i>
+                                    <svg
+                                            width="24"
+                                            height="24"
+                                            viewBox="4 5 24 24">
+                                        <path d="M 7.41,8.295 6,9.705 l 6,6 6,-6 -1.41,-1.41 -4.59,4.58 z"/>
+                                        <path
+                                                d="M0 0h24v24H0z"
+                                                fill="none"/>                        
+                                    </svg>
+                                </i>
+                            </span>
+                        </button>
+                    </Tooltip> 
+                : null
+                }
+            </div>
+        );
+    },
+    save({ attributes, className }){
+        const {
+            content, 
+            blockId,
+            collectionId,  
+            collectionSlug,  
+            showImage,
+            showItemsCount,
+            showLoadMore,
+            layout,
+            cloudRate,
+            gridMargin,
+            metadatumId,
+            metadatumType,
+            maxFacetsNumber,
+            showSearchBar,
+        } = attributes;
+        
+        return <div 
+                    className={ className }
+                    metadatum-id={ metadatumId }
+                    metadatum-type={ metadatumType }
+                    collection-id={ collectionId }  
+                    collection-slug={ collectionSlug }  
+                    show-image={ '' + showImage }
+                    show-items-count={ '' + showItemsCount }
+                    show-search-bar={ '' + showSearchBar }
+                    show-load-more={ '' + showLoadMore }
+                    layout={ layout }
+                    cloud-rate={ cloudRate }
+                    grid-margin={ gridMargin }
+                    max-facets-number={ maxFacetsNumber }
+                    tainacan-api-root={ tainacan_plugin.root }
+                    tainacan-base-url={ tainacan_plugin.base_url }
+                    tainacan-site-url={ tainacan_plugin.site_url }
+                    id={ 'wp-block-tainacan-facets-list_' + blockId }>
+                        { content }
+                </div>
+    }
+});
\ No newline at end of file
diff --git a/src/gutenberg-blocks/tainacan-facets/facets-list/metadata-modal.js b/src/gutenberg-blocks/tainacan-facets/facets-list/metadata-modal.js
new file mode 100644
index 000000000..c6a8ef165
--- /dev/null
+++ b/src/gutenberg-blocks/tainacan-facets/facets-list/metadata-modal.js
@@ -0,0 +1,401 @@
+import tainacan from '../../api-client/axios.js';
+import axios from 'axios';
+
+const { __ } = wp.i18n;
+
+const { TextControl, Button, Modal, RadioControl, Spinner } = wp.components;
+
+export default class MetadataModal extends React.Component {
+    constructor(props) {
+        super(props);
+
+        // Initialize state
+        this.state = {
+            collectionsPerPage: 24,
+            collectionId: undefined,
+            collectionSlug: undefined,
+            isLoadingCollections: false, 
+            modalCollections: [],
+            totalModalCollections: 0, 
+            collectionPage: 1,
+            temporaryCollectionId: '',
+            searchCollectionName: '',
+            metadatumId: undefined,  
+            metadatumType: undefined,  
+            isLoadingMetadata: false, 
+            modalMetadata: [],
+            temporaryMetadatumId: '',
+            collections: [],
+            collectionsRequestSource: undefined,
+            metadataRequestSource: undefined
+        };
+        
+        // Bind events
+        this.resetCollections = this.resetCollections.bind(this);
+        this.selectCollection = this.selectCollection.bind(this);
+        this.fetchCollections = this.fetchCollections.bind(this);
+        this.fetchModalCollections = this.fetchModalCollections.bind(this);
+        this.selectMetadatum = this.selectMetadatum.bind(this);
+        this.fetchModalMetadata = this.fetchModalMetadata.bind(this);
+        this.getMetadatumType = this.getMetadatumType.bind(this);
+    }
+
+    componentWillMount() {
+        
+        this.setState({ 
+            collectionId: this.props.existingCollectionId,
+            collectionSlug: this.props.existingCollectionSlug
+        });
+        if (this.props.existingCollectionId != null && this.props.existingCollectionId != undefined) {
+            this.fetchModalMetadata(this.props.existingCollectionId);
+            this.setState({ 
+                metadatumId: this.props.existingMetadatumId ? this.props.existingMetadatumId : undefined, 
+                metadatumType: this.props.existingMetadatumType ? this.props.existingMetadatumType : undefined 
+            });
+        } else {
+            this.setState({ collectionPage: 1 });
+            this.fetchModalCollections();
+        }
+    }
+
+    // COLLECTIONS RELATED --------------------------------------------------
+    fetchModalCollections() {
+
+        let someModalCollections = this.state.modalCollections;
+        if (this.state.collectionPage <= 1)
+            someModalCollections = [];
+
+        let endpoint = '/collections/?orderby=title&order=asc&perpage=' + this.state.collectionsPerPage + '&paged=' + this.state.collectionPage;
+
+        this.setState({ 
+            isLoadingCollections: true,
+            collectionPage: this.state.collectionPage + 1, 
+            modalCollections: someModalCollections
+        });
+
+        tainacan.get(endpoint)
+            .then(response => {
+
+                let otherModalCollections = this.state.modalCollections;
+
+                for (let collection of response.data) {
+                    otherModalCollections.push({ 
+                        name: collection.name, 
+                        id: collection.id,
+                        slug: collection.slug
+                    });
+                }
+
+                this.setState({ 
+                    isLoadingCollections: false, 
+                    modalCollections: otherModalCollections,
+                    totalModalCollections: response.headers['x-wp-total']
+                });
+            
+                return otherModalCollections;
+            })
+            .catch(error => {
+                console.log('Error trying to fetch collections: ' + error);
+            });
+    }
+
+    selectCollection(selectedCollectionId) {
+
+        let selectedCollection;
+        if (selectedCollectionId == 'default')
+            selectedCollection = { label: __('Repository items', 'tainacan'), id: 'default', slug: tainacan_plugin.theme_items_list_url.split('/')[tainacan_plugin.theme_items_list_url.split('/').length - 1] };
+        else {
+            selectedCollection = this.state.modalCollections.find((collection) => collection.id == selectedCollectionId)
+            if (selectedCollection == undefined)
+                selectedCollection = this.state.collections.find((collection) => collection.id == selectedCollectionId)
+        }
+
+        this.setState({
+            collectionId: selectedCollection.id,
+            collectionSlug: selectedCollection.slug      
+        });
+
+        this.props.onSelectCollection(selectedCollection);
+        this.fetchModalMetadata(selectedCollection.id);
+    }
+
+    fetchCollections(name) {
+
+        if (this.state.collectionsRequestSource != undefined)
+            this.state.collectionsRequestSource.cancel('Previous collections search canceled.');
+
+        let aCollectionRequestSource = axios.CancelToken.source();
+
+        this.setState({ 
+            collectionsRequestSource: aCollectionRequestSource,
+            isLoadingCollections: true, 
+            collections: [],
+            metadata: []
+        });
+
+        let endpoint = '/collections/?orderby=title&order=asc&perpage=' + this.state.collectionsPerPage;
+        if (name != undefined && name != '')
+            endpoint += '&search=' + name;
+
+        tainacan.get(endpoint, { cancelToken: aCollectionRequestSource.token })
+            .then(response => {
+                let someCollections = response.data.map((collection) => ({ name: collection.name, id: collection.id + '', slug: collection.slug }));
+
+                this.setState({ 
+                    isLoadingCollections: false, 
+                    collections: someCollections
+                });
+                
+                return someCollections;
+            })
+            .catch(error => {
+                console.log('Error trying to fetch collections: ' + error);
+            });
+    }
+
+    resetCollections() {
+
+        this.setState({
+            collectionId: null,
+            collectionPage: 1,
+            modalCollections: []
+        });
+        this.fetchModalCollections(); 
+    }
+
+    cancelSelection() {
+
+        this.setState({
+            modalCollections: []
+        });
+
+        this.props.onCancelSelection();
+    }
+
+    // FACETS RELATED --------------------------------------------------
+    fetchModalMetadata(selectedCollectionId) {
+
+        let someModalMetadata = [];
+        let endpoint = selectedCollectionId != 'default' ? '/collection/' + selectedCollectionId + '/metadata/?nopaging=1' : '/metadata/?nopaging=1';
+
+        this.setState({ 
+            isLoadingMetadata: true,
+            modalMetadata: someModalMetadata
+        });
+
+        tainacan.get(endpoint)
+            .then(response => {
+
+                let otherModalMetadata = this.state.modalMetadata;
+
+                for (let metadatum of response.data) {
+                    otherModalMetadata.push({ 
+                        name: metadatum.name, 
+                        id: metadatum.id,
+                        type: this.getMetadatumType(metadatum)
+                    });
+                }
+
+                this.setState({ 
+                    isLoadingMetadata: false, 
+                    modalMetadata: otherModalMetadata
+                });
+            
+                return otherModalMetadata;
+            })
+            .catch(error => {
+                console.log('Error trying to fetch metadata: ' + error);
+            });
+    }
+
+    getMetadatumType(metadatum) {
+        let metadatumType = metadatum.metadata_type_object ? metadatum.metadata_type_object.component : false;
+
+        if (metadatumType) {
+            switch(metadatumType) {
+                case 'tainacan-text':           return __('Text', 'tainacan');
+                case 'tainacan-textarea':       return __('Text area', 'tainacan');
+                case 'tainacan-date':           return __('Date', 'tainacan');
+                case 'tainacan-numeric':        return __('Numeric', 'tainacan');
+                case 'tainacan-selectbox':      return __('Select box', 'tainacan');
+                case 'tainacan-relationship':   return __('Relationship', 'tainacan');
+                case 'tainacan-taxonomy':       return __('Taxonomy', 'tainacan');
+                case 'tainacan-compound':       return __('Compound', 'tainacan');
+                default:                        return false;
+            }
+        } else {
+            return metadatumType;
+        }
+    }
+
+    selectMetadatum(selectedMetadatum) {
+        this.setState({
+            metadatumId: selectedMetadatum.id,
+            metadatumType: selectedMetadatum.type
+        });
+        this.props.onSelectMetadatum({ 
+            metadatumId: selectedMetadatum.id,
+            metadatumType: selectedMetadatum.type
+        });
+    }
+
+
+    render() {
+        return this.state.collectionId != null && this.state.collectionId != undefined ? (
+            // Metadata modal
+            <Modal
+                className="wp-block-tainacan-modal"
+                title={__('Select a metadatum to show it\'s facets on block', 'tainacan')}
+                onRequestClose={ () => this.cancelSelection() }
+                contentLabel={__('Select metadatum', 'tainacan')}>
+                {(
+                    this.state.modalMetadata.length > 0 ? 
+                    (   
+                        <div>
+                            <div className="modal-radio-list">
+                                <RadioControl
+                                    selected={ this.state.temporaryMetadatumId }
+                                    options={
+                                        this.state.modalMetadata.map((metadatum) => {
+                                            return { label: metadatum.name + ' (' + metadatum.type + ')', value: '' + metadatum.id }
+                                        })
+                                    }
+                                    onChange={ ( aMetadatumId ) => { 
+                                        this.setState({ 
+                                            temporaryMetadatumId: aMetadatumId
+                                        });
+                                    } } />                          
+                            </div>
+                            <br/>
+                        </div>
+                    ) : this.state.isLoadingMetadata ? <Spinner/> :
+                        <div className="modal-loadmore-section">
+                            <p>{ __('Sorry, no metadatum found.', 'tainacan') }</p>
+                        </div>
+                )
+            }
+            <div className="modal-footer-area">
+                <Button 
+                    isDefault
+                    onClick={ () => { this.resetCollections(); }}>
+                    {__('Switch collection', 'tainacan')}
+                </Button>
+                <Button
+                    isPrimary
+                    disabled={ this.state.temporaryMetadatumId == undefined || this.state.temporaryMetadatumId == null || this.state.temporaryMetadatumId == ''}
+                    onClick={ () => { this.selectMetadatum(this.state.modalMetadata.find((metadatatum) => metadatatum.id == this.state.temporaryMetadatumId));  } }>
+                    {__('Finish', 'tainacan')}
+                </Button>
+            </div>
+        </Modal> 
+        ) : (
+        // Collections modal
+        <Modal
+                className="wp-block-tainacan-modal"
+                title={__('Select a collection to fetch metadata from', 'tainacan')}
+                onRequestClose={ () => this.cancelSelection() }
+                contentLabel={__('Select collection', 'tainacan')}>
+                <div>
+                    <div className="modal-search-area">
+                        <TextControl 
+                                label={__('Search for a collection', 'tainacan')}
+                                value={ this.state.searchCollectionName }
+                                onChange={(value) => {
+                                    this.setState({ 
+                                        searchCollectionName: value
+                                    });
+                                    _.debounce(this.fetchCollections(value), 300);
+                                }}/>
+                    </div>
+                    {(
+                    this.state.searchCollectionName != '' ? (
+                        this.state.collections.length > 0 ?
+                        (
+                            <div>
+                                <div className="modal-radio-list">
+                                    {  
+                                    <RadioControl
+                                        selected={ this.state.temporaryCollectionId }
+                                        options={
+                                            this.state.collections.map((collection) => {
+                                                return { label: collection.name, value: '' + collection.id, slug: collection.slug }
+                                            })
+                                        }
+                                        onChange={ ( aCollectionId ) => { 
+                                            this.setState({ temporaryCollectionId: aCollectionId });
+                                        } } />
+                                    }                                      
+                                </div>
+                                <br/>
+                            </div>
+                        ) :
+                        this.state.isLoadingCollections ? (
+                            <Spinner />
+                        ) :
+                        <div className="modal-loadmore-section">
+                            <p>{ __('Sorry, no collection found.', 'tainacan') }</p>
+                        </div> 
+                    ):
+                    this.state.modalCollections.length > 0 ? 
+                    (   
+                        <div>
+                            <div className="modal-radio-list">
+                                
+                                <p class="modal-radio-area-label">{__('Repository', 'tainacan')}</p>
+                                <RadioControl
+                                    className={'repository-radio-option'}
+                                    selected={ this.state.temporaryCollectionId }
+                                    options={ [{ label: __('Repository items', 'tainacan'), value: 'default', slug: tainacan_plugin.theme_items_list_url.split('/')[tainacan_plugin.theme_items_list_url.split('/').length - 1] }] }
+                                    onChange={ ( aCollectionId ) => { 
+                                        this.setState({ temporaryCollectionId: aCollectionId });
+                                    } } />
+                                <hr/>
+                                <p class="modal-radio-area-label">{__('Collections', 'tainacan')}</p>
+                                <RadioControl
+                                    selected={ this.state.temporaryCollectionId }
+                                    options={
+                                        this.state.modalCollections.map((collection) => {
+                                            return { label: collection.name, value: '' + collection.id, slug: collection.slug }
+                                        })
+                                    }
+                                    onChange={ ( aCollectionId ) => { 
+                                        this.setState({ temporaryCollectionId: aCollectionId });
+                                    } } />                          
+                            </div>
+                            <div className="modal-loadmore-section">
+                                <p>{ __('Showing', 'tainacan') + " " + this.state.modalCollections.length + " " + __('of', 'tainacan') + " " + this.state.totalModalCollections + " " + __('collections', 'tainacan') + "."}</p>
+                                {
+                                    this.state.modalCollections.length < this.state.totalModalCollections ? (
+                                    <Button 
+                                        isDefault
+                                        isSmall
+                                        onClick={ () => this.fetchModalCollections() }>
+                                        {__('Load more', 'tainacan')}
+                                    </Button>
+                                    ) : null
+                                }
+                            </div>
+                        </div>
+                    ) : this.state.isLoadingCollections ? <Spinner/> :
+                    <div className="modal-loadmore-section">
+                        <p>{ __('Sorry, no collection found.', 'tainacan') }</p>
+                    </div>
+                )}
+                <div className="modal-footer-area">
+                    <Button 
+                        isDefault
+                        onClick={ () => { this.cancelSelection() }}>
+                        {__('Cancel', 'tainacan')}
+                    </Button>
+                    <Button
+                        isPrimary
+                        disabled={ this.state.temporaryCollectionId == undefined || this.state.temporaryCollectionId == null || this.state.temporaryCollectionId == '' && (this.state.searchCollectionName != '' ? this.state.collections.find((collection) => collection.id == this.state.temporaryCollectionId) : this.state.modalCollections.find((collection) => collection.id == this.state.temporaryCollectionId)) != undefined}
+                        onClick={ () => { this.selectCollection(this.state.temporaryCollectionId) } }>
+                        {__('Select metadatum', 'tainacan')}
+                    </Button>
+                </div>
+            </div>
+        </Modal> 
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list-theme.vue b/src/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list-theme.vue
index d0e02ca32..f2fd67001 100644
--- a/src/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list-theme.vue
+++ b/src/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list-theme.vue
@@ -212,7 +212,7 @@
 <script>
 import axios from 'axios';
 import qs from 'qs';
-import { debounce } from 'lodash';
+import debounce from 'lodash/debounce.js';
 
 export default {
     name: "DynamicItemsListTheme",
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 12165646f..d4a48c1dc 100644
--- a/src/gutenberg-blocks/tainacan-items/dynamic-items-list/index.js
+++ b/src/gutenberg-blocks/tainacan-items/dynamic-items-list/index.js
@@ -19,7 +19,9 @@ registerBlockType('tainacan/dynamic-items-list', {
                 viewBox="0 0 24 24"
                 height="24px"
                 width="24px">
-            <path d="M14,2V4H7v7.24A5.33,5.33,0,0,0,5.5,11a4.07,4.07,0,0,0-.5,0V4A2,2,0,0,1,7,2Zm7,10v8a2,2,0,0,1-2,2H12l1-1-2.41-2.41A5.56,5.56,0,0,0,11,16.53a5.48,5.48,0,0,0-2-4.24V8a2,2,0,0,1,2-2h4Zm-2.52,0L14,7.5V12ZM11,21l-1,1L8.86,20.89,8,20H8l-.57-.57A3.42,3.42,0,0,1,5.5,20a3.5,3.5,0,0,1-.5-7,2.74,2.74,0,0,1,.5,0,3.41,3.41,0,0,1,1.5.34,3.5,3.5,0,0,1,2,3.16,3.42,3.42,0,0,1-.58,1.92L9,19H9l.85.85Zm-4-4.5A1.5,1.5,0,0,0,5.5,15a1.39,1.39,0,0,0-.5.09A1.5,1.5,0,0,0,5.5,18a1.48,1.48,0,0,0,1.42-1A1.5,1.5,0,0,0,7,16.53Z"/>
+            <path
+                fill="#298596"
+                d="M14,2V4H7v7.24A5.33,5.33,0,0,0,5.5,11a4.07,4.07,0,0,0-.5,0V4A2,2,0,0,1,7,2Zm7,10v8a2,2,0,0,1-2,2H12l1-1-2.41-2.41A5.56,5.56,0,0,0,11,16.53a5.48,5.48,0,0,0-2-4.24V8a2,2,0,0,1,2-2h4Zm-2.52,0L14,7.5V12ZM11,21l-1,1L8.86,20.89,8,20H8l-.57-.57A3.42,3.42,0,0,1,5.5,20a3.5,3.5,0,0,1-.5-7,2.74,2.74,0,0,1,.5,0,3.41,3.41,0,0,1,1.5.34,3.5,3.5,0,0,1,2,3.16,3.42,3.42,0,0,1-.58,1.92L9,19H9l.85.85Zm-4-4.5A1.5,1.5,0,0,0,5.5,15a1.39,1.39,0,0,0-.5.09A1.5,1.5,0,0,0,5.5,18a1.48,1.48,0,0,0,1.42-1A1.5,1.5,0,0,0,7,16.53Z"/>
         </svg>,
     category: 'tainacan-blocks',
     keywords: [ __( 'items', 'tainacan' ), __( 'search', 'tainacan' ), __( 'collection', 'tainacan' ) ],
diff --git a/src/gutenberg-blocks/tainacan-items/items-list/index.js b/src/gutenberg-blocks/tainacan-items/items-list/index.js
index 4c5f4500a..3646bcd52 100644
--- a/src/gutenberg-blocks/tainacan-items/items-list/index.js
+++ b/src/gutenberg-blocks/tainacan-items/items-list/index.js
@@ -13,6 +13,7 @@ registerBlockType('tainacan/items-list', {
     icon:
         <svg width="24" height="24" viewBox="0 -2 12 16">
             <path
+                fill="#298596"                
                 d="M8.8,1.2H1.2V10H0V1.2C0,0.6,0.6,0,1.2,0h7.5V1.2z M3.8,2.5c-0.7,0-1.2,0.6-1.2,1.3v8.8c0,0.7,0.6,1.2,1.2,1.2h6.9
                 c0.7,0,1.2-0.6,1.2-1.2V6.3L8.1,2.5H3.8z M7.5,3.4L11,6.9H7.5V3.4z"/>       
         </svg>,
diff --git a/src/gutenberg-blocks/tainacan-terms/terms-list/index.js b/src/gutenberg-blocks/tainacan-terms/terms-list/index.js
index 11ff593ac..99cce818a 100644
--- a/src/gutenberg-blocks/tainacan-terms/terms-list/index.js
+++ b/src/gutenberg-blocks/tainacan-terms/terms-list/index.js
@@ -13,6 +13,7 @@ registerBlockType('tainacan/terms-list', {
     icon:
         <svg width="24" height="24" viewBox="0 -2 12 16">
             <path
+                fill="#298596"                
                 d="M 4.4,2.5 H 0 V 0 h 4.4 l 1.2,1.3 z m -1.9,5 v 3.1 H 5 v 1.2 H 1.3 v -8 H 2.5 V 6.3 H 5 V 7.6 H 2.5 Z m 8.2,0.7 H 6.3 V 5.7 h 4.4 l 1.2,1.2 z M 11.9,11.3 10.7,10 H 6.3 v 2.5 h 4.4 z"/>       
         </svg>,
     category: 'tainacan-blocks',
diff --git a/src/importer/class-tainacan-csv.php b/src/importer/class-tainacan-csv.php
index 3e9b5a2f7..e2304c91e 100644
--- a/src/importer/class-tainacan-csv.php
+++ b/src/importer/class-tainacan-csv.php
@@ -47,6 +47,8 @@ class CSV extends Importer {
                             $this->set_option('item_status_index', $index);
                         } else if( $rawColumn === 'special_item_id' ) {
                             $this->set_option('item_id_index', $index);
+                        } else if( $rawColumn === 'special_comment_status' ) {
+                            $this->set_option('item_comment_status_index', $index);
                         }
                     } else {
                         $columns[] = $rawColumn;
@@ -154,6 +156,7 @@ class CSV extends Importer {
         $column_document = $this->get_option('document_index');
         $column_attachment = $this->get_option('attachment_index');
         $column_item_status = $this->get_option('item_status_index');
+        $column_item_comment_status = $this->get_option('item_comment_status_index');
 
         if( !empty($column_document) || !empty( $column_attachment ) || !empty( $column_item_status ) ){
             
@@ -184,6 +187,10 @@ class CSV extends Importer {
             if( is_array($values) && !empty($column_item_status) ) {
                 $this->handle_item_status( $values[$column_item_status], $inserted_item);
             }
+
+            if( is_array($values) && !empty($column_item_comment_status) ) {
+                $this->handle_item_comment_status( $values[$column_item_comment_status], $inserted_item);
+            }
         }
     }
 
@@ -519,6 +526,20 @@ class CSV extends Importer {
         //}
     }
 
+    /**
+     * @param $comment_status string the item comment status
+     */
+    private function handle_item_comment_status( $comment_status, $item_inserted ) {
+        if ( ! in_array( $comment_status, array( 'open', 'closed' ) ) ) {
+            $comment_status = 'closed';
+        }
+
+        $item_inserted->set_comment_status($comment_status);
+        if( $item_inserted->validate() ) {
+            $item_inserted = $this->items_repo->update($item_inserted);
+        }
+    }
+
     /**
      * @param $status string the item ID
      */
diff --git a/src/importer/class-tainacan-importer.php b/src/importer/class-tainacan-importer.php
index a49232d7f..e2989d17f 100644
--- a/src/importer/class-tainacan-importer.php
+++ b/src/importer/class-tainacan-importer.php
@@ -933,7 +933,15 @@ abstract class Importer {
 
         $name = $properties[0];
         $type = $properties[1];
-
+		
+		$supported_types = \Tainacan\Repositories\Metadata::get_instance()->fetch_metadata_types('NAME');
+		$supported_types = array_map('strtolower', $supported_types);
+		
+		if ( ! \in_array($type, $supported_types) ) {
+			$this->add_log( __('Unknown Metadata type "' . $type . '" for '.$name.'. Considering text type.', 'tainacan') );
+			$type = 'text';
+		}
+		
         $newMetadatum = new Entities\Metadatum();
         $newMetadatum->set_name($name);
 
diff --git a/src/js/event-bus-search.js b/src/js/event-bus-search.js
index b6b30ce3e..ceda66645 100644
--- a/src/js/event-bus-search.js
+++ b/src/js/event-bus-search.js
@@ -203,15 +203,11 @@ export default {
                         let prefsFetchOnly = this.collectionId ? `fetch_only_${this.collectionId}` : 'fetch_only';
                         let prefsFetchOnlyMeta = this.collectionId ? `fetch_only_meta_${this.collectionId}` : 'fetch_only_meta';
 
-                        if (this.$userPrefs.get(prefsFetchOnly) != metadatum) {
-                            this.$userPrefs.set(prefsFetchOnly, metadatum)
-                                .catch(() => this.$console.error("Error setting user preferences for fetch_only"));
-                        }
+                        if (this.$userPrefs.get(prefsFetchOnly) != metadatum)
+                            this.$userPrefs.set(prefsFetchOnly, metadatum);
 
-                        if(this.$userPrefs.get(prefsFetchOnlyMeta) != metadatumIDs) {
-                            this.$userPrefs.set(prefsFetchOnlyMeta, metadatumIDs)
-                                .catch(() => this.$console.error("Error setting user preferences for fetch_only_meta"))
-                        }
+                        if (this.$userPrefs.get(prefsFetchOnlyMeta) != metadatumIDs)
+                            this.$userPrefs.set(prefsFetchOnlyMeta, metadatumIDs);
                     }
                 },
                 cleanFetchOnly() {
@@ -320,7 +316,6 @@ export default {
                     if (this.$store.getters['search/getPostQuery']['fetch_only'] == undefined) {  
                         this.$emit( 'hasToPrepareMetadataAndFilters', to);
                     } else {  
-
                         this.$emit( 'isLoadingItems', true);
                         
                         // Cancels previous Request
diff --git a/src/js/store/modules/collection/actions.js b/src/js/store/modules/collection/actions.js
index c1f560c4c..88b44e1a3 100644
--- a/src/js/store/modules/collection/actions.js
+++ b/src/js/store/modules/collection/actions.js
@@ -213,7 +213,7 @@ export const fetchCollectionName = ({ commit }, id) => {
 export const fetchCollectionUserCanEdit = ({ commit }, id) => {
 
     return new Promise ((resolve, reject) => {
-        axios.tainacan.get('/collections/' + id + '?context=edit&fetch_only=current_user_can_edit')
+        axios.tainacan.get('/collections/' + id + '?context=edit&fetch_only')
         .then(res => {
             let caps = res.data.current_user_can_edit;
             resolve( caps );
diff --git a/src/js/store/modules/filter/actions.js b/src/js/store/modules/filter/actions.js
index 3fa01c76d..0efcf17f0 100644
--- a/src/js/store/modules/filter/actions.js
+++ b/src/js/store/modules/filter/actions.js
@@ -53,7 +53,7 @@ export const sendFilter = ( { commit }, { collectionId, metadatumId, name, filte
                 name: name,
                 status: status
             },
-            metadatum: metadatumId,
+            metadatum_id: metadatumId,
         })
             .then( res => {
                 let filter = res.data;
@@ -67,6 +67,12 @@ export const sendFilter = ( { commit }, { collectionId, metadatumId, name, filte
 };
 
 export const updateFilter = ( { commit }, { filterId, index, options }) => {
+
+    if (options['metadatum'] != undefined && options['metadatum']['metadatum_id'] != undefined) {
+        options['metadatum_id'] = options['metadatum']['metadatum_id'];
+        delete options['metadatum'];
+    }
+
     return new Promise(( resolve, reject ) => {
         let endpoint = '/filters/' + filterId;
         options['context'] = 'edit';
diff --git a/src/js/store/modules/item/actions.js b/src/js/store/modules/item/actions.js
index a7d649086..7c543e11b 100644
--- a/src/js/store/modules/item/actions.js
+++ b/src/js/store/modules/item/actions.js
@@ -62,10 +62,19 @@ export const setLastUpdated = ({ commit}, value) => {
 };
 
 // Actions directly related to Item
-export const fetchItem = ({ commit }, { itemId, contextEdit } ) => {
-    commit('cleanItem')
+export const fetchItem = ({ commit }, { itemId, contextEdit, fetchOnly } ) => {
+    commit('cleanItem');
+
+    let endpoint = '/items/'+ itemId + '?'; 
+
+    if (contextEdit)
+        endpoint += '&context=edit';
+
+    if (fetchOnly != undefined)
+        endpoint += '&fetch_only=' + fetchOnly;
+
     return new Promise((resolve, reject) => {
-        axios.tainacan.get('/items/'+ itemId + (contextEdit ? '?context=edit' : ''))
+        axios.tainacan.get(endpoint)
         .then(res => {
             let item = res.data;
             commit('setItem', item);
@@ -113,13 +122,31 @@ export const sendItem = ( { commit }, item) => {
 export const updateItem = ({ commit }, item) => {
 
     return new Promise((resolve, reject) => {
-        axios.tainacan.patch('/items/' + item.id, item).then( res => {
-            commit('setItem', res.data);
-            commit('setLastUpdated');
-            resolve( res.data );
-        }).catch( error => { 
-            reject({ error_message: error['response']['data'].error_message, errors: error['response']['data'].errors });
-        });
+        axios.tainacan.patch('/items/' + item.id, item)
+            .then( res => {
+                commit('setItem', res.data);
+                commit('setLastUpdated');
+                resolve( res.data );
+            }).catch( error => { 
+                reject({ error_message: error['response']['data'].error_message, errors: error['response']['data'].errors });
+            });
+
+    }); 
+};
+ 
+export const duplicateItem = ({ commit }, { item, attachment }) => {
+    delete item['id'];
+    
+    if (item['terms'] == null)
+        item['terms'] = [];
+
+    return new Promise((resolve, reject) => {
+        axios.tainacan.post('/collection/' + item.collection_id + '/items/', item)
+            .then( res => {
+                resolve( res.data );
+            }).catch( error => { 
+                reject({ error_message: error['response']['data'].error_message, errors: error['response']['data'].errors });
+            });
 
     }); 
 };
diff --git a/src/mappers/class-tainacan-mappers-handler.php b/src/mappers/class-tainacan-mappers-handler.php
index e354b582e..97d45e2fa 100644
--- a/src/mappers/class-tainacan-mappers-handler.php
+++ b/src/mappers/class-tainacan-mappers-handler.php
@@ -327,7 +327,7 @@ class Mappers_Handler {
 				
 				 
 				$mapped_meta[ $mapped_slug ] = $meta;
-				$mapped_meta[ $mapped_slug ]['semantic_url'] = $url;
+				$mapped_meta[ $mapped_slug ]['semantic_uri'] = $url;
 				$mapped_meta[ $mapped_slug ]['name'] = $label;
 				$mapped_meta[ $mapped_slug ]['slug'] = $mapped_slug;
 			}
diff --git a/src/migrations.php b/src/migrations.php
index c45e44150..3aab96a54 100644
--- a/src/migrations.php
+++ b/src/migrations.php
@@ -54,11 +54,22 @@ class Migrations {
 		
 		$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)) {
 			$wpdb->query("
-	        ALTER TABLE {$wpdb->prefix}tnc_bg_process
+	        ALTER TABLE $table_name
 	        ADD progress_label text,
 	        ADD progress_value int
 	        ");
@@ -68,15 +79,12 @@ class Migrations {
 
 	    if(empty($column_exists)) {
 			$wpdb->query("
-	        ALTER TABLE {$wpdb->prefix}tnc_bg_process
+	        ALTER TABLE $table_name
 	        ADD name text NOT NULL
 	        ");
 		}
-	}
-	
-	static function add_output_column_to_bg_process() {
-		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 = 'output'"  );
 
 	    if(empty($column_exists)) {
@@ -85,21 +93,17 @@ class Migrations {
 	        ADD output longtext
 	        ");
 		}
-	}
-
-	static function create_importer_status_column(){
-        global $wpdb;
-
-        $column_exists = $wpdb->get_results(  "SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = '{$wpdb->prefix}tnc_bg_process' AND column_name = 'status'"  );
+		
+		$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)) {
             $wpdb->query("
-	        ALTER TABLE {$wpdb->prefix}tnc_bg_process
+	        ALTER TABLE $table_name
 	        ADD status ENUM('waiting','running','paused','cancelled','errored','finished','finished-errors')
 	        ");
         }
-
-    }
+		
+	}
 
 	static function init_capabilites() {
 		$Tainacan_Capabilities = \Tainacan\Capabilities::get_instance();
@@ -334,6 +338,16 @@ class Migrations {
 		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'
+			)");
+		
+	}
+	
 }
 
 
diff --git a/src/readme.txt b/src/readme.txt
index c1790b2bc..9319e7917 100644
--- a/src/readme.txt
+++ b/src/readme.txt
@@ -1,5 +1,5 @@
 === Tainacan ===
-Contributors: andrebenedito, daltonmartins, fabianobn, jacsonp, leogermani, weryques, wetah, eduardohumberto, ravipassos, jessicafpx, marinagiolo, omarceloavila
+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.1
diff --git a/src/tainacan.php b/src/tainacan.php
index 1423eb4dd..79e8a0d5d 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: Media Lab / UFG
-Version: 0.9.1
+Version: 0.10 RC1
 Text Domain: tainacan
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 */
 
-const TAINACAN_VERSION = '0.9.1';
+const TAINACAN_VERSION = '0.10RC1';
 
 defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
 $TAINACAN_BASE_URL = plugins_url('', __FILE__);
diff --git a/src/theme-helper/view-mode-table.vue b/src/theme-helper/view-mode-table.vue
index 71b049813..6c1c251eb 100644
--- a/src/theme-helper/view-mode-table.vue
+++ b/src/theme-helper/view-mode-table.vue
@@ -18,7 +18,9 @@
             <!-- SKELETON LOADING -->
             <table 
                     v-if="isLoading"
-                    class="tainacan-table tainacan-table-skeleton">
+                    :summary="$i18n.get('label_table_of_items')"
+                    class="tainacan-table tainacan-table-skeleton"
+                    tabindex="0">
                 <thead>
                     <th 
                             v-for="(column, index) in displayedMetadata"
@@ -34,8 +36,7 @@
                                                                                                         column.metadata_type_object.primitive_type == 'item' || 
                                                                                                         column.metadata_type_object.primitive_type == 'compound') : false,
                                     'column-large-width' : column.metadata_type_object != undefined ? (column.metadata_type_object.primitive_type == 'long_string' || column.metadata_type_object.related_mapped_prop == 'description') : false,
-                            }"
-                            :custom-key="column.slug">
+                            }">
                         <div class="th-wrap">{{ column.name }}</div>
                     </th>
                 </thead>
@@ -74,8 +75,7 @@
                                                                                                             column.metadata_type_object.primitive_type == 'item' || 
                                                                                                             column.metadata_type_object.primitive_type == 'compound') : false,
                                         'column-large-width' : column.metadata_type_object != undefined ? (column.metadata_type_object.primitive_type == 'long_string' || column.metadata_type_object.related_mapped_prop == 'description') : false,
-                                }"
-                                :custom-key="column.slug">
+                                }">
                             <div class="th-wrap">{{ column.name }}</div>
                         </th>
                     </tr>
@@ -90,7 +90,6 @@
                                 :key="index"    
                                 v-for="(column, index) in displayedMetadata"
                                 v-if="column.display"
-                                :label="column.name" 
                                 class="column-default-width"
                                 :class="{
                                         'metadata-type-textarea': column.metadata_type_object != undefined && column.metadata_type_object.component == 'tainacan-textarea',
@@ -107,65 +106,66 @@
                                         'column-large-width' : column.metadata_type_object != undefined ? (column.metadata_type_object.primitive_type == 'long_string' || column.metadata_type_object.related_mapped_prop == 'description') : false,
                                 }">
                             <a :href="item.url">
-                            <p
-                                    v-tooltip="{
-                                        delay: {
-                                            show: 500,
-                                            hide: 300,
-                                        },
-                                        content: item.title != undefined && item.title != '' ? item.title : `<span class='has-text-gray3 is-italic'>` + $i18n.get('label_value_not_informed') + `</span>`,
-                                        html: true,
-                                        autoHide: false,
-                                        placement: 'auto-start'
-                                    }"
-                                    v-if="collectionId == undefined &&
-                                          column.metadata_type_object != undefined && 
-                                          column.metadata_type_object.related_mapped_prop == 'title'"
-                                    v-html="item.title != undefined && item.title != '' ? item.title : `<span class='has-text-gray3 is-italic'>` + $i18n.get('label_value_not_informed') + `</span>`"/>
-                            <p
-                                    v-tooltip="{
-                                        delay: {
-                                            show: 500,
-                                            hide: 300,
-                                        },
-                                        content: item.description != undefined && item.description != '' ? item.description : `<span class='has-text-gray3 is-italic'>` + $i18n.get('label_value_not_informed') + `</span>`,
-                                        html: true,
-                                        autoHide: false,
-                                        placement: 'auto-start'
-                                    }"
-                                    v-if="collectionId == undefined &&
-                                          column.metadata_type_object != undefined && 
-                                          column.metadata_type_object.related_mapped_prop == 'description'"
-                                    v-html="item.description != undefined && item.description != '' ? item.description : `<span class='has-text-gray3 is-italic'>` + $i18n.get('label_value_not_informed') + `</span>`"/>
-                            <p
-                                    v-tooltip="{
-                                        delay: {
-                                            show: 500,
-                                            hide: 300,
-                                        },
-                                        classes: [ column.metadata_type_object != undefined && column.metadata_type_object.component == 'tainacan-textarea' ? 'metadata-type-textarea' : '' ],
-                                        content: renderMetadata(item.metadata, column) != '' ? renderMetadata(item.metadata, column) : `<span class='has-text-gray3 is-italic'>` + $i18n.get('label_value_not_informed') + `</span>`,
-                                        html: true,
-                                        autoHide: false,
-                                        placement: 'auto-start'
-                                    }"
-                                    v-if="item.metadata != undefined &&
-                                          column.metadatum !== 'row_thumbnail' &&
-                                          column.metadatum !== 'row_actions' &&
-                                          column.metadatum !== 'row_creation' &&
-                                          column.metadatum !== 'row_author' &&
-                                          column.metadatum !== 'row_title' &&
-                                          column.metadatum !== 'row_description'"
-                                    v-html="renderMetadata(item.metadata, column) != '' ? renderMetadata(item.metadata, column, column.metadata_type_object.component) : `<span class='has-text-gray3 is-italic'>` + $i18n.get('label_value_not_informed') + `</span>`"/>
+                                <p
+                                        v-tooltip="{
+                                            delay: {
+                                                show: 500,
+                                                hide: 300,
+                                            },
+                                            content: item.title != undefined && item.title != '' ? item.title : `<span class='has-text-gray3 is-italic'>` + $i18n.get('label_value_not_informed') + `</span>`,
+                                            html: true,
+                                            autoHide: false,
+                                            placement: 'auto-start'
+                                        }"
+                                        :aria-label="column.name + ': ' + (item.title != undefined && item.title != '' ? item.title : $i18n.get('label_value_not_informed'))"
+                                        v-if="collectionId == undefined &&
+                                            column.metadata_type_object != undefined && 
+                                            column.metadata_type_object.related_mapped_prop == 'title'"
+                                        v-html="`<span class='sr-only'>` + column.name + ': </span>' + (item.title != undefined && item.title != '' ? item.title : `<span class='has-text-gray3 is-italic'>` + $i18n.get('label_value_not_informed') + `</span>`)"/>
+                                <p
+                                        v-tooltip="{
+                                            delay: {
+                                                show: 500,
+                                                hide: 300,
+                                            },
+                                            content: item.description != undefined && item.description != '' ? item.description : `<span class='has-text-gray3 is-italic'>` + $i18n.get('label_value_not_informed') + `</span>`,
+                                            html: true,
+                                            autoHide: false,
+                                            placement: 'auto-start'
+                                        }"
+                                        v-if="collectionId == undefined &&
+                                            column.metadata_type_object != undefined && 
+                                            column.metadata_type_object.related_mapped_prop == 'description'"
+                                        v-html="`<span class='sr-only'>` + column.name + ': </span>' + (item.description != undefined && item.description != '' ? item.description : `<span class='has-text-gray3 is-italic'>` + $i18n.get('label_value_not_informed') + `</span>`)"/>
+                                <p
+                                        v-tooltip="{
+                                            delay: {
+                                                show: 500,
+                                                hide: 300,
+                                            },
+                                            classes: [ column.metadata_type_object != undefined && column.metadata_type_object.component == 'tainacan-textarea' ? 'metadata-type-textarea' : '' ],
+                                            content: renderMetadata(item.metadata, column) != '' ? renderMetadata(item.metadata, column) : `<span class='has-text-gray3 is-italic'>` + $i18n.get('label_value_not_informed') + `</span>`,
+                                            html: true,
+                                            autoHide: false,
+                                            placement: 'auto-start'
+                                        }"
+                                        v-if="item.metadata != undefined &&
+                                            column.metadatum !== 'row_thumbnail' &&
+                                            column.metadatum !== 'row_actions' &&
+                                            column.metadatum !== 'row_creation' &&
+                                            column.metadatum !== 'row_author' &&
+                                            column.metadatum !== 'row_title' &&
+                                            column.metadatum !== 'row_description'"
+                                        v-html="renderMetadata(item.metadata, column) != '' ? renderMetadata(item.metadata, column, column.metadata_type_object.component) : `<span class='has-text-gray3 is-italic'>` + $i18n.get('label_value_not_informed') + `</span>`"/>
 
-                            <span v-if="column.metadatum == 'row_thumbnail'">
-                                <img 
-                                        :alt="$i18n.get('label_thumbnail')"
-                                        class="table-thumb" 
-                                        :src="item['thumbnail']['tainacan-small'] ? item['thumbnail']['tainacan-small'][0] : (item['thumbnail'].thumbnail ? item['thumbnail'].thumbnail[0] : thumbPlaceholderPath)">
-                                <div class="skeleton"/>
-                            </span> 
-                        </a>
+                                <span v-if="column.metadatum == 'row_thumbnail'">
+                                    <img 
+                                            :alt="$i18n.get('label_thumbnail')"
+                                            class="table-thumb" 
+                                            :src="item['thumbnail']['tainacan-small'] ? item['thumbnail']['tainacan-small'][0] : (item['thumbnail'].thumbnail ? item['thumbnail'].thumbnail[0] : thumbPlaceholderPath)">
+                                    <div class="skeleton"/>
+                                </span> 
+                            </a>
                         </td>
                     </tr>
                 </tbody>
@@ -198,9 +198,9 @@ export default {
                 return '';
             } else {
                 if (component != undefined && component == 'tainacan-textarea')
-                    return metadata.value_as_string;
+                    return '<span class="sr-only">' + column.name + ': </span>' + metadata.value_as_string;
                 else
-                    return metadata.value_as_html;
+                    return '<span class="sr-only">' + column.name + ': </span>' + metadata.value_as_html;
             }
         }
     }
diff --git a/tests/test-api-filters.php b/tests/test-api-filters.php
index 87f0bcd1e..8e4258761 100644
--- a/tests/test-api-filters.php
+++ b/tests/test-api-filters.php
@@ -67,19 +67,20 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			array(
 				'name'        => 'Metadatum filtered',
 				'description' => 'Is filtered',
-			)
+				'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(
 				'name'        => 'filtro',
 				'collection'  => $collection,
 				'description' => 'descricao',
-				'metadatum'    => $metadatum,
-				'filter_type' => $filter_type,
+				'metadatum_id'    => $metadatum->get_id(),
+				'filter_type' => 'Tainacan\Filter_Types\Custom_Interval',
 			),
 			true
 		);
@@ -133,8 +134,10 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 			array(
 				'name'        => 'Metadatum filtered',
 				'description' => 'Is filtered',
-				'collection_id' => $collection->get_id()
-			)
+				'collection_id' => $collection->get_id(),
+				'metadata_type'    => 'Tainacan\Metadata_Types\Numeric',
+			),
+			true
 		);
 
 		$filter_type = $this->tainacan_filter_factory->create_filter('custom_interval');
@@ -145,7 +148,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 				'name'        => 'filtro',
 				'collection'  => $collection,
 				'description' => 'descricao',
-				'metadatum'    => $metadatum,
+				'metadatum_id'    => $metadatum->get_id(),
 				'filter_type' => $filter_type,
 			),
 			true
@@ -296,7 +299,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 				'description' => 'Description of 2x Filter',
 				'status'      => 'publish'
 			],
-			'metadatum'       => $metadatum2->get_id()
+			'metadatum_id'       => $metadatum2->get_id()
 		]);
 
 		$filter_attr2 = json_encode([
@@ -306,7 +309,7 @@ class TAINACAN_REST_Terms_Controller extends TAINACAN_UnitApiTestCase {
 				'description' => 'Description of 4x Filter',
 				'status'      => 'publish'
 			],
-			'metadatum'       => $metadatum->get_id()
+			'metadatum_id'       => $metadatum->get_id()
 		]);
 
 		#### CREATE A FILTER IN REPOSITORY ####
diff --git a/tests/test-api-items.php b/tests/test-api-items.php
index b729bea5e..484b0709a 100644
--- a/tests/test-api-items.php
+++ b/tests/test-api-items.php
@@ -80,8 +80,15 @@ class TAINACAN_REST_Items_Controller extends TAINACAN_UnitApiTestCase {
 	}
 
 	public function test_delete_or_trash_item_from_a_collection(){
-		$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
+		);
 		$item1 = $this->tainacan_entity_factory->create_entity(
 			'item',
 			array(
diff --git a/tests/test-api-metadatum-mappers.php b/tests/test-api-metadatum-mappers.php
index 018050259..ada17ac79 100644
--- a/tests/test-api-metadatum-mappers.php
+++ b/tests/test-api-metadatum-mappers.php
@@ -276,8 +276,8 @@ class TAINACAN_REST_Metadatum_Mappers_Controller extends TAINACAN_UnitApiTestCas
 		$this->assertEquals('Value for meta 1', $item['metadata']['dc:language']['value']);
 		$this->assertEquals('Value for meta 3', $item['metadata']['dc:creator']['value']);
 		
-		$this->assertEquals($dc->get_url('dc:language'), $item['metadata']['dc:language']['semantic_url']);
-		$this->assertEquals($dc->get_url('dc:creator'), $item['metadata']['dc:creator']['semantic_url']);
+		$this->assertEquals($dc->get_url('dc:language'), $item['metadata']['dc:language']['semantic_uri']);
+		$this->assertEquals($dc->get_url('dc:creator'), $item['metadata']['dc:creator']['semantic_uri']);
 		
 		$this->assertEquals($dc->metadata['dc:language']['label'], $item['metadata']['dc:language']['name']);
 		$this->assertEquals($dc->metadata['dc:creator']['label'], $item['metadata']['dc:creator']['name']);
diff --git a/tests/test-category-metadatum-types.php b/tests/test-category-metadatum-types.php
index 110ba71b9..6122a5fdb 100644
--- a/tests/test-category-metadatum-types.php
+++ b/tests/test-category-metadatum-types.php
@@ -213,7 +213,7 @@ class TaxonomyMetadatumTypes extends TAINACAN_UnitTestCase {
 		$this->assertContains($collection->get_id(), $checkTax2->get_collections_ids(), 'Collection must be added to taxonomy when metadatum is updated');
 		$this->assertNotContains($collection->get_id(), $checkTax->get_collections_ids(), 'Collection must be removed from taxonomy when metadatum is updated');
 		
-		$metadatum = $Tainacan_Metadata->trash($metadatum->get_id());
+		$metadatum = $Tainacan_Metadata->trash($metadatum);
 		
 		$checkTax2 = $Tainacan_Taxonomies->fetch($tax2->get_id());
 		
diff --git a/tests/test-filters.php b/tests/test-filters.php
index 09ee3d014..a27b62591 100644
--- a/tests/test-filters.php
+++ b/tests/test-filters.php
@@ -65,7 +65,6 @@ class Filters extends TAINACAN_UnitTestCase {
 		    true
 	    );
 
-	    $filter_list_type = $this->tainacan_filter_factory->create_filter('selectbox');
 
 	    $filter = $this->tainacan_entity_factory->create_entity(
 	    	'filter',
@@ -74,7 +73,7 @@ class Filters extends TAINACAN_UnitTestCase {
 			    'collection'         => $collection,
 		    	'description' => 'descricao',
 			    'metadatum'           => $metadatum,
-			    'filter_type' => $filter_list_type
+			    'filter_type' => 'Tainacan\Filter_Types\Selectbox'
 		    ),
 		    true
 	    );
@@ -89,9 +88,8 @@ class Filters extends TAINACAN_UnitTestCase {
         $this->assertEquals( 'filtro', $test->get_name() );
         $this->assertEquals( $collection->get_id(), $test->get_collection_id() );
         $this->assertEquals( $metadatum->get_id(), $test->get_metadatum()->get_id() );
-        $objClass = get_class( $filter_list_type );
         $storedObjClass = get_class( $test->get_filter_type_object() );
-        $this->assertEquals($objClass , $storedObjClass );
+        $this->assertEquals('Tainacan\Filter_Types\Selectbox' , $storedObjClass );
 
     }
 
@@ -99,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( 7, count( $all_filter_types ) );
+        $this->assertEquals( 9, count( $all_filter_types ) );
 
         $float_filters = $Tainacan_Filters->fetch_supported_filter_types('float');
         $this->assertTrue( count( $float_filters ) > 0 );
@@ -131,8 +129,6 @@ class Filters extends TAINACAN_UnitTestCase {
             true
         );
 
-        $autocomplete = $this->tainacan_filter_factory->create_filter('autocomplete');
-
         $filter = $this->tainacan_entity_factory->create_entity(
             'filter',
 	        array(
@@ -140,7 +136,7 @@ class Filters extends TAINACAN_UnitTestCase {
 		        'collection'  => $collection,
 		        'description' => 'descricao',
 		        'metadatum'       => $metadatum2,
-		        'filter_type' => $autocomplete
+		        'filter_type' => 'Tainacan\Filter_Types\Autocomplete'
 	        ),
             true
         );
@@ -149,14 +145,12 @@ class Filters extends TAINACAN_UnitTestCase {
 
         $this->assertEquals( 'Tainacan\Filter_Types\Autocomplete', $test->get_filter_type());
 
-        $custom_interval = $this->tainacan_filter_factory->create_filter('custom_interval');
-
         $filter2 = new \Tainacan\Entities\Filter();
         $filter2->set_name('filter 2');
         $filter2->set_collection($collection);
         $filter2->set_description('description');
         $filter2->set_metadatum($metadatum2);
-        $filter2->set_filter_type($custom_interval);
+        $filter2->set_filter_type('Tainacan\Filter_Types\Custom_Interval');
 
         $this->assertFalse($filter2->validate(), 'filter with a metadatum with unsupported primitive type should not validate');
 
@@ -186,7 +180,7 @@ class Filters extends TAINACAN_UnitTestCase {
 	        	'name'              => 'filter default',
 		        'collection_id'     => 'filter_in_repository',
 		        'filter_type'  => 'Tainacan\Filter_Types\Selectbox',
-				'metadatum'    => $meta_repo->get_id(),
+				'metadatum_id'    => $meta_repo->get_id(),
 		        'status'            => 'publish'
 	        ),
 	        true
@@ -216,7 +210,7 @@ class Filters extends TAINACAN_UnitTestCase {
 	        	'name'              => 'filter grandfather',
 		        'collection_id'     => $collection_grandfather->get_id(),
 		        'filter_type'  => 'Tainacan\Filter_Types\Selectbox',
-				'metadatum'    => $meta_grand->get_id(),
+				'metadatum_id'    => $meta_grand->get_id(),
 		        'status'            => 'publish'
 	        ),
 	        true
@@ -247,7 +241,7 @@ class Filters extends TAINACAN_UnitTestCase {
 	        	'name'              => 'filter father',
 		        'collection_id'     => $collection_father->get_id(),
 		        'filter_type'  => 'Tainacan\Filter_Types\Selectbox',
-				'metadatum'    => $meta_father->get_id(),
+				'metadatum_id'    => $meta_father->get_id(),
 		        'status'            => 'publish'
 	        ),
 	        true
@@ -281,7 +275,7 @@ class Filters extends TAINACAN_UnitTestCase {
 	        	'name'              => 'filter son',
 		        'collection_id'     => $collection_son->get_id(),
 		        'filter_type'  => 'Tainacan\Filter_Types\Selectbox',
-				'metadatum'    => $meta_son->get_id(),
+				'metadatum_id'    => $meta_son->get_id(),
 		        'status'            => 'publish'
 	        ),
 	        true
@@ -295,5 +289,173 @@ class Filters extends TAINACAN_UnitTestCase {
         $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();
+
+        $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',
+                'collection_id' => $collection->get_id()
+            ),
+            true
+        );
+
+        $filter2 = new \Tainacan\Entities\Filter();
+        $filter2->set_name('filter 2');
+        $filter2->set_collection($collection);
+        $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(
+                'name'          => 'Other filtered',
+                'description'   => 'Is filtered',
+                'metadata_type'    => 'Tainacan\Metadata_Types\Text',
+                'collection_id' => $collection->get_id()
+            ),
+            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(
+				'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',
+				'collection_id' => $collection->get_id()
+			),
+			true
+		);
+		
+		$filter = $this->tainacan_entity_factory->create_entity(
+			'filter',
+			array(
+				'name'        => 'filtro',
+				'collection'  => $collection,
+				'description' => 'descricao',
+				'metadatum'       => $metadatum2,
+				'filter_type' => 'Tainacan\Filter_Types\Autocomplete'
+			),
+			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(
+				'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',
+				'collection_id' => $collection->get_id()
+			),
+			true
+		);
+		
+		$filter = $this->tainacan_entity_factory->create_entity(
+			'filter',
+			array(
+				'name'        => 'filtro',
+				'collection'  => $collection,
+				'description' => 'descricao',
+				'metadatum'       => $metadatum2,
+				'filter_type' => 'Tainacan\Filter_Types\Autocomplete'
+			),
+			true
+		);
+		
+		$Tainacan_Metadata->trash($metadatum2);
+		
+		$x = $Tainacan_Filters->fetch( $filter->get_id() );
+		
+		$this->assertEquals('trash', $x->get_status());
+		
+	}
 	
 }
\ No newline at end of file
diff --git a/tests/test-importer.php b/tests/test-importer.php
index 19e94455b..10a44b1e2 100644
--- a/tests/test-importer.php
+++ b/tests/test-importer.php
@@ -559,15 +559,15 @@ class ImporterTests extends TAINACAN_UnitTestCase {
         $file = fopen($file_name, 'w');
 
         // save the column headers
-        fputcsv($file, array('Column 1', 'special_item_status', 'Unknow Column'));
+        fputcsv($file, array('Column 1', 'special_item_status', 'Unknow Column', 'special_comment_status'));
 
         // Sample data
         $data = array(
-            array('Data 11', 'publish', 'nothing'),
-            array('Data 21', 'private', 'void'),
-            array('Data 31', 'trash', 'empty'),
-            array('Data 41', 'future', 'null'),
-            array('Data 51', 'trash', 'zero')
+            array('Data 11', 'publish', 'nothing', 'open'),
+            array('Data 21', 'private', 'void', 'closed'),
+            array('Data 31', 'trash', 'empty', 'open'),
+            array('Data 41', 'future', 'null', 'closed'),
+            array('Data 51', 'trash', 'zero', 'open')
         );
 
         // save each row of the data
@@ -658,5 +658,13 @@ class ImporterTests extends TAINACAN_UnitTestCase {
 
         // only 3 items should be published
         $this->assertEquals( 3, count( $items ) );
+
+        //foreach ($items as $item) {
+        //  if ( \in_array( $item->get_description(), ['Data 11', 'Data 31', 'Data 51'] ) ) {
+        //    $this->assertEquals( 'open', $item->get_comment_status() );
+        //  } else {
+        //    $this->assertEquals( 'closed', $item->get_comment_status() );
+        //  }
+        //}
     }
 }
diff --git a/tests/test-item-metadata.php b/tests/test-item-metadata.php
index 28a1c9c61..9badf85e3 100644
--- a/tests/test-item-metadata.php
+++ b/tests/test-item-metadata.php
@@ -298,8 +298,8 @@ class Item_Metadata extends TAINACAN_UnitTestCase {
 		$item_metadata_textarea = new \Tainacan\Entities\Item_Metadata_Entity($i, $metadatum_textarea);
 		$item_metadata_textarea->set_value($value_textarea);
 
-		$response_text = 'GOOGLE: <a href="www.google.com" target="_blank" title="www.google.com">www.google.com</a>';
-		$response_textarea = 'GOOGLE: <a href="www.google.com" target="_blank" title="www.google.com">www.google.com</a> \n GOOGLE: <a href="https://www.google.com" target="_blank" title="https://www.google.com">https://www.google.com</a>';
+		$response_text = 'GOOGLE: <a href="http://www.google.com" target="_blank" title="www.google.com">www.google.com</a>';
+		$response_textarea = 'GOOGLE: <a href="http://www.google.com" target="_blank" title="www.google.com">www.google.com</a> \n GOOGLE: <a href="https://www.google.com" target="_blank" title="https://www.google.com">https://www.google.com</a>';
 
 		$this->assertEquals($item_metadata_text->get_value_as_html(), $response_text);
 		$this->assertEquals($item_metadata_textarea->get_value_as_html(), $response_textarea);
diff --git a/tests/test-items.php b/tests/test-items.php
index 4146be287..99f9bd908 100644
--- a/tests/test-items.php
+++ b/tests/test-items.php
@@ -406,7 +406,7 @@ class Items extends TAINACAN_UnitTestCase {
 		
 		$items = \Tainacan\Repositories\Items::get_instance();
 		
-		$items->delete($item_id);
+		$items->delete($item);
 		
 		$fetch_item = $items->fetch($item_id);
 		
diff --git a/tests/test-utilities.php b/tests/test-utilities.php
index 44dbfbfc5..b4434bf31 100644
--- a/tests/test-utilities.php
+++ b/tests/test-utilities.php
@@ -155,14 +155,23 @@ class TestUtilities extends TAINACAN_UnitTestCase {
 		
 		$text_multiple_links_expected =  'Lorem <a href="https://www.tainacan.org" target="_blank" title="https://www.tainacan.org">https://www.tainacan.org</a> ipsum dolor sit amet <a href="http://www.tainacan.org" target="_blank" title="http://www.tainacan.org">http://www.tainacan.org</a>' .
 													' <a href="ftp://www.teste.com.br" target="_blank" title="ftp://www.teste.com.br">ftp://www.teste.com.br</a> consectetur adipiscing elit. <a href="ftps://www.teste.com.br" target="_blank" title="ftps://www.teste.com.br">ftps://www.teste.com.br</a> Sed pharetra sapien quis nunc vulputate dictum.' .
-													' <a href="www.simple.com.br" target="_blank" title="www.simple.com.br">www.simple.com.br</a> ' . 
-													' <a href="www.simple.com" target="_blank" title="www.simple.com">www.simple.com</a> ' .
-													' <a href="www.simple.org" target="_blank" title="www.simple.org">www.simple.org</a> ' .
-													' Pellentesque id //ww.lair.com.br of a http://wwwliar.com.br euismod mauris. //pegadinha.com.br ';
+													' <a href="http://www.simple.com.br" target="_blank" title="www.simple.com.br">www.simple.com.br</a> ' . 
+													' <a href="http://www.simple.com" target="_blank" title="www.simple.com">www.simple.com</a> ' .
+													' <a href="http://www.simple.org" target="_blank" title="www.simple.org">www.simple.org</a> ' .
+													' Pellentesque id //ww.lair.com.br of a <a href="http://wwwliar.com.br" target="_blank" title="http://wwwliar.com.br">http://wwwliar.com.br</a> euismod mauris. //pegadinha.com.br ';
 
 		$text_multiple_links_response = $text->make_clickable_links($text_multiple_links);
 		$this->assertEquals($text_multiple_links_expected, $text_multiple_links_response);
 
+		$text_multiple_links = 'Lorem <a href="https://www.tainacan.org" target="_blank" title="https://www.tainacan.org">https://www.tainacan.org</a> Lorem https://tainacan.org hahahahahahhttps://tainacan.org hahaha ';
+		$text_multiple_links_expected = 'Lorem <a href="https://www.tainacan.org" target="_blank" title="https://www.tainacan.org">https://www.tainacan.org</a> Lorem <a href="https://tainacan.org" target="_blank" title="https://tainacan.org">https://tainacan.org</a> hahahahahah<a href="https://tainacan.org" target="_blank" title="https://tainacan.org">https://tainacan.org</a> hahaha ';
+		$text_multiple_links_response = $text->make_clickable_links($text_multiple_links);
+		$this->assertEquals($text_multiple_links_expected, $text_multiple_links_response);
+
+		$text_input = 'If you type only www.abc.com without the http the link.';
+		$text_input_expected = 'If you type only <a href="http://www.abc.com" target="_blank" title="www.abc.com">www.abc.com</a> without the http the link.';
+		$text_input_response = $text->make_clickable_links($text_input);
+		$this->assertEquals($text_input_expected, $text_input_response);
 	}
 	
 }
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index 7d7023020..ea7ed4e5f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,6 +1,7 @@
 let path = require('path');
 let webpack = require('webpack');
 const VueLoaderPlugin = require('vue-loader/lib/plugin');
+const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 
 module.exports = {
     entry: {
@@ -13,7 +14,9 @@ module.exports = {
         gutenberg_items_list: './src/gutenberg-blocks/tainacan-items/items-list/index.js',
         gutenberg_dynamic_items_list: './src/gutenberg-blocks/tainacan-items/dynamic-items-list/index.js',
         gutenberg_dynamic_items_list_theme: './src/gutenberg-blocks/tainacan-items/dynamic-items-list/dynamic-items-list-theme.js',
-        gutenberg_collections_list: './src/gutenberg-blocks/tainacan-collections/collections-list/index.js'
+        gutenberg_collections_list: './src/gutenberg-blocks/tainacan-collections/collections-list/index.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'
     },
     output: {
         path: path.resolve(__dirname, './src/assets/'),
@@ -38,7 +41,7 @@ module.exports = {
             {
                 test: /\.js$/,
                 loader: 'babel-loader',
-                exclude: /node_modules/,
+                exclude: /node_modules/
             },
             {
                 test: /\.(png|jpg|jpeg|gif|eot|ttf|otf|woff|woff2|svg|svgz)(\?.+)?$/,
@@ -113,7 +116,7 @@ if (production === true) {
     module.exports.resolve = {
         alias: {
             'vue$': 'vue/dist/vue.min',
-            'swiper$': 'swiper/dist/js/swiper.js'
+            'swiper$': 'swiper/dist/js/swiper.min.js'
         }
     }
 } else {
@@ -128,12 +131,17 @@ if (production === true) {
             },
         }),
         new VueLoaderPlugin(),
+        new BundleAnalyzerPlugin({
+            openAnalyzer: false,
+            analyzerMode: 'static'
+        })
     ];
 
     module.exports.resolve = {
         alias: {
             //'vue$': 'vue/dist/vue.esm' // uncomment this and comment the above to use vue dev tools (can cause type error)
-            'vue$': 'vue/dist/vue.min'
+            'vue$': 'vue/dist/vue.min',
+            'swiper$': 'swiper/dist/js/swiper.min.js'
         }
     }
 }
\ No newline at end of file