diff --git a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
index 292a2e3..412f572 100644
--- a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
+++ b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
@@ -504,7 +504,7 @@ public static function getSelected(FormStateInterface $form_state, $parents, $de
     // by adding each required part of the form to the #limit_validation_errors
     // property individually as the form is being built, but this is difficult to
     // do for a highly dynamic and extensible form. This method is much simpler.
-    $user_input = &$form_state->getUserInput();
+    $user_input = $form_state->isRebuilding() ? $form_state->getUserInput() : [];
     if (!empty($user_input)) {
       $key_exists = NULL;
       $submitted = NestedArray::getValue($user_input, $parents, $key_exists);
diff --git a/core/modules/views_ui/admin.inc b/core/modules/views_ui/admin.inc
index 80ade9b..30cc9c0 100644
--- a/core/modules/views_ui/admin.inc
+++ b/core/modules/views_ui/admin.inc
@@ -54,7 +54,7 @@ function views_ui_add_ajax_trigger(&$wrapping_element, $trigger_key, $refresh_pa
 
   // Specify the #ajax URL in order to retain form caching.
   // @todo Remove this in https://www.drupal.org/node/2500523.
-  $triggering_element['#ajax']['url'] = Url::fromRoute('system.ajax');
+  //$triggering_element['#ajax']['url'] = Url::fromRoute('system.ajax');
 
   // We do not use \Drupal\Component\Utility\Html::getUniqueId() to get an ID
   // for the AJAX wrapper, because it remembers IDs across AJAX requests (and
@@ -119,7 +119,7 @@ function views_ui_add_ajax_trigger(&$wrapping_element, $trigger_key, $refresh_pa
     'refresh_parents' => $refresh_parents,
     // Keep track of duplicate wrappers so we don't add the same wrapper to the
     // page more than once.
-    'duplicate_wrapper' => !empty($seen_ids[$triggering_element['#ajax']['wrapper']]),
+    //'duplicate_wrapper' => !empty($seen_ids[$triggering_element['#ajax']['wrapper']]),
   );
   $seen_ids[$triggering_element['#ajax']['wrapper']] = TRUE;
   $triggering_element['#views_ui_ajax_data'] = $ajax_data;