diff --git a/src/HelpViewBuilder.php b/src/HelpViewBuilder.php
index a2b4638..17ffb65 100644
--- a/src/HelpViewBuilder.php
+++ b/src/HelpViewBuilder.php
@@ -5,7 +5,6 @@ namespace Drupal\config_help;
 use Drupal\Core\Entity\EntityViewBuilder;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\Core\Theme\Registry;
@@ -25,11 +24,11 @@ class HelpViewBuilder extends EntityViewBuilder {
   protected $token;
 
   /**
-   * The entity query factory class.
+   * The help topic storage instance.
    *
-   * @var \Drupal\Core\Entity\Query\QueryFactory
+   * @var \Drupal\Core\Entity\EntityStorageInterface
    */
-  protected $queryFactory;
+  protected $helpStorage;
 
   /**
    * Creates a new HelpViewBuilder.
@@ -42,18 +41,17 @@ class HelpViewBuilder extends EntityViewBuilder {
    *   The language manager object.
    * @param \Drupal\Core\Utility\Token $token
    *   The token replacement service class.
-   * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
-   *   The query factory service class.
    * @param \Drupal\Core\Theme\Registry $theme_registry
    *   The theme registry.
    */
-  public function __construct(EntityTypeInterface $entity_type, EntityManagerInterface $entity_manager, LanguageManagerInterface $language_manager, Token $token, QueryFactory $query_factory, Registry $theme_registry) {
+  public function __construct(EntityTypeInterface $entity_type, EntityManagerInterface $entity_manager, LanguageManagerInterface $language_manager, Token $token, Registry $theme_registry) {
     $this->entityTypeId = $entity_type->id();
     $this->entityType = $entity_type;
+    // Parent class is using deprecated entity manager.
     $this->entityManager = $entity_manager;
+    $this->helpStorage = $entity_manager->getStorage('help_topic');
     $this->languageManager = $language_manager;
     $this->token = $token;
-    $this->queryFactory = $query_factory;
     $this->themeRegistry = $theme_registry;
   }
 
@@ -65,7 +63,6 @@ class HelpViewBuilder extends EntityViewBuilder {
       $container->get('entity.manager'),
       $container->get('language_manager'),
       $container->get('token'),
-      $container->get('entity.query'),
       $container->get('theme.registry')
     );
   }
@@ -85,7 +82,7 @@ class HelpViewBuilder extends EntityViewBuilder {
 
       // Add in the body.
       $collections = $help_topic->getPluginCollections();
-      /** @var \Drupal\config_help\TextSectionPluginCollection */
+      /** @var \Drupal\config_help\TextSectionPluginCollection $body_collection */
       $body_collection = $collections['body'];
       $build['#body'] = $body_collection->buildRenderArray([$this, 'processBodyItem']);
 
@@ -93,16 +90,15 @@ class HelpViewBuilder extends EntityViewBuilder {
       // entity lists as related, plus topics that have said "Add me to this
       // topic's related list" using the list on field.
       $related = $help_topic->getRelated() +
-        $this->queryFactory->get('help_topic')
+        $this->helpStorage->getQuery()
           ->condition('list_on.*', $help_topic->id())
           ->execute();
 
       $links = [];
-      $storage = $this->entityManager->getStorage('help_topic');
 
       foreach ($related as $other_id) {
         if ($other_id != $help_topic->id()) {
-          $topic = $storage->load($other_id);
+          $topic = $this->helpStorage->load($other_id);
           if ($topic) {
             $links[$other_id] = [
               'title' => $topic->label(),