diff --git a/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
index 99abde3..7962e82 100644
--- a/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
@@ -500,7 +500,6 @@ abstract class FieldPluginBase extends Handler {
           ':input[name="options[custom_label]"]' => array('checked' => TRUE),
         ),
       ),
-
       '#weight' => -102,
     );
     $form['element_label_colon'] = array(
diff --git a/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php b/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
index c1991f0..0d7b486 100644
--- a/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
@@ -953,9 +953,20 @@ abstract class FilterPluginBase extends Handler {
       // are displayed.
       $without_children = TRUE;
       foreach (element_children($row['value']) as $children) {
-        if (isset($row['value'][$children]['#dependency']['edit-options-operator'])) {
-          $row['value'][$children]['#dependency']["edit-options-group-info-group-items-$item_id-operator"] = $row['value'][$children]['#dependency']['edit-options-operator'];
-          unset($row['value'][$children]['#dependency']['edit-options-operator']);
+        $has_state = FALSE;
+        $states = array();
+        foreach ($row['value'][$children]['#states']['visible'] as $state) {
+          if (isset($state[':input[name="options[operator]"]'])) {
+            $has_state = TRUE;
+            $states[] = $state[':input[name="options[operator]"]']['value'];
+          }
+        }
+        if ($has_state) {
+          foreach ($states as $state) {
+            $row['value'][$children]['#states']['visible'][] = array(
+              ':input[name="options[group_info][group_items][' . $item_id . '][operator]"]' => array('value' => $state),
+            );
+          }
           $row['value'][$children]['#title'] = '';
 
           if (!empty($this->options['group_info']['group_items'][$item_id]['value'][$children])) {