diff --git a/app/Filters/QueryFilters.php b/app/Filters/QueryFilters.php
index d5e1bfeee626..32d1289b5441 100644
--- a/app/Filters/QueryFilters.php
+++ b/app/Filters/QueryFilters.php
@@ -190,9 +190,7 @@ abstract class QueryFilters
             return $this->builder;
         }
 
-        $this->builder->where('client_id', $this->decodePrimaryKey($client_id));
-
-        return $this->builder;
+        return $this->builder->where('client_id', $this->decodePrimaryKey($client_id));
         
     }
 
diff --git a/app/Import/Transformers/BaseTransformer.php b/app/Import/Transformers/BaseTransformer.php
index 1e0a5c7ff0a2..efc686841d66 100644
--- a/app/Import/Transformers/BaseTransformer.php
+++ b/app/Import/Transformers/BaseTransformer.php
@@ -82,10 +82,10 @@ class BaseTransformer
 
 			if ( $contacts->count() >= 1 ) {
 				return $contacts->first()->client_id;
-nlog("found via contact");
+                nlog("found via contact");
 			}
 		}
-nlog("did not find client");
+                nlog("did not find client");
 
 		return null;
 	}
diff --git a/config/database.php b/config/database.php
index 7ae5cf6fd203..ae4b3c91430c 100644
--- a/config/database.php
+++ b/config/database.php
@@ -1,7 +1,5 @@
 <?php
 
-use App\Utils\Ninja;
-
 return [
 
     /*
@@ -96,7 +94,7 @@ return [
             'prefix_indexes' => true,
             'strict'         => env('DB_STRICT', false),
             'engine'         => 'InnoDB ROW_FORMAT=DYNAMIC',
-            // 'options'        => Ninja::isHosted() ? config('ninja.db_options') : [],
+            'options'        => [],
             // 'options'        => [
             //     PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => false,
             //     PDO::MYSQL_ATTR_SSL_KEY => env("DB_CLIENT_KEY", ''),
@@ -118,7 +116,7 @@ return [
             'prefix_indexes' => true,
             'strict'         => env('DB_STRICT', false),
             'engine'         => 'InnoDB ROW_FORMAT=DYNAMIC',
-            // 'options'        => Ninja::isHosted() ? config('ninja.db_options') : [],
+            'options'        => [],
         ],
 
         'db-ninja-02' => [
@@ -134,7 +132,7 @@ return [
             'prefix_indexes' => true,
             'strict'         => env('DB_STRICT', false),
             'engine'         => 'InnoDB ROW_FORMAT=DYNAMIC',
-            // 'options'        => Ninja::isHosted() ? config('ninja.db_options') : [],
+            'options'        => [],
         ],
 
         'db-ninja-02a' => [
@@ -150,7 +148,7 @@ return [
             'prefix_indexes' => true,
             'strict'         => env('DB_STRICT', false),
             'engine'         => 'InnoDB ROW_FORMAT=DYNAMIC',
-            // 'options'        => Ninja::isHosted() ? config('ninja.db_options') : [],
+            'options'        => [],
         ],
     ],
 
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index f79ffb455668..693f8d4b28bd 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -4531,6 +4531,19 @@ $LANG = array(
     'status_color_theme' => 'Status Color Theme',
     'load_color_theme' => 'Load Color Theme',
     'lang_Estonian' => 'Estonian',
+    'marked_credit_as_paid' => 'Successfully marked credit as paid',
+    'marked_credits_as_paid' => 'Successfully marked credits as paid',
+    'wait_for_loading' => 'Data loading - please wait for it to complete',
+    'wait_for_saving' => 'Data saving - please wait for it to complete',
+    'html_preview_warning' => 'Note: changes made here are only previewed, they must be applied in the tabs above to be saved',
+    'remaining' => 'Remaining',
+    'invoice_paid' => 'Invoice Paid',
+    'activity_120' => ':user created recurring expense :recurring_expense',
+    'activity_121' => ':user updated recurring expense :recurring_expense',
+    'activity_122' => ':user archived recurring expense :recurring_expense',
+    'activity_123' => ':user deleted recurring expense :recurring_expense',
+    'activity_124' => ':user restored recurring expense :recurring_expense',
+
 );
 
 return $LANG;