diff -u b/broken_link.install b/broken_link.install
--- b/broken_link.install
+++ b/broken_link.install
@@ -8,7 +8,7 @@
  */
 function broken_link_update_8100() {
 
-  $storage_definition = BaseFieldDefinition::create('list_string')
+  $storage_definition = BaseFieldDefinition::create('string')
     ->setLabel(t('Request parameters'))
     ->setDescription(t('Request query string.'))
     ->setCardinality(FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED)
@@ -34,7 +34,7 @@
   \Drupal::entityDefinitionUpdateManager()
     ->installFieldStorageDefinition('updated', 'broken_link', 'broken_link', $storage_definition);
 
-  $storage_definition = BaseFieldDefinition::create('list_string')
+  $storage_definition = BaseFieldDefinition::create('string')
     ->setLabel(t('Referers'))
     ->setCardinality(FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED)
     ->setConstraints([
diff -u b/config/install/views.view.broken_link.yml b/config/install/views.view.broken_link.yml
--- b/config/install/views.view.broken_link.yml
+++ b/config/install/views.view.broken_link.yml
@@ -1,15 +1,13 @@
 langcode: en
 status: true
 dependencies:
-  config:
-    - system.menu.admin
   module:
     - broken_link
     - options
     - system
     - user
 _core:
-  default_config_hash: khJUIDOaj8vYry1AGw_pKjCkfa5RzKL4xF04cYCmaaU
+  default_config_hash: w-Hd5DhgBXVQgiqlnybYd_xwQVHFhnzSEUXn-1qB4rc
 id: broken_link
 label: 'Broken Links'
 module: views
@@ -646,6 +644,46 @@
             default_group_multiple: {  }
             group_items: {  }
           plugin_id: string
+        referers:
+          id: referers
+          table: broken_link__referers
+          field: referers
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: referers_op
+            label: Referers
+            description: ''
+            use_operator: false
+            operator: referers_op
+            identifier: referers
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          entity_type: broken_link
+          entity_field: referers
+          plugin_id: string
       sorts:
         hits:
           id: hits
diff -u b/src/Form/BrokenLinkDeleteMultipleForm.php b/src/Form/BrokenLinkDeleteMultipleForm.php
--- b/src/Form/BrokenLinkDeleteMultipleForm.php
+++ b/src/Form/BrokenLinkDeleteMultipleForm.php
@@ -77,7 +77,7 @@
    * {@inheritdoc}
    */
   public function getCancelUrl() {
-    return new Url('system.admin_content');
+    return new Url('entity.broken_link.collection');
   }
 
   /**
only in patch2:
unchanged:
--- a/broken_link.routing.yml
+++ b/broken_link.routing.yml
@@ -8,6 +8,16 @@ entity.broken_link.collection:
   options:
     _admin_route: TRUE
 
+entity.broken_link.multiple_delete_confirm:
+  path: '/admin/config/broken_link/confirm/delete'
+  defaults:
+    _form: '\Drupal\broken_link\Form\BrokenLinkDeleteMultipleForm'
+    _title: 'Broken link list'
+  requirements:
+    _permission: 'manage broken link list'
+  options:
+    _admin_route: TRUE
+
 entity.broken_link_redirect.collection:
   path: '/admin/config/broken_link_redirect'
   defaults:
@@ -16,4 +26,4 @@ entity.broken_link_redirect.collection:
   requirements:
     _permission: 'manage broken link redirect'
   options:
-    _admin_route: TRUE
\ No newline at end of file
+    _admin_route: TRUE
only in patch2:
unchanged:
--- a/src/BrokenLinkViewsData.php
+++ b/src/BrokenLinkViewsData.php
@@ -23,7 +23,13 @@ class BrokenLinkViewsData extends EntityViewsData {
 
     $data['broken_link']['table']['group'] = t('Broken links');
 
+    // Specify field real column name for additional entity fields.
+    $data['broken_link__referers']['referers']['filter']['real field'] = 'referers_value';
+    $data['broken_link__query_string']['query_string']['filter']['real field'] = 'query_string_value';
+    $data['broken_link__referers']['referers']['sort']['real field'] = 'referers_value';
+    $data['broken_link__query_string']['query_string']['sort']['real field'] = 'query_string_value';
+
     return $data;
   }
 
-}
\ No newline at end of file
+}
only in patch2:
unchanged:
--- a/src/Entity/BrokenLink.php
+++ b/src/Entity/BrokenLink.php
@@ -58,21 +58,21 @@ class BrokenLink extends ContentEntityBase implements ContentEntityInterface {
 
     $fields['link'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Link'))
-      ->setSettings(array(
+      ->setSettings([
         'default_value' => '',
         'max_length' => 2000,
-      ))
+      ])
       ->setDescription(t('Broken link.'));
 
     $fields['hits'] = BaseFieldDefinition::create('integer')
       ->setLabel(t('Hits'))
       ->setDescription(t('Number of times broken link is been hit.'))
-      ->setSettings(array(
+      ->setSettings([
         'default_value' => 1,
-      ))
+      ])
       ->setSetting('unsigned', TRUE);
 
-    $fields['query_string'] = BaseFieldDefinition::create('list_string')
+    $fields['query_string'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Request parameters'))
       ->setDescription(t('Request query string.'))
       ->setCardinality(FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED)
@@ -89,7 +89,7 @@ class BrokenLink extends ContentEntityBase implements ContentEntityInterface {
       ->setLabel(t('Last access time'))
       ->setDescription(t('Last time this entity was updated.'));
 
-    $fields['referers'] = BaseFieldDefinition::create('list_string')
+    $fields['referers'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Referers'))
       ->setCardinality(FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED)
       ->setConstraints([