diff --git a/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php b/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php
index d41e893..74d5530 100644
--- a/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php
+++ b/core/modules/taxonomy/src/Plugin/views/argument/IndexTidDepth.php
@@ -72,21 +72,14 @@ public function query($group_by = FALSE) {
     $this->ensureMyTable();
 
     if (!empty($this->options['break_phrase'])) {
-      $tids = new \stdClass();
-      $tids->value = $this->argument;
-      $tids = $this->breakPhrase($this->argument, $tids);
-      if ($tids->value == array(-1)) {
+      list($value, $operator) = static::breakString($this->argument);
+      if ($value === array(-1)) {
         return FALSE;
       }
 
-      if (count($tids->value) > 1) {
-        $operator = 'IN';
-      }
-      else {
-        $operator = '=';
-      }
+      $operator = (count($value) > 1) ? 'IN' : '=';
 
-      $tids = $tids->value;
+      $tids = $value;
     }
     else {
       $operator = "=";
diff --git a/core/modules/views/src/Plugin/views/HandlerBase.php b/core/modules/views/src/Plugin/views/HandlerBase.php
index cbff847..0822667 100644
--- a/core/modules/views/src/Plugin/views/HandlerBase.php
+++ b/core/modules/views/src/Plugin/views/HandlerBase.php
@@ -783,7 +783,7 @@ public function getEntityType() {
   }
 
   /**
-   * Breaks x,y,z and x+y+z into an array. Numeric only.
+   * Explodes x,y,z and x+y+z to be used as views filter argument.
    *
    * @param string $str
    *   The string to parse.
@@ -792,7 +792,9 @@ public function getEntityType() {
    *   be created.
    *
    * @return \Drupal\views\Plugin\views\HandlerBase|stdClass $handler
-   *   The new handler object.
+   * @return array $return
+   *   An array containing the exploded values as array and "and" or "or" as
+   *   operator.
    */
   public static function breakPhrase($str, &$handler = NULL) {
     if (!$handler) {
@@ -841,59 +843,42 @@ public static function breakPhrase($str, &$handler = NULL) {
    * Breaks x,y,z and x+y+z into an array. Works for strings.
    *
    * @param string $str
-   *   The string to parse.
+   *   The string to split.
    * @param \Drupal\views\Plugin\views\HandlerBase|null $handler
    *   The object to use as a base. If not specified one will
    *   be created.
    *
    * @return \Drupal\views\Plugin\views\HandlerBase|stdClass $handler
-   *   The new handler object.
+   * @param bool $force_int
+   *   Enforce a numeric check.
    */
-  public static function breakPhraseString($str, &$handler = NULL) {
-    if (!$handler) {
-      $handler = new \stdClass();
-    }
-
-    // Set up defaults:
-    if (!isset($handler->value)) {
-      $handler->value = array();
-    }
-
-    if (!isset($handler->operator)) {
-      $handler->operator = 'or';
-    }
-
-    if ($str == '') {
-      return $handler;
-    }
+  public static function breakString($str, $force_int = FALSE) {
+    $operator = NULL;
+    $value = NULL;
 
-    // Determine if the string has 'or' operators (plus signs) or 'and' operators
-    // (commas) and split the string accordingly. If we have an 'and' operator,
-    // spaces are treated as part of the word being split, but otherwise they are
-    // treated the same as a plus sign.
-    $or_wildcard = '[^\s+,]';
-    $and_wildcard = '[^+,]';
-    if (preg_match("/^({$or_wildcard}+[+ ])+{$or_wildcard}+$/", $str)) {
-      $handler->operator = 'or';
-      $handler->value = preg_split('/[+ ]/', $str);
+    // Determine if the string has 'or' operators (plus signs) or 'and'
+    // operators (commas) and split the string accordingly.
+    if (preg_match('/^([\w0-9]+[+ ]+)+[\w0-9]+$/', $str)) {
+      // The '+' character in a query string may be parsed as ' '.
+      $operator = 'or';
+      $value = preg_split('/[+ ]/', $str);
     }
-    elseif (preg_match("/^({$and_wildcard}+,)*{$and_wildcard}+$/", $str)) {
-      $handler->operator = 'and';
-      $handler->value = explode(',', $str);
+    elseif (preg_match('/^([\w0-9]+[,]+)*[\w0-9]+$/', $str)) {
+      $operator = 'and';
+      $value = explode(',', $str);
     }
 
-    // Keep an 'error' value if invalid strings were given.
-    if (!empty($str) && (empty($handler->value) || !is_array($handler->value))) {
-      $handler->value = array(-1);
-      return $handler;
+    // Filter any empty matches (Like from '++' in a string) and reset the array
+    // keys.
+    if (isset($value)) {
+      $value = array_values(array_filter($value));
     }
 
-    // Doubly ensure that all values are strings only.
-    foreach ($handler->value as $id => $value) {
-      $handler->value[$id] = (string) $value;
+    if ($force_int) {
+      $value = array_map('intval', $value);
     }
 
-    return $handler;
+    return array($value, $operator);
   }
 
   /**
@@ -977,5 +962,4 @@ public function submitTemporaryForm($form, &$form_state) {
     // Write to cache
     $form_state['view']->cacheSet();
   }
-
 }
diff --git a/core/modules/views/src/Plugin/views/argument/ManyToOne.php b/core/modules/views/src/Plugin/views/argument/ManyToOne.php
index 3180862..668c289 100644
--- a/core/modules/views/src/Plugin/views/argument/ManyToOne.php
+++ b/core/modules/views/src/Plugin/views/argument/ManyToOne.php
@@ -119,12 +119,11 @@ public function query($group_by = FALSE) {
     }
 
     if (!empty($this->options['break_phrase'])) {
-      if (!empty($this->definition['numeric'])) {
-        $this->breakPhrase($this->argument, $this);
-      }
-      else {
-        $this->breakPhraseString($this->argument, $this);
-      }
+      $force_int = !empty($this->definition['numeric']);
+
+      list($value, $operator) = static::breakString($this->argument, $force_int);
+      $this->value = array($value);
+      $this->operator = $operator;
     }
     else {
       $this->value = array($this->argument);
@@ -140,7 +139,10 @@ function title() {
     }
 
     if (!empty($this->options['break_phrase'])) {
-      $this->breakPhrase($this->argument, $this);
+      $force_int = !empty($this->definition['numeric']);
+      list($value, $operator) = static::breakString($this->argument, $force_int);
+      $this->value = array($value);
+      $this->operator = $operator;
     }
     else {
       $this->value = array($this->argument);
diff --git a/core/modules/views/src/Plugin/views/argument/Numeric.php b/core/modules/views/src/Plugin/views/argument/Numeric.php
index 565b285..72b697e 100644
--- a/core/modules/views/src/Plugin/views/argument/Numeric.php
+++ b/core/modules/views/src/Plugin/views/argument/Numeric.php
@@ -65,7 +65,9 @@ function title() {
     }
 
     if (!empty($this->options['break_phrase'])) {
-      $this->breakPhrase($this->argument, $this);
+      list($value, $operator) = static::breakString($this->argument, TRUE);
+      $this->value = array($value);
+      $this->operator = $operator;
     }
     else {
       $this->value = array($this->argument);
@@ -96,7 +98,9 @@ public function query($group_by = FALSE) {
     $this->ensureMyTable();
 
     if (!empty($this->options['break_phrase'])) {
-      $this->breakPhrase($this->argument, $this);
+      list($value, $operator) = static::breakString($this->argument, TRUE);
+      $this->value = array($value);
+      $this->operator = $operator;
     }
     else {
       $this->value = array($this->argument);
diff --git a/core/modules/views/src/Plugin/views/argument/String.php b/core/modules/views/src/Plugin/views/argument/String.php
index b606de7..3614585 100644
--- a/core/modules/views/src/Plugin/views/argument/String.php
+++ b/core/modules/views/src/Plugin/views/argument/String.php
@@ -188,7 +188,9 @@ public function query($group_by = FALSE) {
     }
 
     if (!empty($this->options['break_phrase'])) {
-      $this->breakPhraseString($argument, $this);
+      list($value, $operator) = static::breakString($this->argument);
+      $this->value = array($value);
+      $this->operator = $operator;
     }
     else {
       $this->value = array($argument);
@@ -262,7 +264,9 @@ function title() {
     }
 
     if (!empty($this->options['break_phrase'])) {
-      $this->breakPhraseString($this->argument, $this);
+      list($value, $operator) = static::breakString($this->argument);
+      $this->value = array($value);
+      $this->operator = $operator;
     }
     else {
       $this->value = array($this->argument);
diff --git a/core/modules/views/src/Tests/Handler/HandlerTest.php b/core/modules/views/src/Tests/Handler/HandlerTest.php
index 14a5286..212022d 100644
--- a/core/modules/views/src/Tests/Handler/HandlerTest.php
+++ b/core/modules/views/src/Tests/Handler/HandlerTest.php
@@ -91,60 +91,54 @@ function testFilterInOperatorUi() {
   }
 
   /**
-   * Tests the breakPhraseString() method.
+   * Tests Drupal\views\Plugin\views\HandlerBase::breakString() function.
    */
-  function testBreakPhraseString() {
-    $empty_stdclass = new \stdClass();
-    $empty_stdclass->operator = 'or';
-    $empty_stdclass->value = array();
-
-    // check defaults
-    $null = NULL;
-    $this->assertEqual($empty_stdclass, HandlerBase::breakPhraseString('', $null));
-
+  function testBreakString() {
+    // Check defaults.
+    $this->assertEqual(array(NULL, NULL), HandlerBase::breakString(''));
     $item = array(
       'table' => 'node',
       'field' => 'title',
     );
     $handler = $this->container->get('plugin.manager.views.argument')->getHandler($item);
-    $this->assertEqual($handler, HandlerBase::breakPhraseString('', $handler), 'The breakPhraseString() method works correctly.');
+    $this->assertEqual($handler, HandlerBase::breakString('', $handler), 'The breakString() method works correctly.');
 
     // test ors
-    $handler = HandlerBase::breakPhraseString('word1 word2+word');
+    $handler = HandlerBase::breakString('word1 word2+word');
     $this->assertEqualValue(array('word1', 'word2', 'word'), $handler);
     $this->assertEqual('or', $handler->operator);
-    $handler = HandlerBase::breakPhraseString('word1+word2+word');
+    $handler = HandlerBase::breakString('word1+word2+word');
     $this->assertEqualValue(array('word1', 'word2', 'word'), $handler);
     $this->assertEqual('or', $handler->operator);
-    $handler = HandlerBase::breakPhraseString('word1 word2 word');
+    $handler = HandlerBase::breakString('word1 word2 word');
     $this->assertEqualValue(array('word1', 'word2', 'word'), $handler);
     $this->assertEqual('or', $handler->operator);
-    $handler = HandlerBase::breakPhraseString('word-1+word-2+word');
+    $handler = HandlerBase::breakString('word-1+word-2+word');
     $this->assertEqualValue(array('word-1', 'word-2', 'word'), $handler);
     $this->assertEqual('or', $handler->operator);
-    $handler = HandlerBase::breakPhraseString('wõrd1+wõrd2+wõrd');
+    $handler = HandlerBase::breakString('wõrd1+wõrd2+wõrd');
     $this->assertEqualValue(array('wõrd1', 'wõrd2', 'wõrd'), $handler);
     $this->assertEqual('or', $handler->operator);
 
     // test ands.
-    $handler = HandlerBase::breakPhraseString('word1,word2,word');
+    $handler = HandlerBase::breakString('word1,word2,word');
     $this->assertEqualValue(array('word1', 'word2', 'word'), $handler);
     $this->assertEqual('and', $handler->operator);
-    $handler = HandlerBase::breakPhraseString('word1 word2,word');
+    $handler = HandlerBase::breakString('word1 word2,word');
     $this->assertEqualValue(array('word1 word2', 'word'), $handler);
     $this->assertEqual('and', $handler->operator);
-    $handler = HandlerBase::breakPhraseString('word1,word2 word');
+    $handler = HandlerBase::breakString('word1,word2 word');
     $this->assertEqualValue(array('word1', 'word2 word'), $handler);
     $this->assertEqual('and', $handler->operator);
-    $handler = HandlerBase::breakPhraseString('word-1,word-2,word');
+    $handler = HandlerBase::breakString('word-1,word-2,word');
     $this->assertEqualValue(array('word-1', 'word-2', 'word'), $handler);
     $this->assertEqual('and', $handler->operator);
-    $handler = HandlerBase::breakPhraseString('wõrd1,wõrd2,wõrd');
+    $handler = HandlerBase::breakString('wõrd1,wõrd2,wõrd');
     $this->assertEqualValue(array('wõrd1', 'wõrd2', 'wõrd'), $handler);
     $this->assertEqual('and', $handler->operator);
 
     // test a single word
-    $handler = HandlerBase::breakPhraseString('word');
+    $handler = HandlerBase::breakString('word');
     $this->assertEqualValue(array('word'), $handler);
     $this->assertEqual('and', $handler->operator);
   }
@@ -157,10 +151,8 @@ function testBreakPhrase() {
     $empty_stdclass->operator = 'or';
     $empty_stdclass->value = array();
 
-    $null = NULL;
-    // check defaults
-    $this->assertEqual($empty_stdclass, HandlerBase::breakPhrase('', $null));
-
+    // Generate three random numbers and one string which can be used below.
+    $s1 = $this->randomName();
     $item = array(
       'table' => 'node',
       'field' => 'title',
@@ -172,21 +164,50 @@ function testBreakPhrase() {
     $n1 = rand(0, 100);
     $n2 = rand(0, 100);
     $n3 = rand(0, 100);
-    // test ors
-    $this->assertEqualValue(array($n1, $n2, $n3), HandlerBase::breakPhrase("$n1 $n2+$n3", $handler));
-    $this->assertEqual('or', $handler->operator);
-    $this->assertEqualValue(array($n1, $n2, $n3), HandlerBase::breakPhrase("$n1+$n2+$n3", $handler));
-    $this->assertEqual('or', $handler->operator);
-    $this->assertEqualValue(array($n1, $n2, $n3), HandlerBase::breakPhrase("$n1 $n2 $n3", $handler));
-    $this->assertEqual('or', $handler->operator);
-    $this->assertEqualValue(array($n1, $n2, $n3), HandlerBase::breakPhrase("$n1 $n2++$n3", $handler));
-    $this->assertEqual('or', $handler->operator);
 
-    // test ands.
-    $this->assertEqualValue(array($n1, $n2, $n3), HandlerBase::breakPhrase("$n1,$n2,$n3", $handler));
-    $this->assertEqual('and', $handler->operator);
-    $this->assertEqualValue(array($n1, $n2, $n3), HandlerBase::breakPhrase("$n1,,$n2,$n3", $handler));
-    $this->assertEqual('and', $handler->operator);
+    // Test "or"s.
+    list($value, $operator) = HandlerBase::breakString("$s1 $n2+$n3");
+    $this->assertEqual(array($s1, $n2, $n3), $value);
+    $this->assertEqual('or', $operator);
+
+    list($value, $operator) = HandlerBase::breakString("$s1+$n2+$n3");
+    $this->assertEqual(array($s1, $n2, $n3), $value);
+    $this->assertEqual('or', $operator);
+
+    list($value, $operator) = HandlerBase::breakString("$s1 $n2 $n3");
+    $this->assertEqual(array($s1, $n2, $n3), $value);
+    $this->assertEqual('or', $operator);
+
+    list($value, $operator) = HandlerBase::breakString("$s1 $n2++$n3");
+    $this->assertEqual(array($s1, $n2, $n3), $value);
+    $this->assertEqual('or', $operator);
+
+    // Test "and"s.
+    list($value, $operator) = HandlerBase::breakString("$s1,$n2,$n3");
+    $this->assertEqual(array($s1, $n2, $n3), $value);
+    $this->assertEqual('and', $operator);
+
+    list($value, $operator) = HandlerBase::breakString("$s1,,$n2,$n3");
+    $this->assertEqual(array($s1, $n2, $n3), $value);
+    $this->assertEqual('and', $operator);
+
+    // Enforce int values.
+    list($value, $operator) = HandlerBase::breakString("$n1,$n2,$n3", TRUE);
+    $this->assertEqual(array($n1, $n2, $n3), $value);
+    $this->assertEqual('and', $operator);
+
+    list($value, $operator) = HandlerBase::breakString("$n1+$n2+$n3", TRUE);
+    $this->assertEqual(array($n1, $n2, $n3), $value);
+    $this->assertEqual('or', $operator);
+
+    // Fail on strings.
+    list($value, $operator) = HandlerBase::breakString("$s1,$n2,$n3", TRUE);
+    $this->assertEqual(array((int) $s1, $n2, $n3), $value);
+    $this->assertEqual('and', $operator);
+
+    list($value, $operator) = HandlerBase::breakString("$s1+$n2+$n3", TRUE);
+    $this->assertEqual(array((int) $s1, $n2, $n3), $value);
+    $this->assertEqual('or', $operator);
   }
 
   /**