diff --git a/.travis.yml b/.travis.yml
index f6fd69e4d..a82638864 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,7 +72,7 @@ script:
   # run API tests
   - make behat-api-quiet
   # run JS e2e tests
-  - make behat-js-quiet
+  - travis_retry make behat-js-quiet
   # Upload Behat logs
   - ./vendor/bin/upload-textfiles "var/log/behat-reports/*.log"
 
diff --git a/assets/js/app/editor/Components/Filelist.vue b/assets/js/app/editor/Components/Filelist.vue
index 5c4ba4620..96124ba59 100644
--- a/assets/js/app/editor/Components/Filelist.vue
+++ b/assets/js/app/editor/Components/Filelist.vue
@@ -87,7 +87,8 @@ export default {
       return index === this.containerFiles.length - 1;
     },
     getFieldNumberFromElement(elem) {
-      return parseInt(elem.fieldName.match(/\d+/)[0]);
+      // get the last number because in collections, there are multiple.
+      return parseInt([...elem.fieldName.matchAll(/\d+/g)].splice(-1).pop()[0]);
     },
     onMoveFileDown(elem) {
       let fieldNumber = this.getFieldNumberFromElement(elem);
diff --git a/assets/js/app/editor/Components/Imagelist.vue b/assets/js/app/editor/Components/Imagelist.vue
index 693f20b97..058c2a4d0 100644
--- a/assets/js/app/editor/Components/Imagelist.vue
+++ b/assets/js/app/editor/Components/Imagelist.vue
@@ -95,7 +95,8 @@ export default {
       });
     },
     getFieldNumberFromElement(elem) {
-      return parseInt(elem.fieldName.match(/\d+/)[0]);
+      // get the last number because in collections, there are multiple.
+      return parseInt([...elem.fieldName.matchAll(/\d+/g)].splice(-1).pop()[0]);
     },
     onMoveImageDown(elem) {
       let fieldNumber = this.getFieldNumberFromElement(elem);
diff --git a/ecs.php b/ecs.php
index ddd9491ad..b49a1179e 100644
--- a/ecs.php
+++ b/ecs.php
@@ -46,7 +46,7 @@
 return static function (ContainerConfigurator $containerConfigurator): void {
     $parameters = $containerConfigurator->parameters();
 
-    $parameters->set('sets', ['clean-code', 'common', 'php-70', 'php-71', 'psr-12', 'symfony', 'symfony-risky']);
+    $parameters->set('sets', ['clean-code', 'common', 'php70', 'php71', 'psr12', 'symfony', 'symfony-risky']);
 
     $parameters->set('paths', [
         __DIR__ . '/src',
diff --git a/templates/helpers/_taxonomylinks.html.twig b/templates/helpers/_taxonomylinks.html.twig
index b5a23a234..a300bfc3a 100644
--- a/templates/helpers/_taxonomylinks.html.twig
+++ b/templates/helpers/_taxonomylinks.html.twig
@@ -9,7 +9,7 @@
             {% endif %}
         </em>
         {% for taxonomy in taxonomies %}
-            <a href="{{ taxonomy.link }}" class="taxonomy-{{ type }}">{{ taxonomy.name }}</a>{% if not loop.last %}, {% endif %}
+            <a href="{{ taxonomy|link }}" class="taxonomy-{{ type }}">{{ taxonomy.name }}</a>{% if not loop.last %}, {% endif %}
         {% else %}
             {{ __('general.phrase.none') }}
         {% endfor %}