diff --git a/app/DataMapper/Tax/TaxModel.php b/app/DataMapper/Tax/TaxModel.php
index 21b811898d2b..8fd686e88ff7 100644
--- a/app/DataMapper/Tax/TaxModel.php
+++ b/app/DataMapper/Tax/TaxModel.php
@@ -344,9 +344,9 @@ class TaxModel
         $this->regions->EU->subregions = new \stdClass();
 
         $this->regions->EU->subregions->AT = new \stdClass();
-        $this->regions->EU->subregions->AT->tax_rate = 21;
+        $this->regions->EU->subregions->AT->tax_rate = 20;
         $this->regions->EU->subregions->AT->tax_name = 'USt';
-        $this->regions->EU->subregions->AT->reduced_tax_rate = 11;
+        $this->regions->EU->subregions->AT->reduced_tax_rate = 10;
         $this->regions->EU->subregions->AT->apply_tax = false;
 
         $this->regions->EU->subregions->BE = new \stdClass();
diff --git a/app/Filters/QueryFilters.php b/app/Filters/QueryFilters.php
index a8360e9a05a2..fc33f283a554 100644
--- a/app/Filters/QueryFilters.php
+++ b/app/Filters/QueryFilters.php
@@ -138,6 +138,7 @@ abstract class QueryFilters
      */
     public function status(string $filter = ''): Builder
     {
+
         if (strlen($filter) == 0) {
             return $this->builder;
         }
@@ -146,17 +147,17 @@ abstract class QueryFilters
 
         return $this->builder->where(function ($query) use ($filters) {
             if (in_array(self::STATUS_ACTIVE, $filters)) {
-                $query->orWhereNull('deleted_at');
+                $query = $query->orWhereNull('deleted_at');
             }
 
             if (in_array(self::STATUS_ARCHIVED, $filters)) {
-                $query->orWhere(function ($query) {
-                    $query->whereNotNull('deleted_at')->where('is_deleted', 0);
+                $query = $query->orWhere(function ($q) {
+                    $q->whereNotNull('deleted_at')->where('is_deleted', 0);
                 });
             }
 
             if (in_array(self::STATUS_DELETED, $filters)) {
-                $query->orWhere('is_deleted', 1);
+                $query = $query->orWhere('is_deleted', 1);
             }
         });
     }
diff --git a/app/Models/CompanyUser.php b/app/Models/CompanyUser.php
index eef53d332f31..5c5754c18f2b 100644
--- a/app/Models/CompanyUser.php
+++ b/app/Models/CompanyUser.php
@@ -128,6 +128,7 @@ class CompanyUser extends Pivot
         'settings' => 'object',
         'notifications' => 'object',
         'permissions' => 'string',
+        'react_settings' => 'object',
     ];
 
     protected $fillable = [
diff --git a/app/Transformers/CompanyUserTransformer.php b/app/Transformers/CompanyUserTransformer.php
index 6ae6f81474f4..4b25683821ab 100644
--- a/app/Transformers/CompanyUserTransformer.php
+++ b/app/Transformers/CompanyUserTransformer.php
@@ -44,7 +44,7 @@ class CompanyUserTransformer extends EntityTransformer
             'permissions' => $company_user->permissions ?: '',
             'notifications' => $company_user->notifications ? (object) $company_user->notifications : $blank_obj,
             'settings' =>  $company_user->settings ? (object) $company_user->settings : $blank_obj,
-            'react_settings' => $company_user->react_settings ? $company_user->react_settings : [],
+            'react_settings' => $company_user->react_settings ? (object) $company_user->react_settings : [],
             'is_owner' => (bool) $company_user->is_owner,
             'is_admin' => (bool) $company_user->is_admin,
             'is_locked' => (bool) $company_user->is_locked,