diff --git a/application/controllers/MigrateController.php b/application/controllers/MigrateController.php
index fc46fbe5..4978ccb1 100644
--- a/application/controllers/MigrateController.php
+++ b/application/controllers/MigrateController.php
@@ -107,13 +107,8 @@ class MigrateController extends Controller
         foreach ($urls as $urlString) {
             $url = Url::fromPath($urlString);
             $filter = QueryString::parse($url->getQueryString());
-
-            $newFilter = $traverseFilter($filter);
-            if ($newFilter !== null) {
-                $result[] = rawurldecode($url->setParams([])->setFilter($newFilter)->getAbsoluteUrl());
-            } else {
-                $result[] = $url->getAbsoluteUrl();
-            }
+            $filter = $traverseFilter($filter) ?? $filter;
+            $result[] = rawurldecode($url->setParams([])->setFilter($filter)->getAbsoluteUrl());
         }
 
         $response = $this->getResponse()->json();
diff --git a/public/js/migrate.js b/public/js/migrate.js
index 82302c7e..dddbaed8 100644
--- a/public/js/migrate.js
+++ b/public/js/migrate.js
@@ -115,7 +115,7 @@
 
             $target.each((_, container) => {
                 let $container = $(container);
-                let href = decodeURI($container.data('icingaUrl'));
+                let href = decodeURIComponent($container.data('icingaUrl'));
                 let containerId = $container.attr('id');
 
                 if (!!href) {
@@ -178,12 +178,12 @@
 
                 var containerUrl = '';
                 if ($container.length) {
-                    containerUrl = decodeURI($container.data('icingaUrl'));
+                    containerUrl = decodeURIComponent($container.data('icingaUrl'));
                 }
 
                 if (suggestionUrl !== containerUrl) {
                     var $newContainer = $('#main > .container').filter(function () {
-                        return decodeURI($(this).data('icingaUrl')) === suggestionUrl;
+                        return decodeURIComponent($(this).data('icingaUrl')) === suggestionUrl;
                     });
                     if ($newContainer.length) {
                         // Container moved
@@ -222,7 +222,7 @@
             var $button = $(event.target).closest('button');
             var $suggestion = $button.parent();
             var $container = $('#' + $suggestion.data('containerId'));
-            var containerUrl = decodeURI($container.data('icingaUrl'));
+            var containerUrl = decodeURIComponent($container.data('icingaUrl'));
 
             if ($button.attr('value') === '1') {
                 // Yes
@@ -472,7 +472,7 @@
             this.Popup().find('li').each(function () {
                 var $suggestion = $(this);
                 var $container = $('#' + $suggestion.data('containerId'));
-                var containerUrl = decodeURI($container.data('icingaUrl'));
+                var containerUrl = decodeURIComponent($container.data('icingaUrl'));
                 if (
                     // Unknown url, yet
                     typeof _this.knownMigrations[containerUrl] === 'undefined'