diff --git a/gulliver/methods/propelTableAjax.php b/gulliver/methods/propelTableAjax.php
index b0a0bb573..a0f06a5cc 100755
--- a/gulliver/methods/propelTableAjax.php
+++ b/gulliver/methods/propelTableAjax.php
@@ -77,7 +77,7 @@
 
   //order by
   $orderBy = get_ajax_value('order');
-   if (isset($orderBy) && $orderBy !== 'ZDZXRHkzVzNmWVE___%3DASC' && $orderBy !== 'ZDZXRHkzUzRnSFhFdVE___%3DASC' && $orderBy !== 'ZXFpRXk0VzhlQQ______%3DASC') {
+   if (isset($orderBy)) {
        $orderBy = urldecode($orderBy);
        $ntable->orderBy = $orderBy;
    }
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 5074224c8..f5120dc37 100755
--- a/workflow/engine/xmlform/dbConnections/dbConnections.xml
+++ b/workflow/engine/xmlform/dbConnections/dbConnections.xml
@@ -22,15 +22,14 @@
 </DBS_DESCRIPTION>
 
 <DBS_EDIT type="link" colWidth="50" value="Edit" link="javascript:editDbConnection(&#039;@#DBS_UID&#039;)">
-  <en></en>
+  <en>Edit</en>
 </DBS_EDIT>
 
 <DBS_DELETE type="link" colWidth="50" value="Delete" link="javascript:deleteDbConnection(&#039;@#DBS_UID&#039;,&#039;@#PRO_UID&#039;)">
-  <en></en>
+  <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;"/> 
 
 
-
 </dynaForm>