diff --git a/src/Controller/FaqController.php b/src/Controller/FaqController.php
index 4776008..0ddbf6f 100644
--- a/src/Controller/FaqController.php
+++ b/src/Controller/FaqController.php
@@ -451,7 +451,7 @@ class FaqController extends ControllerBase {
         }
 
 
-        $query = db_select('node', 'n');
+        $query = \Drupal::database()->select('node', 'n');
         $query->join('node_field_data', 'd', 'n.nid = d.nid');
         $query->innerJoin('taxonomy_index', 'ti', 'n.nid = ti.nid');
         $term_node_count = $query->condition('d.status', 1)
diff --git a/src/FaqHelper.php b/src/FaqHelper.php
index 1a51cee..bf592fb 100644
--- a/src/FaqHelper.php
+++ b/src/FaqHelper.php
@@ -54,7 +54,7 @@ class FaqHelper {
     static $count;
 
     if (!isset($count) || !isset($count[$tid])) {
-      $query = db_select('node', 'n')
+      $query = \Drupal::database()->select('node', 'n')
         ->fields('n', array('nid'))
         ->addTag('node_access');
       $query->join('taxonomy_index', 'ti', 'n.nid = ti.nid');
@@ -80,7 +80,7 @@ class FaqHelper {
     static $children;
 
     if (!isset($children)) {
-      $result = db_select('taxonomy_term_hierarchy', 'tth')
+      $result = \Drupal::database()->select('taxonomy_term_hierarchy', 'tth')
         ->fields('tth', array('parent', 'tid'))
         ->execute();
       while ($term = $result->fetch()) {
@@ -123,7 +123,7 @@ class FaqHelper {
       $child_term->depth = $term->depth + 1;
 
       if (FaqHelper::taxonomyTermCountNodes($child_term->id())) {
-        $query = db_select('node', 'n');
+        $query = \Drupal::database()->select('node', 'n');
         $query->join('node_field_data', 'd', 'n.nid = d.nid');
         $ti_alias = $query->innerJoin('taxonomy_index', 'ti', '(n.nid = %alias.nid)');
         $w_alias = $query->leftJoin('faq_weights', 'w', "%alias.tid = {$ti_alias}.tid AND n.nid = %alias.nid");