diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 24af5f7a9bfc..746bc40c57cb 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -137,36 +137,39 @@ class BaseController extends Controller
         $transformer = new $this->entity_transformer(Input::get('serializer'));
 
         $includes = $transformer->getDefaultIncludes();
-
         $includes = $this->getRequestIncludes($includes);
 
+info(print_r($includes,1));
+
         $updated_at = request()->has('updated_at') ? request()->input('updated_at') : 0;
         $updated_at = date('Y-m-d H:i:s', $updated_at);
 
+        //info($updated_at);
+
         $query->with(
         [
         'company' => function ($query) use($updated_at){$query->where('updated_at', '>=', 0);},
         'company.activities' => function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
-        'company.clients' =>function ($query) use($updated_at){$query->where('updated_at', '>', $updated_at);},
-        'company.tax_rates'=>function ($query) use($updated_at){$query->where('updated_at', '>', $updated_at);},
-        'company.groups'=>function ($query) use($updated_at){$query->where('updated_at', '>', $updated_at);},
-        'company.company_gateways'=>function ($query) use($updated_at){$query->where('updated_at', '>', $updated_at);},
-        'company.clients.contacts'=>function ($query) use($updated_at){$query->where('updated_at', '>', $updated_at);},
-        'company.products'=>function ($query) use($updated_at){$query->where('updated_at', '>', $updated_at);},
-        'company.invoices.invitations'=>function ($query) use($updated_at){$query->where('updated_at', '>', $updated_at);},
-        'company.invoices.invitations'=>function ($query) use($updated_at){$query->where('updated_at', '>', $updated_at);},
-        'company.invoices.documents'=>function ($query) use($updated_at){$query->where('updated_at', '>', $updated_at);},
-        'company.payments.paymentables'=>function ($query) use($updated_at){$query->where('updated_at', '>', $updated_at);},
-        'company.quotes.invitations'=>function ($query) use($updated_at){$query->where('updated_at', '>', $updated_at);},
-        'company.quotes.documents'=>function ($query) use($updated_at){$query->where('updated_at', '>', $updated_at);},
-        'company.credits.invitations'=>function ($query) use($updated_at){$query->where('updated_at', '>', $updated_at);},
-        'company.credits'=>function ($query) use($updated_at){$query->where('updated_at', '>', $updated_at);},
-        'company.payment_terms'=>function ($query) use($updated_at){$query->where('updated_at', '>', $updated_at);},
-        'company.vendors'=>function ($query) use($updated_at){$query->where('updated_at', '>', $updated_at);},
-        'company.expenses'=>function ($query) use($updated_at){$query->where('updated_at', '>', $updated_at);},
-        'company.tasks'=>function ($query) use($updated_at){$query->where('updated_at', '>', $updated_at);},
-        'company.projects'=>function ($query) use($updated_at){$query->where('updated_at', '>', $updated_at);},
-        'company.designs'=>function ($query) use($updated_at){$query->where('updated_at', '>', $updated_at);},
+        'company.clients' =>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
+        'company.tax_rates'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
+        'company.groups'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
+        'company.company_gateways'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
+        'company.clients.contacts'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
+        'company.products'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
+        'company.invoices.invitations.contact'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
+        'company.invoices.invitations'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
+        'company.invoices.documents'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
+        'company.payments.paymentables'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
+        'company.quotes.invitations'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
+        'company.quotes.documents'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
+        'company.credits.invitations'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
+        'company.credits'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
+        'company.payment_terms'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
+        'company.vendors'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
+        'company.expenses'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
+        'company.tasks'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
+        'company.projects'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
+        'company.designs'=>function ($query) use($updated_at){$query->where('updated_at', '>=', $updated_at);},
         ]
         );
 
@@ -311,6 +314,7 @@ class BaseController extends Controller
           'company.quotes.invitations.contact',
           'company.quotes.invitations.company',
           'company.quotes.documents',
+          'company.credits.invitations.contact',
           'company.credits.invitations.company',
           'company.credits.documents',
           'company.payment_terms.company',
@@ -340,7 +344,7 @@ class BaseController extends Controller
          * Thresholds for displaying large account on first load
          */
         if (request()->has('first_load') && request()->input('first_load') == 'true') {
-            if (auth()->user()->getCompany()->is_large) {
+            if (auth()->user()->getCompany()->is_large && request()->missing('updated_at')) {
                 $data = $mini_load;
             } else {
                 $data = $first_load;
diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php
index 659612e4d831..629f41a3ba30 100644
--- a/app/Http/Middleware/QueryLogging.php
+++ b/app/Http/Middleware/QueryLogging.php
@@ -51,7 +51,7 @@ class QueryLogging
             //    Log::info($request->method() . ' - ' . $request->url() . ": $count queries - " . $time);
                 
              //if($count > 10)
-             //    Log::info($queries);
+                 Log::info($queries);
                  
             }
         }
diff --git a/app/Http/Requests/Payment/StorePaymentRequest.php b/app/Http/Requests/Payment/StorePaymentRequest.php
index f53da29920ed..165b33933226 100644
--- a/app/Http/Requests/Payment/StorePaymentRequest.php
+++ b/app/Http/Requests/Payment/StorePaymentRequest.php
@@ -39,6 +39,8 @@ class StorePaymentRequest extends Request
     {
         $input = $this->all();
 
+info(print_r($input,1));
+
         $invoices_total = 0;
         $credits_total = 0;
 
diff --git a/app/Http/ValidationRules/Credit/ValidCreditsRules.php b/app/Http/ValidationRules/Credit/ValidCreditsRules.php
index 5e7a51d4522c..318710f76c07 100644
--- a/app/Http/ValidationRules/Credit/ValidCreditsRules.php
+++ b/app/Http/ValidationRules/Credit/ValidCreditsRules.php
@@ -78,10 +78,11 @@ class ValidCreditsRules implements Rule
         }
 
 
-        if(count($this->input['credits']) >=1 && count($this->input['invoices']) == 0)
+        if(count($this->input['credits']) >=1 && count($this->input['invoices']) == 0){
             $this->error_msg = "You must have an invoice set when using a credit";
             return false;
-
+        }
+        
         return true;
     }