diff --git a/search_api.views.inc b/search_api.views.inc
index b2a2aa1..af4abbc 100644
--- a/search_api.views.inc
+++ b/search_api.views.inc
@@ -335,12 +335,6 @@ function _search_api_views_handler_adjustments($type, FieldInterface $field, arr
       }
     }
   }
-
-  // Special case for our own language field.
-  if ($field->getCombinedPropertyPath() === 'search_api_language') {
-    $definitions['filter']['id'] = 'search_api_language';
-    $definitions['filter']['allow empty'] = FALSE;
-  }
 }
 
 /**
@@ -351,9 +345,9 @@ function _search_api_views_handler_adjustments($type, FieldInterface $field, arr
  */
 function _search_api_views_data_special_fields(array &$table) {
   $id_field = _search_api_views_find_field_alias('search_api_id', $table);
-  $table[$id_field]['title'] = t('Entity ID');
-  $table[$id_field]['help'] = t("The entity's ID");
-  $table[$id_field]['field']['id'] = 'numeric';
+  $table[$id_field]['title'] = t('Item ID');
+  $table[$id_field]['help'] = t("The item's internal (Search API-specific) ID");
+  $table[$id_field]['field']['id'] = 'standard';
   $table[$id_field]['sort']['id'] = 'search_api';
   if ($id_field != 'search_api_id') {
     $table[$id_field]['real field'] = 'search_api_id';
@@ -369,6 +363,17 @@ function _search_api_views_data_special_fields(array &$table) {
     $table[$datasource_field]['real field'] = 'search_api_datasource';
   }
 
+  $language_field = _search_api_views_find_field_alias('search_api_language', $table);
+  $table[$language_field]['title'] = t('Item language');
+  $table[$language_field]['help'] = t("The item's language");
+  $table[$language_field]['field']['id'] = 'language';
+  $table[$language_field]['filter']['id'] = 'search_api_language';
+  $table[$language_field]['filter']['allow empty'] = FALSE;
+  $table[$language_field]['sort']['id'] = 'search_api';
+  if ($language_field != 'search_api_language') {
+    $table[$language_field]['real field'] = 'search_api_language';
+  }
+
   $relevance_field = _search_api_views_find_field_alias('search_api_relevance', $table);
   $table[$relevance_field]['group'] = t('Search');
   $table[$relevance_field]['title'] = t('Relevance');
@@ -663,7 +668,9 @@ function _search_api_views_get_field_handler_mapping() {
     $plain_mapping['field_item:text_long'] = $text_mapping;
     $plain_mapping['field_item:text_with_summary'] = $text_mapping;
 
-    $numeric_mapping = array('id' => 'search_api_numeric');
+    $numeric_mapping = array(
+      'id' => 'search_api_numeric',
+    );
     $plain_mapping['field_item:integer'] = $numeric_mapping;
     $plain_mapping['field_item:list_integer'] = $numeric_mapping;
     $plain_mapping['integer'] = $numeric_mapping;
@@ -679,17 +686,23 @@ function _search_api_views_get_field_handler_mapping() {
     $plain_mapping['decimal'] = $float_mapping;
     $plain_mapping['float'] = $float_mapping;
 
-    $date_mapping = array('id' => 'search_api_date');
+    $date_mapping = array(
+      'id' => 'search_api_date',
+    );
     $plain_mapping['field_item:created'] = $date_mapping;
     $plain_mapping['field_item:changed'] = $date_mapping;
     $plain_mapping['datetime_iso8601'] = $date_mapping;
     $plain_mapping['timestamp'] = $date_mapping;
 
-    $bool_mapping = array('id' => 'search_api_boolean');
+    $bool_mapping = array(
+      'id' => 'search_api_boolean',
+    );
     $plain_mapping['boolean'] = $bool_mapping;
     $plain_mapping['field_item:boolean'] = $bool_mapping;
 
-    $ref_mapping = array('id' => 'search_api_entity');
+    $ref_mapping = array(
+      'id' => 'search_api_entity',
+    );
     $plain_mapping['field_item:entity_reference'] = $ref_mapping;
     $plain_mapping['field_item:comment'] = $ref_mapping;
 
diff --git a/search_api_db/src/Plugin/search_api/backend/Database.php b/search_api_db/src/Plugin/search_api/backend/Database.php
index 0f8fb68..8e325c7 100644
--- a/search_api_db/src/Plugin/search_api/backend/Database.php
+++ b/search_api_db/src/Plugin/search_api/backend/Database.php
@@ -737,12 +737,11 @@ protected function createFieldTable(FieldInterface $field = NULL, $db, $type = '
     //
     // In SQLite, indexes and tables can't have the same name, which is
     // the case for Search API DB. We have following situation:
-    // - a table named search_api_db_default_index_search_api_language
+    // - a table named search_api_db_default_index_title
     // - a table named search_api_db_default_index
     //
-    // The last table has an index on the search_api_language column,
-    // which results in an index with the same as the first table, which
-    // conflicts in SQLite.
+    // The last table has an index on the title column, which results in an
+    // index with the same as the first table, which conflicts in SQLite.
     //
     // The core issue addressing this (https://www.drupal.org/node/1008128) was
     // closed as it fixed the PostgresSQL part. The SQLite fix is added in
@@ -829,6 +828,7 @@ protected function fieldsUpdated(IndexInterface $index) {
       $db_info = $this->getIndexDbInfo($index);
       $fields = &$db_info['field_tables'];
       $new_fields = $index->getFields();
+      $new_fields += $this->getSpecialFields($index);
 
       $reindex = FALSE;
       $cleared = FALSE;
@@ -991,6 +991,35 @@ protected function fieldsUpdated(IndexInterface $index) {
   }
 
   /**
+   * Creates dummy field objects for the "magic" fields present for every index.
+   *
+   * @param \Drupal\search_api\IndexInterface $index
+   *   The index for which to create the field. (Needed since field objects
+   *   always need an index set.)
+   * @param \Drupal\search_api\Item\ItemInterface|null $item
+   *   (optional) If given, an item whose data should be set as the fields'
+   *   values.
+   *
+   * @return \Drupal\search_api\Item\FieldInterface[]
+   *   An array of field objects for all "magic" fields, keyed by field IDs.
+   */
+  protected function getSpecialFields(IndexInterface $index, ItemInterface $item = NULL) {
+    $field_info = array(
+      'type' => 'string',
+      'original type' => 'string',
+    );
+    $fields['search_api_datasource'] = Utility::createField($index, 'search_api_datasource', $field_info);
+    $fields['search_api_language'] = Utility::createField($index, 'search_api_language', $field_info);
+
+    if ($item) {
+      $fields['search_api_datasource']->setValues(array($item->getDatasourceId()));
+      $fields['search_api_language']->setValues(array($item->getLanguage()));
+    }
+
+    return $fields;
+  }
+
+  /**
    * Drops a field's table and its column from the denormalized table.
    *
    * @param string $name
@@ -1110,7 +1139,9 @@ protected function indexItem(IndexInterface $index, ItemInterface $item) {
 
       $denormalized_values = array();
       $text_inserts = array();
-      foreach ($item->getFields() as $field_id => $field) {
+      $item_fields = $item->getFields();
+      $item_fields += $this->getSpecialFields($index, $item);
+      foreach ($item_fields as $field_id => $field) {
         // Sometimes index changes are not triggering the update hooks
         // correctly. Therefore, to avoid DB errors, we re-check the tables
         // here before indexing.
@@ -1618,6 +1649,7 @@ protected function createDbQuery(QueryInterface $query, array $fields) {
     }
 
     $condition_group = $query->getConditionGroup();
+    $this->addLanguageConditions($condition_group, $query);
     if ($condition_group->getConditions()) {
       $condition = $this->createDbCondition($condition_group, $fields, $db_query, $query->getIndex());
       if ($condition) {
@@ -1977,6 +2009,23 @@ protected function createKeysQuery($keys, array $fields, array $all_fields, Inde
   }
 
   /**
+   * Adds item language conditions to the condition group, if applicable.
+   *
+   * @param \Drupal\search_api\Query\ConditionGroupInterface $condition_group
+   *   The condition group on which to set conditions.
+   * @param \Drupal\search_api\Query\QueryInterface $query
+   *   The query to inspect for language settings.
+   *
+   * @see \Drupal\search_api\Query\QueryInterface::getLanguages()
+   */
+  protected function addLanguageConditions(ConditionGroupInterface $condition_group, QueryInterface $query) {
+    $languages = $query->getLanguages();
+    if ($languages !== NULL) {
+      $condition_group->addCondition('search_api_language', $languages, 'IN');
+    }
+  }
+
+  /**
    * Creates a database query condition for a given search filter.
    *
    * Used as a helper method in createDbQuery().
@@ -2017,21 +2066,6 @@ protected function createDbCondition(ConditionGroupInterface $conditions, array
         $value = $condition->getValue();
         $not_equals = in_array($operator, array('<>', '!=', 'NOT IN'));
 
-        // We don't index the datasource explicitly, so this needs a bit of
-        // magic.
-        // @todo Index the datasource explicitly so this doesn't need magic.
-        if ($field === 'search_api_datasource') {
-          if (empty($tables[NULL])) {
-            $table = array(
-              'table' => $db_info['index_table'],
-            );
-            $tables[NULL] = $this->getTableAlias($table, $db_query);
-          }
-          $operator = $not_equals ? 'NOT LIKE' : 'LIKE';
-          $prefix = Utility::createCombinedId($value, '');
-          $db_condition->condition($tables[NULL] . '.item_id', $this->database->escapeLike($prefix) . '%', $operator);
-          continue;
-        }
         if (!isset($fields[$field])) {
           throw new SearchApiException(new FormattableMarkup('Unknown field in filter clause: @field.', array('@field' => $field)));
         }
diff --git a/search_api_db/tests/src/Kernel/BackendTest.php b/search_api_db/tests/src/Kernel/BackendTest.php
index 2263168..7a16cfa 100644
--- a/search_api_db/tests/src/Kernel/BackendTest.php
+++ b/search_api_db/tests/src/Kernel/BackendTest.php
@@ -137,6 +137,7 @@ protected function checkServerTables() {
       'id',
       'keywords',
       'name',
+      'search_api_datasource',
       'search_api_language',
       'type',
       'width',
@@ -184,6 +185,9 @@ protected function updateIndex() {
     $index->save();
 
     $index_fields = array_keys($index->getFields());
+    // Include the two "magic" fields we're indexing with the DB backend.
+    $index_fields[] = 'search_api_datasource';
+    $index_fields[] = 'search_api_language';
 
     $db_info = $this->getIndexDbInfo();
     $server_fields = array_keys($db_info['field_tables']);
@@ -352,19 +356,57 @@ protected function searchSuccess1() {
 
     $results = $this->buildSearch()->addCondition('keywords', array('grape', 'apple'), 'IN')->execute();
     $this->assertEquals(3, $results->getResultCount(), 'Query with IN filter returned correct number of results.');
-    $this->assertEquals($this->getItemIds(array(2, 4, 5)), array_keys($results->getResultItems()), 'Query with IN filter field returned correct result.');
+    $this->assertEquals($this->getItemIds(array(2, 4, 5)), array_keys($results->getResultItems()), 'Query with IN filter returned correct result.');
     $this->assertIgnored($results);
     $this->assertWarnings($results);
 
     $results = $this->buildSearch()->addCondition('keywords', array('grape', 'apple'), 'NOT IN')->execute();
     $this->assertEquals(2, $results->getResultCount(), 'Query with NOT IN filter returned correct number of results.');
-    $this->assertEquals($this->getItemIds(array(1, 3)), array_keys($results->getResultItems()), 'Query with NOT IN filter field returned correct result.');
+    $this->assertEquals($this->getItemIds(array(1, 3)), array_keys($results->getResultItems()), 'Query with NOT IN filter returned correct result.');
     $this->assertIgnored($results);
     $this->assertWarnings($results);
 
     $results = $this->buildSearch()->addCondition('width', array('0.9', '1.5'), 'BETWEEN')->execute();
     $this->assertEquals(1, $results->getResultCount(), 'Query with BETWEEN filter returned correct number of results.');
-    $this->assertEquals($this->getItemIds(array(4)), array_keys($results->getResultItems()), 'Query with BETWEEN filter field returned correct result.');
+    $this->assertEquals($this->getItemIds(array(4)), array_keys($results->getResultItems()), 'Query with BETWEEN filter returned correct result.');
+    $this->assertIgnored($results);
+    $this->assertWarnings($results);
+
+    $results = $this->buildSearch()
+      ->setLanguages(array('und', 'en'))
+      ->addCondition('keywords', array('grape', 'apple'), 'IN')
+      ->execute();
+    $this->assertEquals(3, $results->getResultCount(), 'Query with IN filter returned correct number of results.');
+    $this->assertEquals($this->getItemIds(array(2, 4, 5)), array_keys($results->getResultItems()), 'Query with IN filter returned correct result.');
+    $this->assertIgnored($results);
+    $this->assertWarnings($results);
+
+    $query = $this->buildSearch();
+    $conditions = $query->createConditionGroup('OR');
+    $conditions->addCondition('search_api_language', 'und');
+    $conditions->addCondition('width', array('0.9', '1.5'), 'BETWEEN');
+    $query->addConditionGroup($conditions);
+    $results = $query->execute();
+    $this->assertEquals(1, $results->getResultCount(), 'Query with search_api_language filter returned correct number of results.');
+    $this->assertEquals($this->getItemIds(array(4)), array_keys($results->getResultItems()), 'Query with search_api_language filter returned correct result.');
+    $this->assertIgnored($results);
+    $this->assertWarnings($results);
+
+    $query = $this->buildSearch();
+    $query->addCondition('search_api_language', array('und', 'en'), 'IN');
+    $query->addCondition('width', array('0.9', '1.5'), 'BETWEEN');
+    $results = $query->execute();
+    $this->assertEquals(1, $results->getResultCount(), 'Query with search_api_language "IN" filter returned correct number of results.');
+    $this->assertEquals($this->getItemIds(array(4)), array_keys($results->getResultItems()), 'Query with search_api_language filter returned correct result.');
+    $this->assertIgnored($results);
+    $this->assertWarnings($results);
+
+    $query = $this->buildSearch();
+    $query->addCondition('search_api_language', array('und', 'de'), 'NOT IN');
+    $query->addCondition('width', array('0.9', '1.5'), 'BETWEEN');
+    $results = $query->execute();
+    $this->assertEquals(1, $results->getResultCount(), 'Query with search_api_language "NOT IN" filter returned correct number of results.');
+    $this->assertEquals($this->getItemIds(array(4)), array_keys($results->getResultItems()), 'Query with search_api_language filter returned correct result.');
     $this->assertIgnored($results);
     $this->assertWarnings($results);
   }
diff --git a/src/Datasource/DatasourceInterface.php b/src/Datasource/DatasourceInterface.php
index f1f4dd7..507cf78 100644
--- a/src/Datasource/DatasourceInterface.php
+++ b/src/Datasource/DatasourceInterface.php
@@ -99,6 +99,17 @@ public function getItemLabel(ComplexDataInterface $item);
   public function getItemBundle(ComplexDataInterface $item);
 
   /**
+   * Retrieves the item's language.
+   *
+   * @param \Drupal\Core\TypedData\ComplexDataInterface $item
+   *   An item of this datasource's type.
+   *
+   * @return string
+   *   The language code of this item.
+   */
+  public function getItemLanguage(ComplexDataInterface $item);
+
+  /**
    * Retrieves a URL at which the item can be viewed on the web.
    *
    * @param \Drupal\Core\TypedData\ComplexDataInterface $item
diff --git a/src/Datasource/DatasourcePluginBase.php b/src/Datasource/DatasourcePluginBase.php
index bedaffb..9d220e3 100644
--- a/src/Datasource/DatasourcePluginBase.php
+++ b/src/Datasource/DatasourcePluginBase.php
@@ -2,7 +2,9 @@
 
 namespace Drupal\search_api\Datasource;
 
+use Drupal\Core\Language\Language;
 use Drupal\Core\TypedData\ComplexDataInterface;
+use Drupal\Core\TypedData\TranslatableInterface;
 use Drupal\search_api\Plugin\IndexPluginBase;
 
 /**
@@ -72,6 +74,20 @@ public function getItemBundle(ComplexDataInterface $item) {
   /**
    * {@inheritdoc}
    */
+  public function getItemLanguage(ComplexDataInterface $item) {
+    if ($item instanceof TranslatableInterface) {
+      return $item->language()->getId();
+    }
+    $item = $item->getValue();
+    if ($item instanceof TranslatableInterface) {
+      return $item->language()->getId();
+    }
+    return Language::LANGCODE_NOT_SPECIFIED;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public function getItemUrl(ComplexDataInterface $item) {
     return NULL;
   }
diff --git a/src/Entity/Index.php b/src/Entity/Index.php
index cf6c4a1..a28c7d3 100644
--- a/src/Entity/Index.php
+++ b/src/Entity/Index.php
@@ -870,9 +870,6 @@ public function indexSpecificItems(array $search_objects) {
     if (!$this->status) {
       throw new SearchApiException(new FormattableMarkup("Couldn't index values on index %index (index is disabled)", array('%index' => $this->label())));
     }
-    if (empty($this->getFields())) {
-      throw new SearchApiException(new FormattableMarkup("Couldn't index values on index %index (no fields selected)", array('%index' => $this->label())));
-    }
 
     /** @var \Drupal\search_api\Item\ItemInterface[] $items */
     $items = array();
diff --git a/src/Item/Item.php b/src/Item/Item.php
index 8ece07f..0ebbebb 100644
--- a/src/Item/Item.php
+++ b/src/Item/Item.php
@@ -21,6 +21,13 @@ class Item implements \IteratorAggregate, ItemInterface {
   protected $index;
 
   /**
+   * The ID of this item.
+   *
+   * @var string
+   */
+  protected $itemId;
+
+  /**
    * The complex data item this Search API item is based on.
    *
    * @var \Drupal\Core\TypedData\ComplexDataInterface
@@ -42,6 +49,13 @@ class Item implements \IteratorAggregate, ItemInterface {
   protected $datasource;
 
   /**
+   * The language code of this item.
+   *
+   * @var string
+   */
+  protected $language;
+
+  /**
    * The extracted fields of this item.
    *
    * @var \Drupal\search_api\Item\FieldInterface[]
@@ -96,7 +110,7 @@ class Item implements \IteratorAggregate, ItemInterface {
    */
   public function __construct(IndexInterface $index, $id, DatasourceInterface $datasource = NULL) {
     $this->index = $index;
-    $this->id = $id;
+    $this->itemId = $id;
     if ($datasource) {
       $this->datasource = $datasource;
       $this->datasourceId = $datasource->getPluginId();
@@ -108,7 +122,7 @@ public function __construct(IndexInterface $index, $id, DatasourceInterface $dat
    */
   public function getDatasourceId() {
     if (!isset($this->datasourceId)) {
-      list($this->datasourceId) = Utility::splitCombinedId($this->id);
+      list($this->datasourceId) = Utility::splitCombinedId($this->itemId);
     }
     return $this->datasourceId;
   }
@@ -133,8 +147,26 @@ public function getIndex() {
   /**
    * {@inheritdoc}
    */
+  public function getLanguage() {
+    if (!isset($this->language)) {
+      $this->language = $this->getDatasource()->getItemLanguage($this->getOriginalObject());
+    }
+    return $this->language;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setLanguage($language) {
+    $this->language = $language;
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public function getId() {
-    return $this->id;
+    return $this->itemId;
   }
 
   /**
@@ -142,9 +174,9 @@ public function getId() {
    */
   public function getOriginalObject($load = TRUE) {
     if (!isset($this->originalObject) && $load) {
-      $this->originalObject = $this->index->loadItem($this->id);
+      $this->originalObject = $this->index->loadItem($this->itemId);
       if (!$this->originalObject) {
-        throw new SearchApiException('Failed to load original object ' . $this->id);
+        throw new SearchApiException('Failed to load original object ' . $this->itemId);
       }
     }
     return $this->originalObject;
diff --git a/src/Item/ItemInterface.php b/src/Item/ItemInterface.php
index 59eaa57..9ea9b50 100644
--- a/src/Item/ItemInterface.php
+++ b/src/Item/ItemInterface.php
@@ -73,6 +73,24 @@ public function getDatasource();
   public function getIndex();
 
   /**
+   * Retrieves the item language.
+   *
+   * @return string
+   *   The item language.
+   */
+  public function getLanguage();
+
+  /**
+   * Sets the item language.
+   *
+   * @param string $language
+   *   The new item language.
+   *
+   * @return $this
+   */
+  public function setLanguage($language);
+
+  /**
    * Retrieves a single field of this item.
    *
    * @param string $field_id
diff --git a/src/Plugin/search_api/datasource/ContentEntity.php b/src/Plugin/search_api/datasource/ContentEntity.php
index 69394de..fe2b85b 100755
--- a/src/Plugin/search_api/datasource/ContentEntity.php
+++ b/src/Plugin/search_api/datasource/ContentEntity.php
@@ -581,7 +581,7 @@ public function submitConfigurationForm(array &$form, FormStateInterface $form_s
    */
   public function getItemId(ComplexDataInterface $item) {
     if ($item instanceof EntityAdapter) {
-      return $item->getValue()->id() . ':' . $item->getValue()->language();
+      return $item->getValue()->id() . ':' . $item->getValue()->language()->getId();
     }
     return NULL;
   }
diff --git a/src/Plugin/search_api/processor/Language.php b/src/Plugin/search_api/processor/Language.php
deleted file mode 100644
index 8746e74..0000000
--- a/src/Plugin/search_api/processor/Language.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-namespace Drupal\search_api\Plugin\search_api\processor;
-
-use Drupal\Core\Entity\Plugin\DataType\EntityAdapter;
-use Drupal\Core\Language\Language as CoreLanguage;
-use Drupal\Core\TypedData\DataDefinition;
-use Drupal\Core\TypedData\TranslatableInterface;
-use Drupal\search_api\Datasource\DatasourceInterface;
-use Drupal\search_api\Processor\ProcessorPluginBase;
-
-/**
- * Adds the item language to indexed items.
- *
- * @SearchApiProcessor(
- *   id = "language",
- *   label = @Translation("Language"),
- *   description = @Translation("Adds the item language to indexed items."),
- *   stages = {
- *     "pre_index_save" = -10,
- *     "preprocess_index" = -30
- *   },
- *   locked = true,
- *   hidden = true
- * )
- */
-class Language extends ProcessorPluginBase {
-
-  // @todo Config form for setting the field containing the langcode if
-  //   language() is not available?
-
-  /**
-   * {@inheritdoc}
-   */
-  public function alterPropertyDefinitions(array &$properties, DatasourceInterface $datasource = NULL) {
-    if ($datasource) {
-      return;
-    }
-    $definition = array(
-      'type' => 'string',
-      'label' => $this->t('Item language'),
-      'description' => $this->t('The language code of the item'),
-    );
-    $properties['search_api_language'] = new DataDefinition($definition);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preIndexSave() {
-    $this->ensureField(NULL, 'search_api_language', 'string');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preprocessIndexItems(array &$items) {
-    // Annoyingly, this doc comment is needed for PHPStorm. See
-    // http://youtrack.jetbrains.com/issue/WI-23586
-    /** @var \Drupal\search_api\Item\ItemInterface $item */
-    foreach ($items as $item) {
-      $object = $item->getOriginalObject();
-      // Workaround for recognizing entities.
-      if ($object instanceof EntityAdapter) {
-        $object = $object->getValue();
-      }
-
-      if ($object instanceof TranslatableInterface) {
-        $langcode = $object->language()->getId();
-      }
-      else {
-        $langcode = CoreLanguage::LANGCODE_NOT_SPECIFIED;
-      }
-
-      foreach ($this->filterForPropertyPath($item->getFields(), 'search_api_language') as $field) {
-        $field->addValue($langcode);
-      }
-    }
-  }
-
-}
diff --git a/src/Plugin/views/filter/SearchApiFulltext.php b/src/Plugin/views/filter/SearchApiFulltext.php
index bf29030..bbeea4a 100644
--- a/src/Plugin/views/filter/SearchApiFulltext.php
+++ b/src/Plugin/views/filter/SearchApiFulltext.php
@@ -154,8 +154,6 @@ public function query() {
       $this->value = $this->value ? reset($this->value) : '';
     }
     // Catch empty strings entered by the user, but not "0".
-    // @todo Is this needed? It seems Views doesn't call filters with empty
-    //   values by default anyways.
     if ($this->value === '') {
       return;
     }
diff --git a/src/Plugin/views/filter/SearchApiLanguage.php b/src/Plugin/views/filter/SearchApiLanguage.php
index 41cf896..58b400e 100644
--- a/src/Plugin/views/filter/SearchApiLanguage.php
+++ b/src/Plugin/views/filter/SearchApiLanguage.php
@@ -2,10 +2,8 @@
 
 namespace Drupal\search_api\Plugin\views\filter;
 
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\search_api\UncacheableDependencyTrait;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\views\Plugin\views\filter\LanguageFilter;
 
 /**
  * Defines a filter for filtering on the language of items.
@@ -14,92 +12,37 @@
  *
  * @ViewsFilter("search_api_language")
  */
-class SearchApiLanguage extends SearchApiOptions {
+class SearchApiLanguage extends LanguageFilter {
 
   use UncacheableDependencyTrait;
-
-  /**
-   * The language manager.
-   *
-   * @var \Drupal\Core\Language\LanguageManagerInterface|null
-   */
-  protected $languageManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    /** @var static $plugin */
-    $plugin = parent::create($container, $configuration, $plugin_id, $plugin_definition);
-
-    /** @var $language_manager \Drupal\Core\Language\LanguageManagerInterface */
-    $language_manager = $container->get('language_manager');
-    $plugin->setLanguageManager($language_manager);
-
-    return $plugin;
-  }
-
-  /**
-   * Retrieves the language manager.
-   *
-   * @return \Drupal\Core\Language\LanguageManagerInterface
-   *   The language manager.
-   */
-  public function getLanguageManager() {
-    return $this->languageManager ?: \Drupal::languageManager();
-  }
-
-  /**
-   * Sets the language manager.
-   *
-   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
-   *   The new language manager.
-   *
-   * @return $this
-   */
-  public function setLanguageManager(LanguageManagerInterface $language_manager) {
-    $this->languageManager = $language_manager;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getValueOptions() {
-    if (isset($this->valueOptions)) {
-      return $this->valueOptions;
-    }
-
-    $this->valueOptions = array(
-      'content' => $this->t('Current content language'),
-      'interface' => $this->t('Current interface language'),
-      'default' => $this->t('Default site language'),
-    );
-
-    foreach ($this->getLanguageManager()->getLanguages(LanguageInterface::STATE_ALL) as $langcode => $language) {
-      $this->valueOptions[$langcode] = $language->getName();
-    }
-
-    return $this->valueOptions;
-  }
+  use SearchApiFilterTrait;
 
   /**
    * {@inheritdoc}
    */
   public function query() {
+    $substitutions = self::queryLanguageSubstitutions();
     foreach ($this->value as $i => $value) {
-      if ($value == 'content') {
-        $this->value[$i] = $this->getLanguageManager()->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->getId();
-      }
-      elseif ($value == 'interface') {
-        $this->value[$i] = $this->getLanguageManager()->getCurrentLanguage()->getId();
-      }
-      elseif ($value == 'default') {
-        $this->value[$i] = $this->getLanguageManager()->getDefaultLanguage()->getId();
+      if (isset($substitutions[$value])) {
+        $this->value[$i] = $substitutions[$value];
       }
     }
 
-    parent::query();
+    // Only set the languages using $query->setLanguages() if the condition
+    // would be placed directly on the query, as an AND condition.
+    $query = $this->getQuery();
+    $direct_condition = $this->operator == 'in'
+      && (
+        empty($query->where[$this->options['group']]['type'])
+        || $query->where[$this->options['group']]['type'] == 'AND'
+      )
+      && $query->getGroupOperator() == 'AND';
+    if ($direct_condition) {
+      $query->setLanguages($this->value);
+    }
+    else {
+      parent::query();
+    }
   }
 
 }
diff --git a/src/Plugin/views/query/SearchApiQuery.php b/src/Plugin/views/query/SearchApiQuery.php
index e58b1b2..15499b5 100644
--- a/src/Plugin/views/query/SearchApiQuery.php
+++ b/src/Plugin/views/query/SearchApiQuery.php
@@ -103,7 +103,7 @@ class SearchApiQuery extends QueryPluginBase {
    *
    * @var array
    */
-  protected $conditions = array();
+  public $where = array();
 
   /**
    * The conjunction with which multiple filter groups are combined.
@@ -352,7 +352,7 @@ public function build(ViewExecutable $view) {
     }
 
     // Setup the nested filter structure for this query.
-    if (!empty($this->conditions)) {
+    if (!empty($this->where)) {
       // If the different groups are combined with the OR operator, we have to
       // add a new OR filter to the query to which the filters for the groups
       // will be added.
@@ -364,7 +364,7 @@ public function build(ViewExecutable $view) {
         $base = $this->query;
       }
       // Add a nested filter for each filter group, with its set conjunction.
-      foreach ($this->conditions as $group_id => $group) {
+      foreach ($this->where as $group_id => $group) {
         if (!empty($group['conditions']) || !empty($group['condition_groups'])) {
           $group += array('type' => 'AND');
           // For filters without a group, we want to always add them directly to
@@ -554,6 +554,7 @@ protected function addResults(array $results, ViewExecutable $view) {
       }
       $values['search_api_id'] = $item_id;
       $values['search_api_datasource'] = $result->getDatasourceId();
+      $values['search_api_language'] = $result->getLanguage();
       $values['search_api_relevance'] = $result->getScore();
       $values['search_api_excerpt'] = $result->getExcerpt() ?: '';
 
@@ -655,6 +656,40 @@ public function calculateDependencies() {
   //
 
   /**
+   * Retrieves the languages that will be searched by this query.
+   *
+   * @return string[]|null
+   *   The language codes of languages that will be searched by this query, or
+   *   NULL if there shouldn't be any restriction on the language.
+   *
+   *  @see \Drupal\search_api\Query\QueryInterface::getLanguages()
+   */
+  public function getLanguages() {
+    if (!$this->shouldAbort()) {
+      return $this->query->getLanguages();
+    }
+    return NULL;
+  }
+
+  /**
+   * Sets the languages that should be searched by this query.
+   *
+   * @param string[]|null $languages
+   *   The language codes to search for, or NULL to not restrict the query to
+   *   specific languages.
+   *
+   * @return $this
+   *
+   * @see \Drupal\search_api\Query\QueryInterface::setLanguages()
+   */
+  public function setLanguages(array $languages = NULL) {
+    if (!$this->shouldAbort()) {
+      $this->query->setLanguages($languages);
+    }
+    return $this;
+  }
+
+  /**
    * Creates a new condition group to use with this query object.
    *
    * @param string $conjunction
@@ -740,7 +775,7 @@ public function addConditionGroup(ConditionGroupInterface $condition_group, $gro
       if (empty($group)) {
         $group = 0;
       }
-      $this->conditions[$group]['condition_groups'][] = $condition_group;
+      $this->where[$group]['condition_groups'][] = $condition_group;
     }
     return $this;
   }
@@ -777,7 +812,7 @@ public function addCondition($field, $value, $operator = '=', $group = NULL) {
         $group = 0;
       }
       $condition = array($field, $value, $operator);
-      $this->conditions[$group]['conditions'][] = $condition;
+      $this->where[$group]['conditions'][] = $condition;
     }
     return $this;
   }
@@ -836,7 +871,7 @@ public function addWhere($group, $field, $value = NULL, $operator = NULL) {
         $field = $this->transformDbCondition($field);
       }
       if ($field instanceof ConditionGroupInterface) {
-        $this->conditions[$group]['condition_groups'][] = $field;
+        $this->where[$group]['condition_groups'][] = $field;
       }
       elseif (!$this->shouldAbort()) {
         // We only need to abort  if that wasn't done by transformDbCondition()
@@ -850,13 +885,23 @@ public function addWhere($group, $field, $value = NULL, $operator = NULL) {
         $value,
         $this->sanitizeOperator($operator),
       );
-      $this->conditions[$group]['conditions'][] = $condition;
+      $this->where[$group]['conditions'][] = $condition;
     }
 
     return $this;
   }
 
   /**
+   * Retrieves the conjunction with which multiple filter groups are combined.
+   *
+   * @return string
+   *   Either "AND" or "OR".
+   */
+  public function getGroupOperator() {
+    return $this->groupOperator;
+  }
+
+  /**
    * Transforms a database condition to an equivalent search filter.
    *
    * @param \Drupal\Core\Database\Query\ConditionInterface $db_condition
diff --git a/src/Query/ConditionSetInterface.php b/src/Query/ConditionSetInterface.php
index ba6bbdd..1afc4b9 100644
--- a/src/Query/ConditionSetInterface.php
+++ b/src/Query/ConditionSetInterface.php
@@ -11,8 +11,13 @@
    * Adds a new ($field $operator $value) condition.
    *
    * @param string $field
-   *   The field to filter on, e.g. "title". The special field
-   *   "search_api_datasource" can be used to filter by datasource ID.
+   *   The ID of the field to filter on, e.g. "title". The special fields
+   *   "search_api_datasource" (filter by datasource ID) and
+   *   "search_api_language" (filter by language code) can be used in addition
+   *   to all indexed fields on the index. However, for filtering on language
+   *   code, using \Drupal\search_api\Query\QueryInterface::setLanguages() is
+   *   the preferred method, unless a complex condition containing the language
+   *   code is required.
    * @param mixed $value
    *   The value the field should have (or be related to by the operator). If
    *   $operator is "IN" or "NOT IN", $value has to be an array of values. If
diff --git a/src/Query/Query.php b/src/Query/Query.php
index 387be4d..124c404 100644
--- a/src/Query/Query.php
+++ b/src/Query/Query.php
@@ -6,6 +6,7 @@
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\search_api\IndexInterface;
 use Drupal\search_api\SearchApiException;
+use Drupal\search_api\Utility;
 
 /**
  * Provides a standard implementation for a Search API query.
@@ -47,6 +48,13 @@ class Query implements QueryInterface {
   protected $parseMode = 'terms';
 
   /**
+   * The language codes which should be searched by this query.
+   *
+   * @var string[]|null
+   */
+  protected $languages;
+
+  /**
    * The search keys.
    *
    * If NULL, this will be a filter-only search.
@@ -243,6 +251,21 @@ protected function parseKeys($keys) {
   /**
    * {@inheritdoc}
    */
+  public function getLanguages() {
+    return $this->languages;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setLanguages(array $languages = NULL) {
+    $this->languages = $languages;
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public function createConditionGroup($conjunction = 'AND', array $tags = array()) {
     return new ConditionGroup($conjunction, $tags);
   }
@@ -307,18 +330,23 @@ public function range($offset = NULL, $limit = NULL) {
    * {@inheritdoc}
    */
   public function execute() {
+    if ($this->languages === array()) {
+      return Utility::createSearchResultSet($this)->setResultCount(0);
+    }
+
     // Prepare the query for execution by the server.
     $this->preExecute();
 
+    if ($this->languages === array()) {
+      return Utility::createSearchResultSet($this)->setResultCount(0);
+    }
+
     // Execute query.
     $response = $this->index->getServerInstance()->search($this);
 
     // Postprocess the search results.
     $this->postExecute($response);
 
-    // Store search for later retrieval for facets, etc.
-    // @todo Figure out how to store the executed searches for the request.
-    // search_api_current_search(NULL, $this, $response);
     return $response;
   }
 
@@ -426,6 +454,42 @@ public function &getOptions() {
   }
 
   /**
+   * {@inheritdoc}
+   */
+  public function addTag($tag) {
+    $this->tags[$tag] = $tag;
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function hasTag($tag) {
+    return isset($this->tags[$tag]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function hasAllTags() {
+    return !array_diff_key(array_flip(func_get_args()), $this->tags);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function hasAnyTag() {
+    return (bool) array_intersect_key(array_flip(func_get_args()), $this->tags);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function &getTags() {
+    return $this->tags;
+  }
+
+  /**
    * Implements the magic __sleep() method to avoid serializing the index.
    */
   public function __sleep() {
@@ -440,7 +504,9 @@ public function __sleep() {
    */
   public function __wakeup() {
     if (!isset($this->index) && !empty($this->indexId)) {
-      $this->index = \Drupal::entityTypeManager()->getStorage('search_api_index')->load($this->indexId);
+      $this->index = \Drupal::entityTypeManager()
+        ->getStorage('search_api_index')
+        ->load($this->indexId);
       unset($this->indexId);
     }
   }
@@ -455,6 +521,9 @@ public function __toString() {
       $ret .= 'Parsed keys: ' . str_replace("\n", "\n  ", var_export($this->keys, TRUE)) . "\n";
       $ret .= 'Searched fields: ' . (isset($this->fields) ? implode(', ', $this->fields) : '[ALL]') . "\n";
     }
+    if (isset($this->languages)) {
+      $ret .= 'Searched languages: ' . implode(', ', $this->languages) . "\n";
+    }
     if ($conditions = (string) $this->conditionGroup) {
       $conditions = str_replace("\n", "\n  ", $conditions);
       $ret .= "Conditions:\n  $conditions\n";
@@ -466,46 +535,31 @@ public function __toString() {
       }
       $ret .= 'Sorting: ' . implode(', ', $sorts) . "\n";
     }
-    // @todo Fix for entities contained in options (which might kill
-    //   var_export() due to circular references).
-    $ret .= 'Options: ' . str_replace("\n", "\n  ", var_export($this->options, TRUE)) . "\n";
+    $options = $this->sanitizeOptions($this->options);
+    $options = str_replace("\n", "\n  ", var_export($options, TRUE));
+    $ret .= 'Options: ' . $options . "\n";
     return $ret;
   }
 
   /**
-   * {@inheritdoc}
-   */
-  public function addTag($tag) {
-    $this->tags[$tag] = $tag;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function hasTag($tag) {
-    return isset($this->tags[$tag]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function hasAllTags() {
-    return !array_diff_key(array_flip(func_get_args()), $this->tags);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function hasAnyTag() {
-    return (bool) array_intersect_key(array_flip(func_get_args()), $this->tags);
-  }
-
-  /**
-   * {@inheritdoc}
+   * Sanitizes an array of options in a way that plays nice with var_export().
+   *
+   * @param array $options
+   *   An array of options.
+   *
+   * @return array
+   *   The sanitized options.
    */
-  public function &getTags() {
-    return $this->tags;
+  protected function sanitizeOptions(array $options) {
+    foreach ($options as $key => $value) {
+      if (is_object($value)) {
+        $options[$key] = 'object (' . get_class($value) . ')';
+      }
+      elseif (is_array($value)) {
+        $options[$key] = $this->sanitizeOptions($value);
+      }
+    }
+    return $options;
   }
 
 }
diff --git a/src/Query/QueryInterface.php b/src/Query/QueryInterface.php
index c4d9407..018f297 100644
--- a/src/Query/QueryInterface.php
+++ b/src/Query/QueryInterface.php
@@ -72,6 +72,26 @@ public function getParseMode();
   public function setParseMode($parse_mode);
 
   /**
+   * Retrieves the languages that will be searched by this query.
+   *
+   * @return string[]|null
+   *   The language codes of languages that will be searched by this query, or
+   *   NULL if there shouldn't be any restriction on the language.
+   */
+  public function getLanguages();
+
+  /**
+   * Sets the languages that should be searched by this query.
+   *
+   * @param string[]|null $languages
+   *   The language codes to search for, or NULL to not restrict the query to
+   *   specific languages.
+   *
+   * @return $this
+   */
+  public function setLanguages(array $languages = NULL);
+
+  /**
    * Creates a new condition group to use with this query object.
    *
    * @param string $conjunction
diff --git a/src/Tests/IntegrationTest.php b/src/Tests/IntegrationTest.php
index 63bb90c..3b40573 100644
--- a/src/Tests/IntegrationTest.php
+++ b/src/Tests/IntegrationTest.php
@@ -740,7 +740,6 @@ protected function removeFieldsFromIndex() {
   protected function configureFilter() {
     $edit = array(
       'status[ignorecase]' => 1,
-      'processors[ignorecase][settings][fields][search_api_language]' => FALSE,
       'processors[ignorecase][settings][fields][title]' => 'title',
     );
     $this->drupalPostForm($this->getIndexPath('processors'), $edit, $this->t('Save'));
@@ -748,7 +747,13 @@ protected function configureFilter() {
     $processors = $index->getProcessors();
     if (isset($processors['ignorecase'])) {
       $configuration = $processors['ignorecase']->getConfiguration();
-      $this->assertTrue(empty($configuration['fields']['search_api_language']), 'Language field disabled for ignore case filter.');
+      unset($configuration['weights']);
+      $expected = array(
+        'fields' => array(
+          'title',
+        ),
+      );
+      $this->assertEqual($expected, $configuration, 'Title field enabled for ignore case filter.');
     }
     else {
       $this->fail('"Ignore case" processor not enabled.');
@@ -771,7 +776,6 @@ public function configureFilterPage() {
   protected function checkProcessorChanges() {
     $edit = array(
       'status[ignorecase]' => 1,
-      'processors[ignorecase][settings][fields][search_api_language]' => FALSE,
       'processors[ignorecase][settings][fields][title]' => 'title',
     );
     // Enable just the ignore case processor, just to have a clean default state
diff --git a/src/Tests/ProcessorIntegrationTest.php b/src/Tests/ProcessorIntegrationTest.php
index 2172274..e1a58fa 100644
--- a/src/Tests/ProcessorIntegrationTest.php
+++ b/src/Tests/ProcessorIntegrationTest.php
@@ -42,8 +42,8 @@ public function setUp() {
    * avoid the overhead of having one test per processor.
    */
   public function testProcessorIntegration() {
-    // By default, the add_url and language processors are already enabled.
-    $enabled = array('language', 'add_url');
+    // The add_url processor is always enabled.
+    $enabled = array('add_url');
     sort($enabled);
     $actual_processors = array_keys($this->loadIndex()->getProcessors());
     sort($actual_processors);
@@ -119,9 +119,8 @@ public function testProcessorIntegration() {
     sort($actual_processors);
     $this->assertEqual($enabled, $actual_processors);
 
-    // The 'language' and 'add_url' processors are are not available to be
-    // removed because they are locked processors.
-    $this->checkLanguageIntegration();
+    // The 'add_url' processor is not available to be removed because it's
+    // locked.
     $this->checkUrlFieldIntegration();
 
     // Check whether disabling processors also works correctly.
@@ -192,73 +191,70 @@ public function checkContentAccessIntegration() {
    * Tests the UI for the "Highlight" processor.
    */
   public function checkHighlightIntegration() {
-    $this->enableProcessor('highlight');
-
-    $edit = array(
-      'processors[highlight][settings][highlight]' => 'never',
-      'processors[highlight][settings][excerpt]' => FALSE,
-      'processors[highlight][settings][excerpt_length]' => 128,
-      'processors[highlight][settings][prefix]' => '<em>',
-      'processors[highlight][settings][suffix]' => '</em>',
+    $configuration = array(
+      'highlight' => 'never',
+      'excerpt' => FALSE,
+      'excerpt_length' => 128,
+      'prefix' => '<em>',
+      'suffix' => '</em>',
     );
-    $this->editSettingsForm($edit, 'highlight');
+    $this->editSettingsForm($configuration, 'highlight');
   }
 
   /**
    * Tests the UI for the "HTML filter" processor.
    */
   public function checkHtmlFilterIntegration() {
-    // Enable the "HTML filter" processor in the same request as setting the
-    // settings, since we otherwise run into a weird bug only present in the
-    // testing environment regarding the YAML in the "tags" setting.
-    $edit = array(
-      'status[html_filter]' => 1,
-      'processors[html_filter][settings][fields][search_api_language]' => FALSE,
-      'processors[html_filter][settings][title]' => FALSE,
-      'processors[html_filter][settings][alt]' => FALSE,
-      'processors[html_filter][settings][tags]' => 'h1: 10',
+    $configuration = $form_values = array(
+      'title' => FALSE,
+      'alt' => FALSE,
+      'tags' => array(
+        'h1' => 10,
+      ),
     );
-    $this->editSettingsForm($edit, 'html_filter');
+    $form_values['tags'] = 'h1: 10';
+    $this->editSettingsForm($configuration, 'html_filter', $form_values);
   }
 
   /**
    * Tests the UI for the "Ignore case" processor.
    */
   public function checkIgnoreCaseIntegration() {
-    $this->enableProcessor('ignorecase');
-
-    $edit = array(
-      'processors[ignorecase][settings][fields][search_api_language]' => FALSE,
-    );
-    $this->editSettingsForm($edit, 'ignorecase');
+    $this->editSettingsForm(array(), 'ignorecase');
   }
 
   /**
    * Tests the UI for the "Ignore characters" processor.
    */
   public function checkIgnoreCharactersIntegration() {
-    $this->enableProcessor('ignore_character');
-
-    $edit = array(
-      'processors[ignore_character][settings][fields][search_api_language]' => FALSE,
-      'processors[ignore_character][settings][ignorable]' => '[¿¡!?,.]',
-      'processors[ignore_character][settings][strip][character_sets][Cc]' => TRUE,
+    $configuration = $form_values = array(
+      'ignorable' => '[¿¡!?,.]',
+      'strip' => array(
+        'character_sets' => array(
+          'Pc' => 'Pc',
+          'Pd' => 'Pd',
+          'Pe' => 'Pe',
+          'Pf' => 'Pf',
+          'Pi' => 'Pi',
+          'Po' => 'Po',
+          'Ps' => 'Ps',
+          'Cc' => 'Cc',
+          'Cf' => FALSE,
+          'Co' => FALSE,
+          'Mc' => FALSE,
+          'Me' => FALSE,
+          'Mn' => FALSE,
+          'Sc' => FALSE,
+          'Sk' => FALSE,
+          'Sm' => FALSE,
+          'So' => FALSE,
+          'Zl' => FALSE,
+          'Zp' => FALSE,
+          'Zs' => FALSE,
+        ),
+      ),
     );
-    $this->editSettingsForm($edit, 'ignore_character');
-  }
-
-  /**
-   * Tests the UI for the "Language" processor.
-   */
-  public function checkLanguageIntegration() {
-    $index = $this->loadIndex();
-    $processors = $index->getProcessors();
-    $this->assertTrue(!empty($processors['language']), 'The "language" processor is enabled by default.');
-    $index->removeProcessor('language');
-    $index->save();
-
-    $processors = $this->loadIndex()->getProcessors();
-    $this->assertTrue(!empty($processors['language']), 'The "language" processor cannot be disabled.');
+    $this->editSettingsForm($configuration, 'ignore_character', $form_values);
   }
 
   /**
@@ -272,52 +268,51 @@ public function checkNodeStatusIntegration() {
    * Tests the UI for the "Rendered item" processor.
    */
   public function checkRenderedItemIntegration() {
-    $this->enableProcessor('rendered_item');
-
-    $edit = array(
-      'processors[rendered_item][settings][roles][]' => 'authenticated',
-      'processors[rendered_item][settings][view_mode][entity:node][page]' => 'default',
-      'processors[rendered_item][settings][view_mode][entity:node][article]' => 'default',
+    $configuration = $form_values = array(
+      'roles' => array(
+        'authenticated' => 'authenticated',
+      ),
+      'view_mode' => array(
+        'entity:node' => array(
+          'page' => 'default',
+          'article' => 'default',
+        ),
+      ),
     );
-    $this->editSettingsForm($edit, 'rendered_item');
+    $form_values['roles'] = array('authenticated');
+    $this->editSettingsForm($configuration, 'rendered_item', $form_values);
   }
 
   /**
    * Tests the UI for the "Stopwords" processor.
    */
   public function checkStopWordsIntegration() {
-    $this->enableProcessor('stopwords');
-
-    $edit = array(
-      'processors[stopwords][settings][stopwords]' => 'the',
+    $configuration = array(
+      'stopwords' => array('the'),
     );
-    $this->editSettingsForm($edit, 'stopwords');
+    $form_values = array(
+      'stopwords' => 'the',
+    );
+    $this->editSettingsForm($configuration, 'stopwords', $form_values);
   }
 
   /**
    * Tests the UI for the "Tokenizer" processor.
    */
   public function checkTokenizerIntegration() {
-    $this->enableProcessor('tokenizer');
-
-    $edit = array(
-      'processors[tokenizer][settings][spaces]' => '',
-      'processors[tokenizer][settings][overlap_cjk]' => FALSE,
-      'processors[tokenizer][settings][minimum_word_size]' => 2,
+    $configuration = array(
+      'spaces' => '',
+      'overlap_cjk' => FALSE,
+      'minimum_word_size' => 2,
     );
-    $this->editSettingsForm($edit, 'tokenizer');
+    $this->editSettingsForm($configuration, 'tokenizer');
   }
 
   /**
    * Tests the UI for the "Transliteration" processor.
    */
   public function checkTransliterationIntegration() {
-    $this->enableProcessor('transliteration');
-
-    $edit = array(
-      'processors[transliteration][settings][fields][search_api_language]' => FALSE,
-    );
-    $this->editSettingsForm($edit, 'transliteration');
+    $this->editSettingsForm(array(), 'transliteration');
   }
 
   /**
@@ -352,29 +347,78 @@ protected function enableProcessor($processor_id) {
   }
 
   /**
-   * Edits a processor's settings.
+   * Enables a processor with a given configuration.
    *
-   * @param array $edit
-   *   The settings to set for the processor.
+   * @param array $configuration
+   *   The configuration to set for the processor.
    * @param string $processor_id
-   *   The ID of the processor whose settings are edited.
+   *   The ID of the processor to edit.
+   * @param array|null $form_values
+   *   (optional) The processor configuration to set, as it appears in the form.
+   *   Only relevant if the processor does some processing on the form values
+   *   before storing them, like parsing YAML or cleaning up checkboxes values.
+   *   Defaults to using $configuration as-is.
+   * @param bool $enable
+   *   (optional) If TRUE, explicitly enable the processor. If FALSE, it should
+   *   already be enabled.
    */
-  protected function editSettingsForm($edit, $processor_id) {
+  protected function editSettingsForm(array $configuration, $processor_id, array $form_values = NULL, $enable = TRUE) {
+    if (!isset($form_values)) {
+      $form_values = $configuration;
+    }
+
     $this->loadProcessorsTab();
 
+    $edit = $this->getFormValues($form_values, "processors[$processor_id][settings]");
+    if ($enable) {
+      $edit["status[$processor_id]"] = 1;
+    }
     $this->drupalPostForm(NULL, $edit, $this->t('Save'));
 
     $processors = $this->loadIndex()->getProcessors();
-    // @todo Actually test something here. Idea: pass in a $configuration array,
-    //   convert to POST format in here automatically and then check if the
-    //   processor's configuration matches.
-    if (isset($processors[$processor_id])) {
-      $configuration = $processors[$processor_id]->getConfiguration();
-      $this->assertTrue(empty($configuration['fields']['search_api_language']));
+    $processor_present = !empty($processors[$processor_id]);
+    $this->assertTrue($processor_present, "Successfully enabled the '$processor_id' processor.'");
+    if ($processor_present) {
+      $actual_configuration = $processors[$processor_id]->getConfiguration();
+      unset($actual_configuration['fields'], $actual_configuration['weights']);
+      $configuration += $processors[$processor_id]->defaultConfiguration();
+      $this->assertEqual($configuration, $actual_configuration, "Processor configuration for processor '$processor_id' was set correctly.");
     }
-    else {
-      $this->fail($processor_id . ' settings not applied.');
+  }
+
+  /**
+   * Converts a configuration array into an array of form values.
+   *
+   * @param array $configuration
+   *   The configuration to convert.
+   * @param string $prefix
+   *   The common prefix for all form values.
+   *
+   * @return string[]
+   *   An array of form values ready for submission.
+   */
+  protected function getFormValues(array $configuration, $prefix) {
+    $edit = array();
+
+    foreach ($configuration as $key => $value) {
+      $key = $prefix . "[$key]";
+      if (is_array($value)) {
+        // Handling of numerically indexed and associative arrays needs to be
+        // different.
+        if ($value == array_values($value)) {
+          $key .= '[]';
+          $edit[$key] = $value;
+        }
+        else {
+          $edit += $this->getFormValues($value, $key);
+        }
+      }
+      else {
+        $edit[$key] = $value;
+      }
     }
+
+    return $edit;
   }
 
   /**
diff --git a/src/Tests/ViewsTest.php b/src/Tests/ViewsTest.php
index 12c529b..11ef530 100644
--- a/src/Tests/ViewsTest.php
+++ b/src/Tests/ViewsTest.php
@@ -115,7 +115,7 @@ public function testView() {
     $this->checkResults($query, array(1, 2, 3, 4, 5), 'Search with ID "not empty" filter');
 
     $this->checkResults(array('keywords[value]' => 'apple'), array(2, 4), 'Search with Keywords filter');
-    // @todo Enable "between" again. See #2624870.
+    // @todo Enable "between" again. See #2695627.
 //    $query = array(
 //      'keywords[min]' => 'aardvark',
 //      'keywords[max]' => 'calypso',
@@ -142,6 +142,26 @@ public function testView() {
     $this->checkResults($query, array(1, 2, 4, 5), 'Search with Keywords "not empty" filter');
 
     $query = array(
+      'language' => array('***LANGUAGE_language_content***'),
+    );
+    $this->checkResults($query, array(1, 2, 3, 4, 5), 'Search with "Page content language" filter');
+    $query = array(
+      'language' => array('en'),
+    );
+    $this->checkResults($query, array(1, 2, 3, 4, 5), 'Search with "English" language filter');
+    $query = array(
+      'language' => array('und'),
+    );
+    $this->checkResults($query, array(), 'Search with "Not specified" language filter');
+    $query = array(
+      'language' => array(
+        '***LANGUAGE_language_interface***',
+        'zxx',
+      ),
+    );
+    $this->checkResults($query, array(1, 2, 3, 4, 5), 'Search with multiple languages filter');
+
+    $query = array(
       'search_api_fulltext' => 'foo to test',
       'id[value]' => 2,
       'id_op' => '>',
@@ -226,7 +246,7 @@ public function testViewsAdmin() {
     $this->assertText($this->t('Authored on'));
     $this->assertText($this->t('Body (indexed field)'));
     $this->assertText($this->t('Index Test index'));
-    $this->assertText($this->t('Entity ID'));
+    $this->assertText($this->t('Item ID'));
     $this->assertText($this->t('Excerpt'));
     $this->assertText($this->t('The search result excerpted to show found search terms'));
     $this->assertText($this->t('Relevance'));
diff --git a/src/Utility.php b/src/Utility.php
index 2cf7521..7a17b44 100644
--- a/src/Utility.php
+++ b/src/Utility.php
@@ -394,6 +394,7 @@ public static function isFieldIdReserved($field_id) {
     $reserved_ids = array_flip(array(
       'search_api_id',
       'search_api_datasource',
+      'search_api_language',
       'search_api_relevance',
     ));
     return isset($reserved_ids[$field_id]);
diff --git a/tests/search_api_test_db/config/install/search_api.index.database_search_index.yml b/tests/search_api_test_db/config/install/search_api.index.database_search_index.yml
index c88bcae..1cf0b94 100644
--- a/tests/search_api_test_db/config/install/search_api.index.database_search_index.yml
+++ b/tests/search_api_test_db/config/install/search_api.index.database_search_index.yml
@@ -39,12 +39,6 @@ field_settings:
     type: decimal
     datasource_id: 'entity:entity_test'
     property_path: width
-  search_api_language:
-    label: 'Item language'
-    type: string
-    property_path: search_api_language
-    index_locked: true
-    type_locked: true
 processor_settings:
   add_url:
     plugin_id: add_url
diff --git a/tests/search_api_test_views/config/install/views.view.search_api_test_view.yml b/tests/search_api_test_views/config/install/views.view.search_api_test_view.yml
index 47400ce..e0445fc 100644
--- a/tests/search_api_test_views/config/install/views.view.search_api_test_view.yml
+++ b/tests/search_api_test_views/config/install/views.view.search_api_test_view.yml
@@ -153,6 +153,31 @@ display:
               anonymous: '0'
               administrator: '0'
           is_grouped: false
+        search_api_language:
+          plugin_id: search_api_language
+          id: search_api_language
+          table: search_api_index_database_search_index
+          field: search_api_language
+          relationship: none
+          admin_label: ''
+          operator: 'in'
+          group: 1
+          exposed: true
+          expose:
+            operator_id: language_op
+            label: ''
+            description: ''
+            use_operator: true
+            operator: language_op
+            identifier: language
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+          is_grouped: false
       sorts:
         search_api_id:
           id: search_api_id
diff --git a/tests/src/Kernel/LanguageKernelTest.php b/tests/src/Kernel/LanguageKernelTest.php
index b1e2321..87cd9c3 100644
--- a/tests/src/Kernel/LanguageKernelTest.php
+++ b/tests/src/Kernel/LanguageKernelTest.php
@@ -8,6 +8,7 @@
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\search_api\Entity\Index;
 use Drupal\search_api\Entity\Server;
+use Drupal\search_api\Utility;
 
 /**
  * Tests translation handling of the content entity datasource.
@@ -201,6 +202,20 @@ public function testItemTranslations() {
     );
     $this->assertEquals($expected, $datasource_item_ids, 'Datasource returns correct item ids for a translated entity.');
 
+    // Test whether all items report the correct language.
+    foreach ($datasource->loadMultiple($datasource_item_ids) as $id => $object) {
+      list(, $langcode) = explode(':', $id, 2);
+      $item = Utility::createItemFromObject($this->index, $object, NULL, $datasource);
+      $this->assertEquals($langcode, $item->getLanguage(), "Item with ID '$id' has the correct language set.");
+    }
+
+    // Tests that a query with an empty array of languages will return an empty
+    // result set, without going through the server. (Our test backend wouldn't
+    // care about languages.)
+    $results = $this->index->query()->setLanguages(array())->execute();
+    $this->assertEquals(0, $results->getResultCount(), 'Query with empty languages list returned correct number of results.');
+    $this->assertEquals(array(), $results->getResultItems(), 'Query with empty languages list returned correct result.');
+
     // Test that the index needs to be updated.
     $this->assertEquals(1, $this->index->getTrackerInstance()->getIndexedItemsCount(), 'The updated items needs to be reindexed.');
     $this->assertEquals(4, $this->index->getTrackerInstance()->getTotalItemsCount(), 'There are four items in total.');
diff --git a/tests/src/Unit/Plugin/Processor/LanguageTest.php b/tests/src/Unit/Plugin/Processor/LanguageTest.php
deleted file mode 100644
index 60ae8e0..0000000
--- a/tests/src/Unit/Plugin/Processor/LanguageTest.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-namespace Drupal\Tests\search_api\Unit\Plugin\Processor;
-
-use Drupal\Core\Entity\Plugin\DataType\EntityAdapter;
-use Drupal\Core\Language\Language as CoreLanguage;
-use Drupal\Core\TypedData\DataDefinitionInterface;
-use Drupal\search_api\Plugin\search_api\processor\Language;
-use Drupal\Tests\UnitTestCase;
-
-/**
- * Tests the "Language" processor.
- *
- * @group search_api
- *
- * @see \Drupal\search_api\Plugin\search_api\processor\Language
- */
-class LanguageTest extends UnitTestCase {
-
-  use TestItemsTrait;
-
-  /**
-   * The processor to be tested.
-   *
-   * @var \Drupal\search_api\Plugin\search_api\processor\Language
-   */
-  protected $processor;
-
-  /**
-   * A test index mock to use for tests.
-   *
-   * @var \Drupal\search_api\IndexInterface
-   */
-  protected $index;
-
-  /**
-   * Creates a new processor object for use in the tests.
-   */
-  protected function setUp() {
-    parent::setUp();
-
-    $this->index = $this->getMock('Drupal\search_api\IndexInterface');
-
-    /** @var \Drupal\Core\StringTranslation\TranslationInterface $translation */
-    $translation = $this->getStringTranslationStub();
-    $this->processor = new Language(array(), 'language', array());
-    $this->processor->setStringTranslation($translation);
-  }
-
-  /**
-   * Tests whether the "Item language" field is properly added to the index.
-   *
-   * @see \Drupal\search_api\Plugin\search_api\processor\Language::alterPropertyDefinitions()
-   */
-  public function testAlterProperties() {
-    // Test whether the property gets properly added to the
-    // datasource-independent properties.
-    $properties = array();
-    $this->processor->alterPropertyDefinitions($properties);
-    $this->assertTrue(!empty($properties['search_api_language']), '"search_api_language" property got added.');
-    if (!empty($properties['search_api_language'])) {
-      $this->assertInstanceOf('Drupal\Core\TypedData\DataDefinitionInterface', $properties['search_api_language'], 'Added "search_api_language" property implements the necessary interface.');
-      if ($properties['search_api_language'] instanceof DataDefinitionInterface) {
-        $this->assertEquals('Item language', $properties['search_api_language']->getLabel(), 'Correct label for "search_api_language" property.');
-        $this->assertEquals('The language code of the item', $properties['search_api_language']->getDescription(), 'Correct description for "search_api_language" property.');
-        $this->assertEquals('string', $properties['search_api_language']->getDataType(), 'Correct type for "search_api_language" property.');
-      }
-    }
-
-    // Test whether the properties of specific datasources stay untouched.
-    $properties = array();
-    /** @var \Drupal\search_api\Datasource\DatasourceInterface $datasource */
-    $datasource = $this->getMock('Drupal\search_api\Datasource\DatasourceInterface');
-    $this->processor->alterPropertyDefinitions($properties, $datasource);
-    $this->assertEmpty($properties, 'Datasource-specific properties did not get changed.');
-  }
-
-  /**
-   * Tests whether the "Item language" field is properly added to indexed items.
-   *
-   * @see \Drupal\search_api\Plugin\search_api\processor\Language::preprocessIndexItems()
-   */
-  public function testPreprocessIndexItems() {
-    $fields = array(
-      'search_api_language' => array(
-        'type' => 'string',
-      ),
-    );
-    $items = $this->createItems($this->index, 3, $fields);
-
-    $object1 = $this->getMock('Drupal\Tests\search_api\TestContentEntityInterface');
-    $object1->expects($this->any())
-      ->method('language')
-      ->will($this->returnValue(new CoreLanguage(array('id' => 'en'))));
-    /** @var \Drupal\Core\Entity\ContentEntityInterface $object1 */
-    $items[$this->itemIds[0]]->setOriginalObject(EntityAdapter::createFromEntity($object1));
-
-    $object2 = $this->getMock('Drupal\Tests\search_api\TestContentEntityInterface');
-    $object2->expects($this->any())
-      ->method('language')
-      ->will($this->returnValue(new CoreLanguage(array('id' => 'es'))));
-    /** @var \Drupal\Core\Entity\ContentEntityInterface $object2 */
-    $items[$this->itemIds[1]]->setOriginalObject(EntityAdapter::createFromEntity($object2));
-
-    $object3 = $this->getMock('Drupal\Tests\search_api\TestComplexDataInterface');
-    /** @var \Drupal\Tests\search_api\TestComplexDataInterface $object3 */
-    $items[$this->itemIds[2]]->setOriginalObject($object3);
-
-    $this->processor->preprocessIndexItems($items);
-
-    $this->assertEquals(array('en'), $items[$this->itemIds[0]]->getField('search_api_language')->getValues(), 'The "Item language" value was correctly set for an English item.');
-    $this->assertEquals(array('es'), $items[$this->itemIds[1]]->getField('search_api_language')->getValues(), 'The "Item language" value was correctly set for a Spanish item.');
-    $this->assertEquals(array(CoreLanguage::LANGCODE_NOT_SPECIFIED), $items[$this->itemIds[2]]->getField('search_api_language')->getValues(), 'The "Item language" value was correctly set for a non-translatable item.');
-  }
-
-}
