diff --git a/core/modules/views/src/ManyToOneHelper.php b/core/modules/views/src/ManyToOneHelper.php
index e6e31aa..9541ca5 100644
--- a/core/modules/views/src/ManyToOneHelper.php
+++ b/core/modules/views/src/ManyToOneHelper.php
@@ -164,11 +164,11 @@ public function ensureMyTable() {
       $field = $this->handler->relationship . '_' . $this->handler->table . '.' . $this->handler->field;
       if ($this->handler->operator == 'or' && empty($this->handler->options['reduce_duplicates'])) {
         if (empty($this->handler->options['add_table']) && empty($this->handler->view->many_to_one_tables[$field])) {
-          // query optimization, INNER joins are slightly faster, so use them
-          // when we know we can.
           $join = $this->getJoin();
           if (isset($join)) {
-            $join->type = 'INNER';
+            // @todo: the default $join->type is LEFT. We can change it to INNER
+            // to improve the performance, but first we need to determine when
+            // it is allowed.
           }
           $this->handler->tableAlias = $this->handler->query->ensureTable($this->handler->table, $this->handler->relationship, $join);
           $this->handler->view->many_to_one_tables[$field] = $this->handler->value;
@@ -311,10 +311,10 @@ public function addFilter() {
         $placeholder = $this->placeholder();
         if (count($this->handler->value) > 1) {
           $placeholder .= '[]';
-          $this->handler->query->addWhereExpression(0, "$field $operator($placeholder)", array($placeholder => $value));
+          $this->handler->query->addWhereExpression($options['group'], "$field $operator($placeholder)", array($placeholder => $value));
         }
         else {
-          $this->handler->query->addWhereExpression(0, "$field $operator $placeholder", array($placeholder => $value));
+          $this->handler->query->addWhereExpression($options['group'], "$field $operator $placeholder", array($placeholder => $value));
         }
       }
     }