reverted:
--- b/src/Plugin/Field/FieldType/EntityReferenceRevisionsItem.php
+++ a/src/Plugin/Field/FieldType/EntityReferenceRevisionsItem.php
@@ -402,7 +402,7 @@
    */
   public static function onDependencyRemoval(FieldDefinitionInterface $field_definition, array $dependencies) {
     $changed = FALSE;
+    $entity_manager = \Drupal::entityManager();
-    $entity_manager = \Drupal::entityTypeManager();
     $target_entity_type = $entity_manager->getDefinition($field_definition->getFieldStorageDefinition()
       ->getSetting('target_type'));
     $handler_settings = $field_definition->getSetting('handler_settings');
reverted:
--- b/src/Plugin/views/display/EntityReferenceRevisions.php
+++ a/src/Plugin/views/display/EntityReferenceRevisions.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\entity_reference_revisions\Plugin\views\display;
 
-use Drupal\Core\Database\Query\Condition;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
 
 /**
@@ -124,13 +123,13 @@
     // Restrict the autocomplete options based on what's been typed already.
     if (isset($options['match'])) {
       $style_options = $this->getOption('style');
+      $value = db_like($options['match']) . '%';
-      $value = \Drupal::database()->escapeLike($options['match']) . '%';
       if ($options['match_operator'] != 'STARTS_WITH') {
         $value = '%' . $value;
       }
 
       // Multiple search fields are OR'd together.
+      $conditions = db_or();
-      $conditions = new Condition('OR');
 
       // Build the condition using the selected search fields.
       foreach ($style_options['options']['search_fields'] as $field_alias) {
diff -u b/tests/src/Kernel/EntityReferenceRevisionsCompositeTest.php b/tests/src/Kernel/EntityReferenceRevisionsCompositeTest.php
--- b/tests/src/Kernel/EntityReferenceRevisionsCompositeTest.php
+++ b/tests/src/Kernel/EntityReferenceRevisionsCompositeTest.php
@@ -114,16 +114,16 @@
 
     // Assert that there is only 1 revision when creating a node.
     $node_revisions_count = \Drupal::entityQuery('node')->condition('nid', $node->id())->allRevisions()->count()->execute();
-    $this->assertEquals($node_revisions_count, 1);
+    $this->assertEquals(1, $node_revisions_count);
     // Assert there is no new composite revision after creating a host entity.
     $composite_revisions_count = \Drupal::entityQuery('entity_test_composite')->condition('uuid', $composite->uuid())->allRevisions()->count()->execute();
     $this->assertEquals(1, $composite_revisions_count);
 
     // Verify the value of parent type and id after create a node.
     $composite = EntityTestCompositeRelationship::load($composite->id());
-    $this->assertEquals($composite->parent_type->value, $node->getEntityTypeId());
-    $this->assertEquals($composite->parent_id->value, $node->id());
-    $this->assertEquals($composite->parent_field_name->value, 'composite_reference');
+    $this->assertEquals($node->getEntityTypeId(), $composite->parent_type->value);
+    $this->assertEquals($node->id(), $composite->parent_id->value);
+    $this->assertEquals('composite_reference', $composite->parent_field_name->value);
     // Create second revision of the node.
     $original_composite_revision = $node->composite_reference[0]->target_revision_id;
     $original_node_revision = $node->getRevisionId();
@@ -132,22 +132,23 @@
     $node->save();
     $node = Node::load($node->id(), TRUE);
     // Check the revision of the node.
-    $this->assertEquals('2nd revision', $node->getTitle(), 'New node revision has changed data.');
-    $this->assertNotEquals($original_composite_revision, $node->composite_reference[0]->target_revision_id, 'Composite entity got new revision when its host did.');
+    $this->assertEquals($node->getTitle(),'2nd revision', 'New node revision has changed data.');
+    $this->assertNotEquals($node->composite_reference[0]->target_revision_id, $original_composite_revision, 'Composite entity got new revision when its host did.');
 
     // Make sure that there are only 2 revisions.
     $node_revisions_count = \Drupal::entityQuery('node')->condition('nid', $node->id())->allRevisions()->count()->execute();
-    $this->assertEquals($node_revisions_count, 2);
+    $this->assertEquals(2,$node_revisions_count);
 
     // Revert to first revision of the node.
     $node = $this->entityTypeManager->getStorage('node')->loadRevision($original_node_revision);
     $node->setNewRevision();
     $node->isDefaultRevision(TRUE);
     $node->save();
+//    $node = node_load($node->id(), TRUE);
     $node = Node::load($node->id(), TRUE);
     // Check the revision of the node.
-    $this->assertNotEquals('2nd revision', $node->getTitle(), 'Node did not keep changed title after reversion.');
-    $this->assertNotEquals($original_composite_revision, $node->composite_reference[0]->target_revision_id, 'Composite entity got new revision when its host reverted to an old revision.');
+    $this->assertNotEquals( $node->getTitle(),'2nd revision', 'Node did not keep changed title after reversion.');
+    $this->assertNotEquals($node->composite_reference[0]->target_revision_id, $original_composite_revision, 'Composite entity got new revision when its host reverted to an old revision.');
 
     // Test that removing/changing composite references results in translation
     // changes.
@@ -189,9 +190,9 @@
 
     // Verify the value of parent type and id after create a node.
     $composite = EntityTestCompositeRelationship::load($composite->id());
-    $this->assertEquals($composite->parent_type->value, $node->getEntityTypeId());
-    $this->assertEquals($composite->parent_id->value, $node->id());
-    $this->assertEquals($composite->parent_field_name->value, 'composite_reference');
+    $this->assertEquals($node->getEntityTypeId(), $composite->parent_type->value);
+    $this->assertEquals($node->id(), $composite->parent_id->value);
+    $this->assertEquals('composite_reference', $composite->parent_field_name->value);
     $this->assertTrue($composite->hasTranslation('de'));
 
     // Test that the composite entity is not deleted when the german translation
@@ -244,9 +245,9 @@
 
     // Verify the value of parent type and id after create a node.
     $composite = EntityTestCompositeRelationship::load($composite->id());
-    $this->assertEquals($composite->parent_type->value, $node->getEntityTypeId());
-    $this->assertEquals($composite->parent_id->value, $node->id());
-    $this->assertEquals($composite->parent_field_name->value, 'composite_reference');
+    $this->assertEquals($node->getEntityTypeId(), $composite->parent_type->value);
+    $this->assertEquals($node->id(), $composite->parent_id->value);
+    $this->assertEquals('composite_reference', $composite->parent_field_name->value);
 
     // Test that the composite entity is not when the german translation of the parent is deleted.
     $node->removeTranslation('de');
@@ -288,15 +289,15 @@
     $composite = EntityTestCompositeRelationship::load($composite->id());
     $composite_original_revision_id = $composite->getRevisionId();
     $node_original_revision_id = $node->getRevisionId();
-    $this->assertEquals($composite->parent_type->value, $node->getEntityTypeId());
-    $this->assertEquals($composite->parent_id->value, $node->id());
-    $this->assertEquals($composite->parent_field_name->value, 'composite_reference');
+    $this->assertEquals($node->getEntityTypeId(), $composite->parent_type->value);
+    $this->assertEquals($node->id(), $composite->parent_id->value);
+    $this->assertEquals('composite_reference', $composite->parent_field_name->value);
 
     $node->setNewRevision(TRUE);
     $node->save();
     // Ensure that we saved a new revision ID.
     $composite = EntityTestCompositeRelationship::load($composite->id());
-    $this->assertNotEquals($composite->getRevisionId(), $composite_original_revision_id);
+    $this->assertNotEquals($composite_original_revision_id, $composite->getRevisionId());
 
     // Test that deleting the first revision does not delete the composite.
     $this->entityTypeManager->getStorage('node')->deleteRevision($node_original_revision_id);