diff --git a/core/modules/views/config/schema/views.filter.schema.yml b/core/modules/views/config/schema/views.filter.schema.yml
index 97ec8a5..3a97c25 100644
--- a/core/modules/views/config/schema/views.filter.schema.yml
+++ b/core/modules/views/config/schema/views.filter.schema.yml
@@ -34,6 +34,10 @@ views.filter.combine:
 views.filter_value.date:
   type: views.filter_value.numeric
   label: 'Date'
+  mapping:
+    type:
+      type: string
+      label: 'Type'
 
 views.filter_value.groupby_numeric:
   type: views.filter_value.numeric
@@ -114,12 +118,12 @@ views.filter.standard:
   type: views_filter
   label: 'Standard'
 
-views.filter.group_items.*:
-  type: views_filter_group_items
+views.filter.group_item.*:
+  type: views_filter_group_item
   label: 'Default'
 
-views.filter.group_items.numeric:
-  type: views_filter_group_items
+views.filter.group_item.numeric:
+  type: views_filter_group_item
   label: 'Group items'
   mapping:
     value:
diff --git a/core/modules/views/src/Plugin/views/filter/Date.php b/core/modules/views/src/Plugin/views/filter/Date.php
index 7e5417f..6e7f1f2 100644
--- a/core/modules/views/src/Plugin/views/filter/Date.php
+++ b/core/modules/views/src/Plugin/views/filter/Date.php
@@ -42,6 +42,13 @@ protected function valueForm(&$form, FormStateInterface $form_state) {
         '#default_value' => !empty($this->value['type']) ? $this->value['type'] : 'date',
       );
     }
+    else {
+      // Ensure there is something in the 'type'.
+      $form['value']['type'] = array(
+        '#type' => 'value',
+        '#value' => NULL
+      );
+    }
     parent::valueForm($form, $form_state);
   }
 
diff --git a/core/modules/views_ui/src/Tests/PreviewTest.php b/core/modules/views_ui/src/Tests/PreviewTest.php
index 191e4b4..22ca5b2 100644
--- a/core/modules/views_ui/src/Tests/PreviewTest.php
+++ b/core/modules/views_ui/src/Tests/PreviewTest.php
@@ -40,7 +40,7 @@ protected function testPreviewContextual() {
     $this->drupalPostForm(NULL, $edit = array('view_args' => '100'), t('Update preview'));
 
     // Test that area text and exposed filters are present and rendered.
-    $this->assertFieldByName('id', NULL, 'ID exposed filter field found.');
+    $this->assertFieldByName('id[value]', NULL, 'ID exposed filter field found.');
     $this->assertText('Test header text', 'Rendered header text found');
     $this->assertText('Test footer text', 'Rendered footer text found.');
     $this->assertText('Test empty text', 'Rendered empty text found.');
@@ -71,7 +71,7 @@ function testPreviewUI() {
     $this->assertEqual(count($elements), 0);
 
     // Test that area text and exposed filters are present and rendered.
-    $this->assertFieldByName('id', NULL, 'ID exposed filter field found.');
+    $this->assertFieldByName('id[value]', NULL, 'ID exposed filter field found.');
     $this->assertText('Test header text', 'Rendered header text found');
     $this->assertText('Test footer text', 'Rendered footer text found.');
     $this->assertText('Test empty text', 'Rendered empty text found.');