diff -u b/src/DiffLayoutBase.php b/src/DiffLayoutBase.php
--- b/src/DiffLayoutBase.php
+++ b/src/DiffLayoutBase.php
@@ -247,7 +247,6 @@
     ];
 
     $filter = $options[$active_filter];
-    $options[$active_filter] = [];
     array_unshift($options, $filter);
 
     $build['options'] = [
diff -u b/src/Form/FieldsSettingsForm.php b/src/Form/FieldsSettingsForm.php
--- b/src/Form/FieldsSettingsForm.php
+++ b/src/Form/FieldsSettingsForm.php
@@ -12,6 +12,7 @@
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Component\Plugin\PluginManagerInterface;
+use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Form\FormState;
 
 /**
@@ -255,12 +256,13 @@
     // We are currently editing this field's plugin settings. Display the
     // settings form and submit buttons.
     if ($form_state->get('plugin_settings_edit') == $field_key) {
+      $pluginTypeName = new FormattableMarkup('<span class="plugin-name">@plugin</span>', ['@plugin' => $plugin_options[$display_options['type']]]);
       $field_row['plugin']['settings_edit_form'] = [
         '#type' => 'container',
         '#attributes' => ['class' => ['field-plugin-settings-edit-form']],
         '#parents' => ['fields', $field_key, 'settings_edit_form'],
         'label' => [
-          '#markup' => $this->t('Plugin settings: @plugin', ['@plugin' => ' <span class="plugin-name">' . $plugin_options[$display_options['type']] . '</span>']),
+          '#markup' => $this->t('Plugin settings: @plugin', ['@plugin' => $pluginTypeName]),
         ],
         'settings' => $plugin->buildConfigurationForm([], $form_state),
         'actions' => [
only in patch2:
unchanged:
--- a/src/Plugin/diff/Layout/VisualInlineDiffLayout.php
+++ b/src/Plugin/diff/Layout/VisualInlineDiffLayout.php
@@ -14,7 +14,6 @@ use Drupal\diff\DiffEntityComparison;
 use Drupal\diff\DiffEntityParser;
 use Drupal\diff\DiffLayoutBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use HtmlDiffAdvancedInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
@@ -91,7 +90,7 @@ class VisualInlineDiffLayout extends DiffLayoutBase {
    * @param \Drupal\Core\Entity\EntityDisplayRepositoryInterface $entity_display_repository
    *   The entity display repository.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config, EntityTypeManagerInterface $entity_type_manager, DiffEntityParser $entity_parser, DateFormatter $date, RendererInterface $renderer, DiffEntityComparison $entity_comparison, HtmlDiffAdvancedInterface $html_diff, RequestStack $request_stack, EntityDisplayRepositoryInterface $entity_display_repository) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config, EntityTypeManagerInterface $entity_type_manager, DiffEntityParser $entity_parser, DateFormatter $date, RendererInterface $renderer, DiffEntityComparison $entity_comparison, \HtmlDiffAdvancedInterface $html_diff, RequestStack $request_stack, EntityDisplayRepositoryInterface $entity_display_repository) {
     parent::__construct($configuration, $plugin_id, $plugin_definition, $config, $entity_type_manager, $entity_parser, $date);
     $this->renderer = $renderer;
     $this->entityComparison = $entity_comparison;