diff --git a/core/modules/path/path.routing.yml b/core/modules/path/path.routing.yml
index d3e44c3..e6adc56 100644
--- a/core/modules/path/path.routing.yml
+++ b/core/modules/path/path.routing.yml
@@ -16,7 +16,7 @@ path.admin_overview:
     _permission: 'administer url aliases'
 
 path.admin_overview_filter:
-  path: '/admin/config/search/path/list/{keys}'
+  path: '/admin/config/search/path/filter'
   defaults:
     _title: 'URL aliases'
     _content: '\Drupal\path\Controller\PathController::adminOverview'
diff --git a/core/modules/path/src/Controller/PathController.php b/core/modules/path/src/Controller/PathController.php
index 5f6f3c6..1b9cb7a 100644
--- a/core/modules/path/src/Controller/PathController.php
+++ b/core/modules/path/src/Controller/PathController.php
@@ -55,7 +55,8 @@ public static function create(ContainerInterface $container) {
     );
   }
 
-  public function adminOverview($keys) {
+  public function adminOverview() {
+    $keys = \Drupal::request()->query->get('search');
     // Add the filter form above the overview table.
     $build['path_admin_filter_form'] = $this->formBuilder()->getForm('Drupal\path\Form\PathFilterForm', $keys);
     // Enable language column if language.module is enabled or if we have any
diff --git a/core/modules/path/src/Form/PathFilterForm.php b/core/modules/path/src/Form/PathFilterForm.php
index 30374be..51a1a29 100644
--- a/core/modules/path/src/Form/PathFilterForm.php
+++ b/core/modules/path/src/Form/PathFilterForm.php
@@ -25,7 +25,8 @@ public function getFormId() {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, FormStateInterface $form_state, $keys = NULL) {
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $keys = $this->getRequest()->query->get('search') ? $this->getRequest()->query->get('search') : FALSE;
     $form['#attributes'] = array('class' => array('search-form'));
     $form['basic'] = array(
       '#type' => 'details',
@@ -60,8 +61,8 @@ public function buildForm(array $form, FormStateInterface $form_state, $keys = N
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    $form_state->setRedirect('path.admin_overview_filter', array(
-      'keys' => trim($form_state->getValue('filter')),
+    $form_state->setRedirect('path.admin_overview_filter', array(), array(
+      'query' => array('search' => trim($form_state->getValue('filter'))),
     ));
   }