diff --git a/gulliver/methods/pagedTableAjax.php b/gulliver/methods/pagedTableAjax.php
index 26c791073..561b7dcd6 100644
--- a/gulliver/methods/pagedTableAjax.php
+++ b/gulliver/methods/pagedTableAjax.php
@@ -23,77 +23,76 @@
  * 
  */
 
+G::LoadAllPluginModelClasses();
+$id=get_ajax_value('ptID');
+$ntable = unserialize(base64_decode($_SESSION['pagedTable[' . $id . ']']));
+$page=get_ajax_value('page');
+$function=get_ajax_value('function');
 
-
-	$id=get_ajax_value('ptID');
-	$ntable = unserialize(base64_decode($_SESSION['pagedTable[' . $id . ']']));
-	$page=get_ajax_value('page');
-	$function=get_ajax_value('function');
-
-  if (isset($ntable->filterForm_Id) && ($ntable->filterForm_Id!=='')) {
+if (isset($ntable->filterForm_Id) && ($ntable->filterForm_Id!=='')) {
     $filterForm=new filterForm(G::getUIDName( $ntable->filterForm_Id ));
     $filterForm->values=$_SESSION[$filterForm->id];
     parse_str( urldecode(get_ajax_value('filter')) , $newValues);
     if (isset($newValues['form'])) {
-      $filterForm->setValues($newValues['form']);
-      $filter = array();
-      foreach($filterForm->fields as $fieldName => $field ){
-        if (($field->dataCompareField!=='') && (isset($newValues['form'][$fieldName])))
-          $filter[$field->dataCompareField] = $filterForm->values[$fieldName];
-          $ntable->filterType[$field->dataCompareField] = $field->dataCompareType;
-      }
-      $ntable->filter = $filter;//G::http_build_query($filter);
+        $filterForm->setValues($newValues['form']);
+        $filter = array();
+        foreach($filterForm->fields as $fieldName => $field ){
+            if (($field->dataCompareField!=='') && (isset($newValues['form'][$fieldName])))
+                $filter[$field->dataCompareField] = $filterForm->values[$fieldName];
+            $ntable->filterType[$field->dataCompareField] = $field->dataCompareType;
+        }
+        $ntable->filter = $filter;//G::http_build_query($filter);
     }
-  }
-  $fastSearch=get_ajax_value('fastSearch');
-  if (isset($fastSearch)) $ntable->fastSearch= urldecode($fastSearch);
-  $orderBy=get_ajax_value('order');
-  if (isset($orderBy)) {
-	  $orderBy=urldecode($orderBy);
-  	$ntable->orderBy=$orderBy;
-  }
-	if (isset($page) && $page!=='') $ntable->currentPage=(int) $page;
-	if (function_exists('pagedTable_BeforeQuery')) pagedTable_BeforeQuery($ntable);
-	$ntable->prepareQuery();
-	switch ($function)
-	{
-	case "showHideField":
-	  $field=get_ajax_value('field');
-	  $ntable->style[$field]['showInTable']=
-	    ($ntable->style[$field]['showInTable']==='0')?'1':'0';
-	  break;
-	case "paint":
-		break;
-	case "delete":
-		$ntable->prepareQuery();
-		parse_str(get_ajax_value('field'),$field);
-		foreach($field as $key => $value) $field[$key]=urldecode($value);
-		$ntable->ses->execute($ntable->replaceDataField($ntable->sqlDelete,$field));
-		break;
-	case "update":
-		$ntable->prepareQuery();
-		parse_str(get_ajax_value('field'),$field);
-		foreach($field as $key => $value) $field[$key]=urldecode($value);
-		parse_str(get_ajax_value('update'),$fieldup);
-		foreach($fieldup as $key => $value) $field['new'.$key]=urldecode($value); //join
-		$ntable->ses->execute($ntable->replaceDataField($ntable->sqlUpdate,$field));
-		break;
-	case "insert":
-		$ntable->prepareQuery();
-		parse_str(get_ajax_value('field'),$field);
-		foreach($field as $key => $value) $field[$key]=urldecode($value);
-		$ntable->ses->execute($ntable->replaceDataField($ntable->sqlInsert,$field));
-		break;
-	case "printForm":
-		parse_str(get_ajax_value('field'),$field);
-		parse_str(get_ajax_value('field'),$field);
-		foreach($field as $key => $value) $field[$key]=urldecode($value);
-		$ntable->printForm(get_ajax_value('filename'),$field);
-		return ;
-	}
-	$ntable->renderTable( 'content' );
-  $conf = new Configurations();
-  $conf->setConfig($ntable->__Configuration,$ntable,$conf->aConfig);
-  $conf->saveConfig('pagedTable',$ntable->__OBJ_UID,'',$_SESSION['USER_LOGGED'],'');
+}
+$fastSearch=get_ajax_value('fastSearch');
+if (isset($fastSearch)) $ntable->fastSearch= urldecode($fastSearch);
+$orderBy=get_ajax_value('order');
+if (isset($orderBy)) {
+    $orderBy=urldecode($orderBy);
+    $ntable->orderBy=$orderBy;
+}
+if (isset($page) && $page!=='') $ntable->currentPage=(int) $page;
+if (function_exists('pagedTable_BeforeQuery')) pagedTable_BeforeQuery($ntable);
+$ntable->prepareQuery();
+switch ($function)
+{
+    case "showHideField":
+        $field=get_ajax_value('field');
+        $ntable->style[$field]['showInTable']=
+            ($ntable->style[$field]['showInTable']==='0')?'1':'0';
+        break;
+    case "paint":
+        break;
+    case "delete":
+        $ntable->prepareQuery();
+        parse_str(get_ajax_value('field'),$field);
+        foreach($field as $key => $value) $field[$key]=urldecode($value);
+        $ntable->ses->execute($ntable->replaceDataField($ntable->sqlDelete,$field));
+        break;
+    case "update":
+        $ntable->prepareQuery();
+        parse_str(get_ajax_value('field'),$field);
+        foreach($field as $key => $value) $field[$key]=urldecode($value);
+        parse_str(get_ajax_value('update'),$fieldup);
+        foreach($fieldup as $key => $value) $field['new'.$key]=urldecode($value); //join
+        $ntable->ses->execute($ntable->replaceDataField($ntable->sqlUpdate,$field));
+        break;
+    case "insert":
+        $ntable->prepareQuery();
+        parse_str(get_ajax_value('field'),$field);
+        foreach($field as $key => $value) $field[$key]=urldecode($value);
+        $ntable->ses->execute($ntable->replaceDataField($ntable->sqlInsert,$field));
+        break;
+    case "printForm":
+        parse_str(get_ajax_value('field'),$field);
+        parse_str(get_ajax_value('field'),$field);
+        foreach($field as $key => $value) $field[$key]=urldecode($value);
+        $ntable->printForm(get_ajax_value('filename'),$field);
+        return ;
+}
+$ntable->renderTable( 'content' );
+$conf = new Configurations();
+$conf->setConfig($ntable->__Configuration,$ntable,$conf->aConfig);
+$conf->saveConfig('pagedTable',$ntable->__OBJ_UID,'',$_SESSION['USER_LOGGED'],'');
 
 ?>
diff --git a/gulliver/methods/propelTableAjax.php b/gulliver/methods/propelTableAjax.php
index 19bc99a91..6ca4aaaa9 100644
--- a/gulliver/methods/propelTableAjax.php
+++ b/gulliver/methods/propelTableAjax.php
@@ -24,26 +24,27 @@
  */
   /* Includes */
 
-	$id = get_ajax_value('ptID');
-	$ntable = unserialize(base64_decode($_SESSION['pagedTable[' . $id . ']']));
-	$page     = get_ajax_value('page');
-	$function = get_ajax_value('function');
+G::LoadAllPluginModelClasses();
+$id = get_ajax_value('ptID');
+$ntable = unserialize(base64_decode($_SESSION['pagedTable[' . $id . ']']));
+$page     = get_ajax_value('page');
+$function = get_ajax_value('function');
 
-    //THIS BLOCK SET THE FILTER VARIABLES
-    if (isset($ntable->filterForm_Id) && ($ntable->filterForm_Id!=='')) {
+//THIS BLOCK SET THE FILTER VARIABLES
+if (isset($ntable->filterForm_Id) && ($ntable->filterForm_Id!=='')) {
 
-      $sPath = PATH_XMLFORM;
-       //if the xmlform file doesn't exist, then try with the plugins folders
-      if ( !is_file ( $sPath . G::getUIDName( $ntable->filterForm_Id ) ) ) {
+    $sPath = PATH_XMLFORM;
+    //if the xmlform file doesn't exist, then try with the plugins folders
+    if ( !is_file ( $sPath . G::getUIDName( $ntable->filterForm_Id ) ) ) {
         $aux = explode ( PATH_SEP, G::getUIDName( $ntable->filterForm_Id ) );
         //check if G_PLUGIN_CLASS is defined, because publisher can be called without an environment
         if ( count($aux) == 2 && defined ( 'G_PLUGIN_CLASS' ) ) {
-          $oPluginRegistry =& PMPluginRegistry::getSingleton();
-          if ( $oPluginRegistry->isRegisteredFolder($aux[0]) ) {
-            $sPath = PATH_PLUGINS;
-          }
+            $oPluginRegistry =& PMPluginRegistry::getSingleton();
+            if ( $oPluginRegistry->isRegisteredFolder($aux[0]) ) {
+                $sPath = PATH_PLUGINS;
+            }
         }
-      }
+    }
 
     $filterForm=new filterForm(G::getUIDName( $ntable->filterForm_Id ),$sPath);
 
@@ -52,74 +53,74 @@
     $filterForm->values=$_SESSION[$filterForm->id];
     parse_str( urldecode(get_ajax_value('filter')) , $newValues);
     if (isset($newValues['form'])) {
-      $filterForm->setValues($newValues['form']);
-      $filter = array();
-      foreach($filterForm->fields as $fieldName => $field ){
-        if (($field->dataCompareField!=='') && (isset($newValues['form'][$fieldName])))
-          $filter[$field->dataCompareField] = $filterForm->values[$fieldName];
-          $ntable->filterType[$field->dataCompareField] = $field->dataCompareType;
-      }
-      $ntable->filter = $filter;//G::http_build_query($filter);
+        $filterForm->setValues($newValues['form']);
+        $filter = array();
+        foreach($filterForm->fields as $fieldName => $field ){
+            if (($field->dataCompareField!=='') && (isset($newValues['form'][$fieldName])))
+                $filter[$field->dataCompareField] = $filterForm->values[$fieldName];
+            $ntable->filterType[$field->dataCompareField] = $field->dataCompareType;
+        }
+        $ntable->filter = $filter;//G::http_build_query($filter);
     }
-  }
+}
 
 
-  $fastSearch = get_ajax_value('fastSearch');
-  if (isset($fastSearch)) {
+$fastSearch = get_ajax_value('fastSearch');
+if (isset($fastSearch)) {
     $ntable->fastSearch= htmlentities(urldecode($fastSearch), ENT_QUOTES, 'UTF-8');
     $page = 1;
-  }
+}
 
-  //order by
-  $orderBy = get_ajax_value('order');
-   if (isset($orderBy)) {
-       $orderBy = urldecode($orderBy);
-       $ntable->orderBy = $orderBy;
-   }
+//order by
+$orderBy = get_ajax_value('order');
+if (isset($orderBy)) {
+    $orderBy = urldecode($orderBy);
+    $ntable->orderBy = $orderBy;
+}
 
-	if ( isset($page) && $page!=='' ) $ntable->currentPage = (int) $page;
+if ( isset($page) && $page!=='' ) $ntable->currentPage = (int) $page;
 
-	if ( function_exists('pagedTable_BeforeQuery'))
+if ( function_exists('pagedTable_BeforeQuery'))
     pagedTable_BeforeQuery($ntable);
 
-	//$ntable->prepareQuery();
+//$ntable->prepareQuery();
 
-	switch ($function)
-	{
-	case "showHideField":
-	  $field=get_ajax_value('field');
-	  $ntable->style[$field]['showInTable']=
-	    ($ntable->style[$field]['showInTable']==='0')?'1':'0';
-	  break;
-	case "paint":
-		break;
-	case "delete":
-		$ntable->prepareQuery();
-		parse_str(get_ajax_value('field'),$field);
-		foreach($field as $key => $value) $field[$key]=urldecode($value);
-		$ntable->ses->execute($ntable->replaceDataField($ntable->sqlDelete,$field));
-		break;
-	case "update":
-		$ntable->prepareQuery();
-		parse_str(get_ajax_value('field'),$field);
-		foreach($field as $key => $value) $field[$key]=urldecode($value);
-		parse_str(get_ajax_value('update'),$fieldup);
-		foreach($fieldup as $key => $value) $field['new'.$key]=urldecode($value); //join
-		$ntable->ses->execute($ntable->replaceDataField($ntable->sqlUpdate,$field));
-		break;
-	case "insert":
-		$ntable->prepareQuery();
-		parse_str(get_ajax_value('field'),$field);
-		foreach($field as $key => $value) $field[$key]=urldecode($value);
-		$ntable->ses->execute($ntable->replaceDataField($ntable->sqlInsert,$field));
-		break;
-	case "printForm":
-		parse_str(get_ajax_value('field'),$field);
-		parse_str(get_ajax_value('field'),$field);
-		foreach($field as $key => $value) $field[$key]=urldecode($value);
-		$ntable->printForm(get_ajax_value('filename'),$field);
-		return ;
-	}
+switch ($function)
+{
+    case "showHideField":
+        $field=get_ajax_value('field');
+        $ntable->style[$field]['showInTable']=
+            ($ntable->style[$field]['showInTable']==='0')?'1':'0';
+        break;
+    case "paint":
+        break;
+    case "delete":
+        $ntable->prepareQuery();
+        parse_str(get_ajax_value('field'),$field);
+        foreach($field as $key => $value) $field[$key]=urldecode($value);
+        $ntable->ses->execute($ntable->replaceDataField($ntable->sqlDelete,$field));
+        break;
+    case "update":
+        $ntable->prepareQuery();
+        parse_str(get_ajax_value('field'),$field);
+        foreach($field as $key => $value) $field[$key]=urldecode($value);
+        parse_str(get_ajax_value('update'),$fieldup);
+        foreach($fieldup as $key => $value) $field['new'.$key]=urldecode($value); //join
+        $ntable->ses->execute($ntable->replaceDataField($ntable->sqlUpdate,$field));
+        break;
+    case "insert":
+        $ntable->prepareQuery();
+        parse_str(get_ajax_value('field'),$field);
+        foreach($field as $key => $value) $field[$key]=urldecode($value);
+        $ntable->ses->execute($ntable->replaceDataField($ntable->sqlInsert,$field));
+        break;
+    case "printForm":
+        parse_str(get_ajax_value('field'),$field);
+        parse_str(get_ajax_value('field'),$field);
+        foreach($field as $key => $value) $field[$key]=urldecode($value);
+        $ntable->printForm(get_ajax_value('filename'),$field);
+        return ;
+}
 
 $ntable->renderTable("content");
 
@@ -131,4 +132,3 @@ if (isset($_SESSION["USER_LOGGED"])) {
 } else {
     $conf->saveConfig("pagedTable", $ntable->__OBJ_UID);
 }
-
diff --git a/gulliver/system/class.objectTemplate.php b/gulliver/system/class.objectTemplate.php
index 0c673932a..837f5afe5 100644
--- a/gulliver/system/class.objectTemplate.php
+++ b/gulliver/system/class.objectTemplate.php
@@ -33,7 +33,7 @@
  * @access public
  */
 
-class objectTemplate extends smarty
+class objectTemplate extends Smarty
 {
 
     /**