diff --git a/core/modules/views/src/Plugin/views/filter/Combine.php b/core/modules/views/src/Plugin/views/filter/Combine.php
index f8ea624..d40b156 100644
--- a/core/modules/views/src/Plugin/views/filter/Combine.php
+++ b/core/modules/views/src/Plugin/views/filter/Combine.php
@@ -3,7 +3,6 @@
 namespace Drupal\views\Plugin\views\filter;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Database\Database;
 
 /**
  * Filter handler which allows to search on multiple fields.
@@ -130,8 +129,8 @@ public function validate() {
    */
   public function opEqual($expression) {
     $placeholder = $this->placeholder();
-    $operator = $this->operator();
-    $this->query->addWhereExpression($this->options['group'], "$expression $operator $placeholder", [$placeholder => $this->value]);
+    $operator = $this->getConditionOperator('LIKE');
+    $this->query->addWhereExpression($this->options['group'], "$expression $operator $placeholder", array($placeholder => '%' . $this->connection->escapeLike($this->value) . '%'));
   }
 
   protected function opContains($expression) {
@@ -162,45 +161,52 @@ protected function opContainsWord($expression) {
     // Switch between the 'word' and 'allwords' operator.
     $type = $this->operator == 'word' ? 'OR' : 'AND';
     $group = $this->query->setWhereGroup($type);
-    $operator = Database::getConnection()->mapConditionOperator('LIKE');
-    $operator = isset($operator['operator']) ? $operator['operator'] : 'LIKE';
-
+    $operator = $this->getConditionOperator('LIKE');
     foreach ($matches as $match_key => $match) {
       $temp_placeholder = $placeholder . '_' . $match_key;
       // Clean up the user input and remove the sentence delimiters.
       $word = trim($match[2], ',?!();:-"');
-      $this->query->addWhereExpression($group, "$expression $operator $temp_placeholder", [$temp_placeholder => '%' . Database::getConnection()->escapeLike($word) . '%']);
+     $this->query->addWhereExpression($group, "$expression $operator $temp_placeholder", array($temp_placeholder => '%' . $this->connection->escapeLike($word) . '%'));
     }
   }
 
   protected function opStartsWith($expression) {
     $placeholder = $this->placeholder();
-    $this->query->addWhereExpression($this->options['group'], "$expression LIKE $placeholder", [$placeholder => db_like($this->value) . '%']);
+    $operator = $this->getConditionOperator('NOT LIKE');
+    $this->query->addWhereExpression($this->options['group'], "$expression $operator $placeholder", array($placeholder => $this->connection->escapeLike($this->value) . '%'));
   }
 
   protected function opNotStartsWith($expression) {
     $placeholder = $this->placeholder();
-    $this->query->addWhereExpression($this->options['group'], "$expression NOT LIKE $placeholder", [$placeholder => db_like($this->value) . '%']);
+    $operator = $this->getConditionOperator('NOT LIKE');
+    $this->query->addWhereExpression($this->options['group'], "$expression $operator $placeholder", array($placeholder => $this->connection->escapeLike($this->value) . '%'));
   }
 
   protected function opEndsWith($expression) {
     $placeholder = $this->placeholder();
-    $this->query->addWhereExpression($this->options['group'], "$expression LIKE $placeholder", [$placeholder => '%' . db_like($this->value)]);
+    $operator = $this->getConditionOperator('LIKE');
+    $this->query->addWhereExpression($this->options['group'], "$expression $operator $placeholder", array($placeholder => '%' . $this->connection->escapeLike($this->value)));
+
   }
 
   protected function opNotEndsWith($expression) {
     $placeholder = $this->placeholder();
-    $this->query->addWhereExpression($this->options['group'], "$expression NOT LIKE $placeholder", [$placeholder => '%' . db_like($this->value)]);
+     $operator = $this->getConditionOperator('NOT LIKE');
+    $this->query->addWhereExpression($this->options['group'], "$expression $operator $placeholder", array($placeholder => '%' . $this->connection->escapeLike($this->value)));
+
   }
 
   protected function opNotLike($expression) {
     $placeholder = $this->placeholder();
-    $this->query->addWhereExpression($this->options['group'], "$expression NOT LIKE $placeholder", [$placeholder => '%' . db_like($this->value) . '%']);
+   $operator = $this->getConditionOperator('NOT LIKE');
+   $this->query->addWhereExpression($this->options['group'], "$expression $operator $placeholder", array($placeholder => '%' . $this->connection->escapeLike($this->value) . '%'));
+
   }
 
   protected function opRegex($expression) {
     $placeholder = $this->placeholder();
-    $this->query->addWhereExpression($this->options['group'], "$expression REGEXP $placeholder", [$placeholder => $this->value]);
+    $operator = $this->getConditionOperator('REGEXP');
+    $this->query->addWhereExpression($this->options['group'], "$expression $operator $placeholder", array($placeholder => $this->value));
   }
 
   protected function opEmpty($expression) {
@@ -214,4 +220,4 @@ protected function opEmpty($expression) {
     $this->query->addWhereExpression($this->options['group'], "$expression $operator");
   }
 
-}
+}
\ No newline at end of file