diff --git a/database/Config.php b/database/Config.php
index b463be25ce7da8595c5ed9e92011ad7102127a5d..1f4d169cb57c03730796a7a41fb3f34f39a99270 100644
--- a/database/Config.php
+++ b/database/Config.php
@@ -27,12 +27,13 @@ class Config
     public static function createFromGlobals()
     {
         $options = [];
-        if (defined(qrs_db_option_tsqueryfunction) && null !== qrs_db_option_tsqueryfunction)
+        if (defined('qrs_db_option_tsqueryfunction') && (null !== qrs_db_option_tsqueryfunction)) {
             $options['tsqueryfunction'] = qrs_db_option_tsqueryfunction;
+        }
 
-        $options['timeout'] = (defined(qrs_db_option_timeout) && null !== qrs_db_option_timeout) ? qrs_db_option_timeout : 5000;
+        $options['timeout'] = (defined('qrs_db_option_timeout') && (null !== qrs_db_option_timeout)) ? qrs_db_option_timeout : 5000;
 
-        if (defined(qrs_db_connector) && null !== qrs_db_connector)
+        if (defined('qrs_db_connector') && null !== qrs_db_connector)
             return new Config(qrs_path_prefix, qrs_db_connector, qrs_db_user, qrs_db_pass, qrs_backend, $options);
         else
             return new Config(qrs_path_prefix, 'pgsql:host=' . qrs_db_host . ';port=' . qrs_db_port . ';dbname=' . qrs_db_name . '', qrs_db_user, qrs_db_pass, qrs_backend, $options);
diff --git a/qrs_config.default.php b/qrs_config.default.php
index 5bc6425500a6badc98607aaa24349c36e9d1bff0..9697bf3b0be2f2f352766b61d97f686b91d09ff5 100644
--- a/qrs_config.default.php
+++ b/qrs_config.default.php
@@ -11,7 +11,7 @@ define('qrs_db_pass', 'password');
 
 define('qrs_db_option_tsqueryfunction', "plainto_tsquery('english', :query)");
 // Timeout in milliseconds
-define('qrs_db_option_timeout', 5000);
+define('qrs_db_option_timeout', 1);
 
 define('qrs_backend', 'pgsql-smart');