diff --git handlers/views_handler_filter.inc handlers/views_handler_filter.inc
index 13298df..85ee56d 100644
--- handlers/views_handler_filter.inc
+++ handlers/views_handler_filter.inc
@@ -93,7 +93,7 @@ class views_handler_filter extends views_handler {
    * Determine if a filter can be exposed into a group.
    */
   function can_expose_groups() {
-    return (bool)count($this->operator_options());
+    return (bool) count($this->operator_options());
   }
 
   /**
@@ -115,7 +115,7 @@ class views_handler_filter extends views_handler {
     $form['op_val_end'] = array('#value' => '</div>');
     if ($this->can_expose()) {
       $this->show_expose_form($form, $form_state);
-      if ($this->options['exposed']  && $this->can_expose_groups()) {
+      if ($this->options['exposed'] && $this->can_expose_groups()) {
         $this->show_build_group_form($form, $form_state);
       }
     }
@@ -191,8 +191,7 @@ class views_handler_filter extends views_handler {
   function operator_submit($form, &$form_state) { }
 
   /**
-   * Build a form containing a group of operator | values to apply as a
-   * single filter.
+   * Build a form containing a group of filters to apply as a single filter.
    */
   function group_form(&$form, &$form_state) {
     if (!empty($this->options['group_info']['optional'])) {
@@ -221,10 +220,10 @@ class views_handler_filter extends views_handler {
    */
   function group_submit(&$form, &$form_state) {
     if (!empty($form_state['values']['options']['group_info']['group_items'])) {
-      foreach ($form_state['values']['options']['group_info']['group_items'] as $x => $item) {
-        // Empty would filter out "0" which might be used.
-        if (trim($item['title']) == '' || !empty($item['removed'])) {
-          unset($form_state['values']['options']['group_info']['group_items'][$x]);
+      foreach ($form_state['values']['options']['group_info']['group_items'] as $item_id => $item) {
+        // Allow "0" as a possible title.
+        if (trim($item['title']) === '') {
+          unset($form_state['values']['options']['group_info']['group_items'][$item_id]);
         }
       }
     }
@@ -246,14 +245,14 @@ class views_handler_filter extends views_handler {
       return;
     }
 
-    $form['op_val_start']['#value'] = '<div class = "group-populated">' . $form['op_val_start']['#value'];
+    $form['op_val_start']['#value'] = '<div class="group-populated">' . $form['op_val_start']['#value'];
     $form['op_val_end']['#value'] .= '</div>';
-    $form['expose']['#prefix'] .= '<div class = "group-populated">';
+    $form['expose']['#prefix'] = '<div class="group-populated">' . $form['expose']['#prefix'];
     $form['expose']['#suffix'] .= '</div>';
     $form['expose']['use_operator']['#default_value'] = TRUE;
 
     $form['build_group'] = array(
-      '#prefix' => '<div class = "views-expose-options clear-block">',
+      '#prefix' => '<div class="views-expose-options clear-block">',
       '#suffix' => '</div>',
     );
     $this->build_group_form($form, $form_state);
@@ -468,7 +467,12 @@ class views_handler_filter extends views_handler {
       return;
     }
 
-    $identifier = !empty($this->options['group_info']['identifier'])?$this->options['group_info']['identifier']:'group_' . $this->options['expose']['identifier'];
+    if (!empty($this->options['group_info']['identifier'])) {
+      $identifier = $this->options['group_info']['identifier'];
+    }
+    else {
+      $identifier = 'group_' . $this->options['expose']['identifier'];
+    }
     $form['group_info']['identifier'] = array(
       '#type' => 'textfield',
       '#default_value' => $identifier,
@@ -476,7 +480,7 @@ class views_handler_filter extends views_handler {
       '#size' => 40,
       '#description' => t('This will appear in the URL after the ? to identify this filter. Cannot be blank.'),
     );
-    $label = !empty($this->options['group_info']['label'])?$this->options['group_info']['label']:$this->options['expose']['label'];
+    $label = !empty($this->options['group_info']['label']) ? $this->options['group_info']['label'] : $this->options['expose']['label'];
     $form['group_info']['label'] = array(
       '#type' => 'textfield',
       '#default_value' => $this->options['group_info']['label'],
@@ -510,48 +514,49 @@ class views_handler_filter extends views_handler {
     $any_label = variable_get('views_exposed_filter_any_label', 'old_any') == 'old_any' ? '<Any>' : t('- Any -');
     $groups = array('All' => $any_label);
 
-    foreach ($this->options['group_info']['group_items'] as $x => $item) {
-      if (!empty($form_state['values']['options']['group_info']['group_items'][$x]['removed'])) {
+    foreach ($this->options['group_info']['group_items'] as $item_id => $item) {
+      if (!empty($form_state['values']['options']['group_info']['group_items'][$item_id]['removed'])) {
         continue;
       }
       $row = array();
-      $groups[$x] = '';
+      $groups[$item_id] = '';
       $this->operator_form($row, $form_state);
       $row['operator']['#type'] = 'select';
       $row['operator']['#title'] = '';
       $this->value_form($row, $form_state);
       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-$x-operator"] = $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']);
           $row['value'][$children]['#title'] = '';
-          $row['value'][$children]['#default_value'] = $this->options['group_info']['group_items'][$x]['value'][$children];
+          $row['value'][$children]['#default_value'] = $this->options['group_info']['group_items'][$item_id]['value'][$children];
         }
       }
-      $row['operator']['#default_value'] = $this->options['group_info']['group_items'][$x]['operator'];
+      $row['operator']['#default_value'] = $this->options['group_info']['group_items'][$item_id]['operator'];
 
-      $form['group_info']['group_items'][$x] = array(
+      $form['group_info']['group_items'][$item_id] = array(
         'title' => array(
           '#type' => 'textfield',
           '#size' => 20,
-          '#default_value' => $this->options['group_info']['group_items'][$x]['title']
+          '#default_value' => $this->options['group_info']['group_items'][$item_id]['title'],
         ),
         'operator' => $row['operator'],
         'value' => $row['value'],
         'removed' => array(
           '#type' => 'checkbox',
-          '#id' => 'views-removed-' . $x,
+          '#id' => 'views-removed-' . $item_id,
           '#attributes' => array('class' => 'views-remove-checkbox'),
           '#default_value' => 0,
         ),
         'weight' => array(
           '#type' => 'weight',
           '#delta' => 10,
-          '#default_value' => $this->options['group_info']['group_items'][$x]['weight'],
+          '#default_value' => $this->options['group_info']['group_items'][$item_id]['weight'],
           '#attributes' => array('class' => 'weight'),
         ),
       );
     }
+
     $form['group_info']['default_group'] = array(
       '#type' => 'radios',
       '#options' => $groups,
@@ -565,6 +570,7 @@ class views_handler_filter extends views_handler {
       '#submit' => array('views_ui_config_item_form_add_group'),
     );
     $form['group_info']['#theme'] = 'views_ui_build_group_table';
+
     $js = array();
     $js['tableDrag']['views-filter-groups']['weight'][0] = array(
       'target' => 'weight',
@@ -788,7 +794,7 @@ class views_handler_filter extends views_handler {
       );
       $form['build_group_button']['markup'] = array(
         '#prefix' => '<div class="description">',
-        '#value' => t('This item is currently using a single filter. If you <strong>build a group</strong>, users will see a list of items that represents a pair of operator value.'),
+        '#value' => t('This item is currently using a single filter. If you <strong>build a group</strong>, users will see a list of items that represents a pair of operator values.'),
         '#suffix' => '</div>',
       );
     }
@@ -800,7 +806,7 @@ class views_handler_filter extends views_handler {
       );
       $form['build_group_button']['markup'] = array(
         '#prefix' => '<div class="description">',
-        '#value' => t('This item is currently using a group. If you choose <strong>use single filter</strong> it, users will see the usual exposed filter.'),
+        '#value' => t('This item is currently using a group. If you choose <strong>use single filter</strong>, users will see the usual exposed filter.'),
         '#suffix' => '</div>',
       );
     }