diff --git a/modules/quant_api/src/Client/QuantClient.php b/modules/quant_api/src/Client/QuantClient.php
index b5469486..1f03c168 100644
--- a/modules/quant_api/src/Client/QuantClient.php
+++ b/modules/quant_api/src/Client/QuantClient.php
@@ -31,6 +31,13 @@ class QuantClient implements QuantClientInterface {
    */
   protected $logger;
 
+  /**
+   * The Guzzle client.
+   *
+   * @var \GuzzleHttp\Client
+   */
+  protected $client;
+
   /**
    * The client account.
    *
diff --git a/modules/quant_api/src/Form/SettingsForm.php b/modules/quant_api/src/Form/SettingsForm.php
index e1107499..c932eb6e 100644
--- a/modules/quant_api/src/Form/SettingsForm.php
+++ b/modules/quant_api/src/Form/SettingsForm.php
@@ -16,6 +16,13 @@ class SettingsForm extends ConfigFormBase {
 
   const SETTINGS = 'quant_api.settings';
 
+  /**
+   * The Quant API client.
+   *
+   * @var \Drupal\quant_api\Client\QuantClientInterface
+   */
+  protected $client;
+
   /**
    * Build the form.
    */
diff --git a/modules/quant_search/src/Controller/Search.php b/modules/quant_search/src/Controller/Search.php
index 640d602e..0397ffe8 100644
--- a/modules/quant_search/src/Controller/Search.php
+++ b/modules/quant_search/src/Controller/Search.php
@@ -20,6 +20,13 @@ class Search extends ControllerBase {
 
   const SETTINGS = 'quant_api.settings';
 
+  /**
+   * The Quant API client.
+   *
+   * @var \Drupal\quant_api\Client\QuantClientInterface
+   */
+  protected $client;
+
   /**
    * Build the form.
    */
@@ -256,7 +263,7 @@ public static function generateSearchRecord($entity, $langcode = NULL) {
 
       foreach ($entity->getTranslationLanguages() as $code => $lang) {
         $language_label = \Drupal::service('string_translation')->translate($language->getName(), [], ['langcode' => $code]);
-        $record["language_${code}"] = $language_label;
+        $record["language_{$code}"] = $language_label;
       }
     }
 
diff --git a/modules/quant_search/src/Form/SearchEntitiesForm.php b/modules/quant_search/src/Form/SearchEntitiesForm.php
index 5b974bc5..b5d02bcc 100644
--- a/modules/quant_search/src/Form/SearchEntitiesForm.php
+++ b/modules/quant_search/src/Form/SearchEntitiesForm.php
@@ -16,6 +16,13 @@ class SearchEntitiesForm extends ConfigFormBase {
 
   const SETTINGS = 'quant_search.entities.settings';
 
+  /**
+   * The Quant API client.
+   *
+   * @var \Drupal\quant_api\Client\QuantClientInterface
+   */
+  protected $client;
+
   /**
    * Build the form.
    */
diff --git a/modules/quant_search/src/Form/SearchIndexForm.php b/modules/quant_search/src/Form/SearchIndexForm.php
index 708d3d07..9e8f2e1a 100644
--- a/modules/quant_search/src/Form/SearchIndexForm.php
+++ b/modules/quant_search/src/Form/SearchIndexForm.php
@@ -16,6 +16,13 @@ class SearchIndexForm extends ConfigFormBase {
 
   const SETTINGS = 'quant_search.index.settings';
 
+  /**
+   * The Quant API client.
+   *
+   * @var \Drupal\quant_api\Client\QuantClientInterface
+   */
+  protected $client;
+
   /**
    * Build the form.
    */
diff --git a/modules/quant_search/src/Form/SearchPagesForm.php b/modules/quant_search/src/Form/SearchPagesForm.php
index 4a34bc30..1ae14f8c 100644
--- a/modules/quant_search/src/Form/SearchPagesForm.php
+++ b/modules/quant_search/src/Form/SearchPagesForm.php
@@ -16,6 +16,13 @@ class SearchPagesForm extends ConfigFormBase {
 
   const SETTINGS = 'quant_api.settings';
 
+  /**
+   * The Quant API client.
+   *
+   * @var \Drupal\quant_api\Client\QuantClientInterface
+   */
+  protected $client;
+
   /**
    * Build the form.
    */