diff --git a/api.php b/api.php
index 4413a48..3dcbe1a 100644
--- a/api.php
+++ b/api.php
@@ -26,10 +26,7 @@
     switch ($type)
     {
         case 0:
-            $engine=$config->preferred_engines['text'];
-            if (is_null($engine))
-                $engine = "google";
-            require "engines/$engine/text.php";
+            require "engines/text.php";
             $results = get_text_results($query, $page);
             break;
         case 1:
diff --git a/engines/ahmia/hidden_service.php b/engines/ahmia/hidden_service.php
index d501b96..16a95db 100644
--- a/engines/ahmia/hidden_service.php
+++ b/engines/ahmia/hidden_service.php
@@ -1,5 +1,5 @@
 <?php
-    function get_hidden_service_results($query)
+    function get_search_results($query)
     {
         global $config;
 
@@ -27,4 +27,5 @@
 
         return $results;
     }
+    require "engines/text.php";
 ?>
diff --git a/engines/bittorrent/merge.php b/engines/bittorrent/merge.php
index 1106ba3..9126ac9 100644
--- a/engines/bittorrent/merge.php
+++ b/engines/bittorrent/merge.php
@@ -1,6 +1,6 @@
 <?php
 
-    function get_merged_torrent_results($query)
+    function fetch_search_results($query)
     {
         global $config;
 
@@ -76,7 +76,7 @@
         return $results; 
     }
 
-    function print_merged_torrent_results($results)
+    function print_search_results($results)
     {
         echo "<div class=\"text-result-container\">";
 
diff --git a/engines/duckduckgo/text.php b/engines/duckduckgo/text.php
index e4bdbac..0b4455b 100644
--- a/engines/duckduckgo/text.php
+++ b/engines/duckduckgo/text.php
@@ -6,11 +6,11 @@
         $query_encoded = str_replace("%22", "\"", urlencode($this->query));
         $results = array();
 
-        // $domain = $config->google_domain;
+        // $domain = $this->config->google_domain;
         $domain = 'com';
-        $site_language = isset($_COOKIE["google_language_site"]) ? trim(htmlspecialchars($_COOKIE["google_language_site"])) : $config->google_language_site;
-        $results_language = isset($_COOKIE["google_language_results"]) ? trim(htmlspecialchars($_COOKIE["google_language_results"])) : $config->google_language_results;
-        $number_of_results = isset($_COOKIE["google_number_of_results"]) ? trim(htmlspecialchars($_COOKIE["google_number_of_results"])) : $config->google_number_of_results;
+        $site_language = isset($_COOKIE["google_language_site"]) ? trim(htmlspecialchars($_COOKIE["google_language_site"])) : $this->config->google_language_site;
+        $results_language = isset($_COOKIE["google_language_results"]) ? trim(htmlspecialchars($_COOKIE["google_language_results"])) : $this->config->google_language_results;
+        $number_of_results = isset($_COOKIE["google_number_of_results"]) ? trim(htmlspecialchars($_COOKIE["google_number_of_results"])) : $this->config->google_number_of_results;
 
         $url = "https://html.duckduckgo.$domain/html/?q=$query_encoded&kd=-1&s=" . 3 * $page;
         if (3 > strlen($site_language) && 0 < strlen($site_language))
diff --git a/engines/invidious/video.php b/engines/invidious/video.php
index 1d7076b..df32f5e 100644
--- a/engines/invidious/video.php
+++ b/engines/invidious/video.php
@@ -1,6 +1,5 @@
 <?php
-    function get_video_results($query)
-    {
+    function fetch_search_results($query, $page) {
         global $config;
         $instance_url = $config->invidious_instance_for_video_results;
         
@@ -38,7 +37,7 @@
         return $results;
     }
 
-    function print_video_results($results)
+    function print_search_results($results)
     {
         echo "<div class=\"text-result-container\">";
 
diff --git a/engines/qwant/image.php b/engines/qwant/image.php
index d5b7a16..9ecc8f4 100644
--- a/engines/qwant/image.php
+++ b/engines/qwant/image.php
@@ -1,5 +1,5 @@
 <?php
-    function get_image_results($query, $page) 
+    function fetch_search_results($query, $page) 
     {
         global $config;
 
@@ -40,7 +40,7 @@
         return $results;
     }
 
-    function print_image_results($results)
+    function print_search_results($results)
     {
         echo "<div class=\"image-result-container\">";
 
diff --git a/engines/text.php b/engines/text.php
index 713602b..b225316 100644
--- a/engines/text.php
+++ b/engines/text.php
@@ -1,6 +1,5 @@
 <?php
-    function get_text_results($query, $page)
-    {
+    function fetch_search_results($query, $page) {
         global $config;
 
         $mh = curl_multi_init();
@@ -32,7 +31,7 @@
             curl_multi_exec($mh, $running);
         } while ($running);
 
-        if (curl_getinfo($)['http_code'] != '200') 
+        if (curl_getinfo($engine_request->ch)['http_code'] != '200') 
         {
             require "engines/librex/text.php";
             return get_librex_results($query, $page);
@@ -47,8 +46,7 @@
         return $results;
     }
 
-    function print_text_results($results)
-    {
+    function print_search_results($results) {
 
         if (empty($results))
             return;
diff --git a/search.php b/search.php
index e1bd8b6..2f16369 100644
--- a/search.php
+++ b/search.php
@@ -30,6 +30,40 @@
         }
     }
 
+    function import_search_category($type) {
+        switch ($type)
+        {
+            case 0:
+                require "engines/text.php";
+                break;
+
+            case 1:
+                require "engines/qwant/image.php";
+                break;
+
+            case 2:
+                require "engines/invidious/video.php";
+                break;
+
+            case 3:
+                if ($config->disable_bittorent_search)
+                    echo "<p class=\"text-result-container\">The host disabled this feature! :C</p>";
+                else
+                    require "engines/bittorrent/merge.php";
+                break;
+
+            case 4:
+                if ($config->disable_hidden_service_search)
+                    echo "<p class=\"text-result-container\">The host disabled this feature! :C</p>";
+                else
+                    require "engines/ahmia/hidden_service.php";
+                break;
+
+            default:
+                require "engines/text.php";
+                break;
+        }
+    }
 ?>
 
 <title>
@@ -84,64 +118,10 @@
         <?php
             $page = isset($_REQUEST["p"]) ? (int) $_REQUEST["p"] : 0;
             $start_time = microtime(true);
-            switch ($type)
-            {
-                case 0:
-					require "engines/text.php";
-                    $results = get_text_results($query, $page);
-                    print_elapsed_time($start_time);
-                    print_text_results($results);
-                    break;
-
-                case 1:
-                    require "engines/qwant/image.php";
-                    $results = get_image_results($query_encoded, $page);
-                    print_elapsed_time($start_time);
-                    print_image_results($results);
-                    break;
-
-                case 2:
-                    require "engines/invidious/video.php";
-                    $results = get_video_results($query_encoded);
-                    print_elapsed_time($start_time);
-                    print_video_results($results);
-                    break;
-
-                case 3:
-                    if ($config->disable_bittorent_search)
-                        echo "<p class=\"text-result-container\">The host disabled this feature! :C</p>";
-                    else
-                    {
-                        require "engines/bittorrent/merge.php";
-                        $results = get_merged_torrent_results($query_encoded);
-                        print_elapsed_time($start_time);
-                        print_merged_torrent_results($results);
-                    }
-                    break;
-
-                case 4:
-                    if ($config->disable_hidden_service_search)
-                        echo "<p class=\"text-result-container\">The host disabled this feature! :C</p>";
-                    else
-                    {
-                        require "engines/ahmia/hidden_service.php";
-                        $results = get_hidden_service_results($query_encoded);
-                        print_elapsed_time($start_time);
-                        print_hidden_service_results($results);
-                    }
-                    break;
-
-                default:
-                    $query_parts = explode(" ", $query);
-                    $last_word_query = end($query_parts);
-                    if (substr($query, 0, 1) == "!" || substr($last_word_query, 0, 1) == "!")
-                        check_ddg_bang($query);
-                    require "engines/google/text.php";
-                    $results = get_text_results($query, $page);
-                    print_elapsed_time($start_time);
-                    print_text_results($results);
-                    break;
-            }
+            import_search_category($type);
+            $results = fetch_search_results($query, $page);
+            print_elapsed_time($start_time);
+            print_search_results($results);
 
 
             if (2 > $type)