diff --git a/app_controller.php b/app_controller.php
index 14ab045..aa2effa 100644
--- a/app_controller.php
+++ b/app_controller.php
@@ -288,10 +288,10 @@ class AppController extends Controller {
    */
 
   function gridDataFilterTables(&$params, &$model, $query) {
-    if (isset($query['link']))
-      $link = 'link';
-    else
+    if (isset($query['contain']))
       $link = 'contain';
+    else
+      $link = 'link';
 
     if (empty($params['post']['filter']))
       return $query;
@@ -432,7 +432,7 @@ class AppController extends Controller {
   }
 
   function gridDataTables(&$params, &$model) {
-    return array('contain' => false);
+    return array('link' => array());
   }
 
   function gridDataTableSet(&$params, &$model) {