diff --git a/src/Plugin/search_api/processor/Highlight.php b/src/Plugin/search_api/processor/Highlight.php
index 1c690766..b0364f1b 100644
--- a/src/Plugin/search_api/processor/Highlight.php
+++ b/src/Plugin/search_api/processor/Highlight.php
@@ -367,7 +367,7 @@ protected function getFulltextFields(array $result_items, array $fulltext_fields
    *   An array of all unique positive keywords used in the query.
    */
   protected function getKeywords(QueryInterface $query) {
-    $keys = $query->getKeys();
+    $keys = $query->getOriginalKeys();
     if (!$keys) {
       return [];
     }
diff --git a/tests/src/Unit/Plugin/Processor/HighlightTest.php b/tests/src/Unit/Plugin/Processor/HighlightTest.php
index a7c6e873..b98a5f22 100644
--- a/tests/src/Unit/Plugin/Processor/HighlightTest.php
+++ b/tests/src/Unit/Plugin/Processor/HighlightTest.php
@@ -149,7 +149,7 @@ public function testPostprocessSearchResultsWithoutKeywords() {
       ->getMock();
 
     $query->expects($this->once())
-      ->method('getKeys')
+      ->method('getOriginalKeys')
       ->will($this->returnValue([]));
 
     $results->expects($this->once())
@@ -174,7 +174,7 @@ public function testPostprocessSearchResultsWithResults() {
       ->method('getProcessingLevel')
       ->willReturn(QueryInterface::PROCESSING_FULL);
     $query->expects($this->atLeastOnce())
-      ->method('getKeys')
+      ->method('getOriginalKeys')
       ->will($this->returnValue('foo'));
     /** @var \Drupal\search_api\Query\QueryInterface $query */
 
@@ -220,7 +220,7 @@ public function testPostprocessSearchResultsWithChangedPrefixSuffix() {
       ->method('getProcessingLevel')
       ->willReturn(QueryInterface::PROCESSING_FULL);
     $query->expects($this->atLeastOnce())
-      ->method('getKeys')
+      ->method('getOriginalKeys')
       ->will($this->returnValue(['#conjunction' => 'AND', 'foo']));
     /** @var \Drupal\search_api\Query\QueryInterface $query */
 
@@ -263,7 +263,7 @@ public function testPostprocessSearchResultsWithoutHighlight() {
       ->method('getProcessingLevel')
       ->willReturn(QueryInterface::PROCESSING_FULL);
     $query->expects($this->atLeastOnce())
-      ->method('getKeys')
+      ->method('getOriginalKeys')
       ->will($this->returnValue(['#conjunction' => 'AND', 'foo']));
     /** @var \Drupal\search_api\Query\QueryInterface $query */
 
@@ -306,7 +306,7 @@ public function testPostprocessSearchResultsHighlightPartial() {
       ->method('getProcessingLevel')
       ->willReturn(QueryInterface::PROCESSING_FULL);
     $query->expects($this->atLeastOnce())
-      ->method('getKeys')
+      ->method('getOriginalKeys')
       ->will($this->returnValue(['#conjunction' => 'AND', 'partial']));
     /** @var \Drupal\search_api\Query\QueryInterface $query */
 
@@ -347,7 +347,7 @@ public function testPostprocessSearchResultsWithPreviousHighlighting() {
       ->method('getProcessingLevel')
       ->willReturn(QueryInterface::PROCESSING_FULL);
     $query->expects($this->atLeastOnce())
-      ->method('getKeys')
+      ->method('getOriginalKeys')
       ->will($this->returnValue(['#conjunction' => 'AND', 'foo']));
     /** @var \Drupal\search_api\Query\QueryInterface $query */
 
@@ -393,7 +393,7 @@ public function testPostprocessSearchResultsExcerpt() {
       ->method('getProcessingLevel')
       ->willReturn(QueryInterface::PROCESSING_FULL);
     $query->expects($this->atLeastOnce())
-      ->method('getKeys')
+      ->method('getOriginalKeys')
       ->will($this->returnValue(['#conjunction' => 'AND', 'congue']));
     /** @var \Drupal\search_api\Query\QueryInterface $query */
 
@@ -436,7 +436,7 @@ public function testPostprocessSearchResultsExerptMatchNearEnd() {
       ->method('getProcessingLevel')
       ->willReturn(QueryInterface::PROCESSING_FULL);
     $query->expects($this->atLeastOnce())
-      ->method('getKeys')
+      ->method('getOriginalKeys')
       ->will($this->returnValue(['#conjunction' => 'AND', 'diam']));
     /** @var \Drupal\search_api\Query\QueryInterface $query */
 
@@ -481,7 +481,7 @@ public function testPostprocessSearchResultsWithChangedExcerptLength() {
       ->method('getProcessingLevel')
       ->willReturn(QueryInterface::PROCESSING_FULL);
     $query->expects($this->atLeastOnce())
-      ->method('getKeys')
+      ->method('getOriginalKeys')
       ->will($this->returnValue('congue'));
     /** @var \Drupal\search_api\Query\QueryInterface $query */
 
@@ -526,7 +526,7 @@ public function testPostprocessSearchResultsWithoutExcerpt() {
       ->method('getProcessingLevel')
       ->willReturn(QueryInterface::PROCESSING_FULL);
     $query->expects($this->atLeastOnce())
-      ->method('getKeys')
+      ->method('getOriginalKeys')
       ->will($this->returnValue(['#conjunction' => 'AND', 'congue']));
     /** @var \Drupal\search_api\Query\QueryInterface $query */
 
@@ -583,7 +583,7 @@ public function testPostprocessSearchResultsWithComplexKeys() {
       ->method('getProcessingLevel')
       ->willReturn(QueryInterface::PROCESSING_FULL);
     $query->expects($this->atLeastOnce())
-      ->method('getKeys')
+      ->method('getOriginalKeys')
       ->will($this->returnValue($keys));
     /** @var \Drupal\search_api\Query\QueryInterface $query */
 
@@ -628,7 +628,7 @@ public function testPostprocessSearchResultsWithTwoFields() {
       ->method('getProcessingLevel')
       ->willReturn(QueryInterface::PROCESSING_FULL);
     $query->expects($this->atLeastOnce())
-      ->method('getKeys')
+      ->method('getOriginalKeys')
       ->will($this->returnValue(['#conjunction' => 'AND', 'foo']));
     /** @var \Drupal\search_api\Query\QueryInterface $query */
 
@@ -686,7 +686,7 @@ public function testPostprocessSearchResultsWithTwoItems() {
       ->method('getProcessingLevel')
       ->willReturn(QueryInterface::PROCESSING_FULL);
     $query->expects($this->atLeastOnce())
-      ->method('getKeys')
+      ->method('getOriginalKeys')
       ->will($this->returnValue(['#conjunction' => 'OR', 'foo']));
     /** @var \Drupal\search_api\Query\QueryInterface $query */
 
@@ -737,7 +737,7 @@ public function testExcerptExcludeFields() {
       ->method('getProcessingLevel')
       ->willReturn(QueryInterface::PROCESSING_FULL);
     $query->expects($this->atLeastOnce())
-      ->method('getKeys')
+      ->method('getOriginalKeys')
       ->will($this->returnValue(['#conjunction' => 'AND', 'foo']));
     /** @var \Drupal\search_api\Query\QueryInterface $query */
 
@@ -891,7 +891,7 @@ public function testFieldExtraction() {
     $this->processor->setConfiguration(['excerpt' => FALSE]);
     /** @var \Drupal\search_api\Query\QueryInterface|\PHPUnit_Framework_MockObject_MockObject $query */
     $query = $this->getMock(QueryInterface::class);
-    $query->method('getKeys')
+    $query->method('getOriginalKeys')
       ->willReturn('foo');
     $query->expects($this->once())
       ->method('getProcessingLevel')