diff --git a/gulliver/methods/propelTableAjax.php b/gulliver/methods/propelTableAjax.php
index 735e1c330..a0f06a5cc 100755
--- a/gulliver/methods/propelTableAjax.php
+++ b/gulliver/methods/propelTableAjax.php
@@ -36,8 +36,8 @@
 
     //THIS BLOCK SET THE FILTER VARIABLES
     if (isset($ntable->filterForm_Id) && ($ntable->filterForm_Id!=='')) {
-      
-      $sPath = PATH_XMLFORM;      
+
+      $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 ) );
@@ -49,11 +49,11 @@
           }
         }
       }
-      
+
     $filterForm=new filterForm(G::getUIDName( $ntable->filterForm_Id ),$sPath);
-    
-    
-    
+
+
+
     $filterForm->values=$_SESSION[$filterForm->id];
     parse_str( urldecode(get_ajax_value('filter')) , $newValues);
     if (isset($newValues['form'])) {
@@ -77,10 +77,10 @@
 
   //order by
   $orderBy = get_ajax_value('order');
-  if (isset($orderBy)) {
-	  $orderBy = urldecode($orderBy);
-  	$ntable->orderBy = $orderBy;
-  }
+   if (isset($orderBy)) {
+       $orderBy = urldecode($orderBy);
+       $ntable->orderBy = $orderBy;
+   }
 
 	if ( isset($page) && $page!=='' ) $ntable->currentPage = (int) $page;
 
diff --git a/workflow/engine/classes/class.propelTable.php b/workflow/engine/classes/class.propelTable.php
index c4f616b8a..0cbd101df 100755
--- a/workflow/engine/classes/class.propelTable.php
+++ b/workflow/engine/classes/class.propelTable.php
@@ -338,8 +338,13 @@ class propelTable
                 $this->tpl->newBlock( "headers" );
                 $sortOrder = (((isset( $this->aOrder[$this->fields[$r]['Name']] )) && ($this->aOrder[$this->fields[$r]['Name']] === 'ASC')) ? 'DESC' : 'ASC');
                 $sortOrder = (((isset( $this->aOrder[$this->fields[$r]['Name']] )) && ($this->aOrder[$this->fields[$r]['Name']] === 'DESC')) ? '' : $sortOrder);
-                $this->style[$r]['href'] = $this->ownerPage . '?order=' . ($sortOrder !== '' ? (G::createUID( '', $this->fields[$r]['Name'] ) . '=' . $sortOrder) : '') . '&page=' . $this->currentPage;
-                $this->style[$r]['onsort'] = $this->id . '.doSort("' . G::createUID( '', $this->fields[$r]['Name'] ) . '" , "' . $sortOrder . '");return false;';
+                if ($this->style[$r]['titleVisibility'] != '0') {
+                    $this->style[$r]['href'] = $this->ownerPage . '?order=' . ($sortOrder !== '' ? (G::createUID( '', $this->fields[$r]['Name'] ) . '=' . $sortOrder) : '') . '&page=' . $this->currentPage;
+                    $this->style[$r]['onsort'] = $this->id . '.doSort("' . G::createUID( '', $this->fields[$r]['Name'] ) . '" , "' . $sortOrder . '");return false;';
+                } else {
+                    $this->style[$r]['href'] = '#';
+                    $this->style[$r]['onsort'] = 'return false;';
+                }
                 if (isset( $this->style[$r]['href'] )) {
                     $this->tpl->assign( "href", $this->style[$r]['href'] );
                 }
@@ -492,7 +497,7 @@ class propelTable
                 }
             }
             //Hidden titles
-            if (! (strpos( '  linknew button endgrid2 ', ' ' . $this->fields[$r]['Type'] . ' ' ) === false)) {
+            if (! (strpos( '  linknew button link endgrid2 ', ' ' . $this->fields[$r]['Type'] . ' ' ) === false)) {
                 $this->style[$r]['titleVisibility'] = '0';
             }
             //Align titles
diff --git a/workflow/engine/xmlform/dbConnections/dbConnections.xml b/workflow/engine/xmlform/dbConnections/dbConnections.xml
index 54948ec87..d9b931c44 100755
--- a/workflow/engine/xmlform/dbConnections/dbConnections.xml
+++ b/workflow/engine/xmlform/dbConnections/dbConnections.xml
@@ -29,6 +29,7 @@
   <en>Delete</en>
 </DBS_DELETE>
 
-<GET_UID type="link" colWidth="40" value="UID" link="#" onclick="msgBox(&#039;UID: &#039;+@QDBS_UID, &#039;info&#039;);return false;"/>
+<GET_UID type="link" colWidth="40" value="UID" link="#" onclick="msgBox(&#039;UID: &#039;+@QDBS_UID, &#039;info&#039;);return false;"/> 
+
 
 </dynaForm>