diff --git a/workflow/engine/xmlform/dbConnections/dbConnections.xml b/workflow/engine/xmlform/dbConnections/dbConnections.xml
index d9b931c44..667db3865 100755
--- a/workflow/engine/xmlform/dbConnections/dbConnections.xml
+++ b/workflow/engine/xmlform/dbConnections/dbConnections.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dynaForm type="pagetable" menu="dbConnections/dbConnections_Options">
+<dynaForm type="pagetable" menu="dbConnections/dbConnections_Options" searchBy="DBS_DATABASE_NAME|CON_VALUE">
 
 <DBS_UID type="private" showInTable="0"/>
 
@@ -29,7 +29,18 @@
   <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;"/>
 
+<SEARCH type="button" onclick="pagedTableFilter(this.form);" showInTable="0">
+  <en>Apply Filter</en>
+</SEARCH>
 
-</dynaForm>  
+<PAGED_TABLE_ID type="private" showInTable="0"/>
+
+<JSFILTER type="javascript" replaceTags="1" showInTable="0">
+function pagedTableFilter(form) {
+  @#PAGED_TABLE_ID.doFilter(form);
+}
+</JSFILTER>
+
+</dynaForm>
diff --git a/workflow/engine/xmlform/dbConnections/dbConnections_Options.xml b/workflow/engine/xmlform/dbConnections/dbConnections_Options.xml
index be9aeb53c..c3778a9eb 100755
--- a/workflow/engine/xmlform/dbConnections/dbConnections_Options.xml
+++ b/workflow/engine/xmlform/dbConnections/dbConnections_Options.xml
@@ -7,4 +7,11 @@
   <en>New</en>
 </MNU_ADD>
 
-</dynaForm>  
\ No newline at end of file
+<PAGED_TABLE_ID type="private"/>
+<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
+<SEARCH_FILTER_FORM type="private"/>
+<js type="javascript" replaceTags="1"><![CDATA[
+var currentPagedTable = @#PAGED_TABLE_ID;
+]]></js>
+
+</dynaForm>
\ No newline at end of file
diff --git a/workflow/engine/xmlform/dynaforms/dynaforms_Options.xml b/workflow/engine/xmlform/dynaforms/dynaforms_Options.xml
index 0d601e110..fd0791527 100755
--- a/workflow/engine/xmlform/dynaforms/dynaforms_Options.xml
+++ b/workflow/engine/xmlform/dynaforms/dynaforms_Options.xml
@@ -6,6 +6,8 @@
 </MNU_ADD>
 
 <PAGED_TABLE_ID type="private"/>
+<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
+
 <PRO_UID type="private"/>
 
 <dynaformsEdit type="private" defaultValue="../dynaforms/dynaforms_Edit"/>
diff --git a/workflow/engine/xmlform/dynaforms/dynaforms_ShortList.xml b/workflow/engine/xmlform/dynaforms/dynaforms_ShortList.xml
index 0560bdb1a..db81a1f98 100755
--- a/workflow/engine/xmlform/dynaforms/dynaforms_ShortList.xml
+++ b/workflow/engine/xmlform/dynaforms/dynaforms_ShortList.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dynaForm menu="dynaforms/dynaforms_Options" width="100%" rowsPerPage="12">
+<dynaForm menu="dynaforms/dynaforms_Options" width="100%" rowsPerPage="12" searchBy="C1.CON_VALUE">
 
 <DYN_UID type="hidden" showInTable="0"/>
 <PRO_UID type="hidden" showInTable="1"/>
@@ -31,4 +31,4 @@ function pagedTableFilter( form ) {
 }
 </JSFILTER>
 
-</dynaForm> 
\ No newline at end of file
+</dynaForm>
\ No newline at end of file
diff --git a/workflow/engine/xmlform/inputdocs/inputdocs_Options.xml b/workflow/engine/xmlform/inputdocs/inputdocs_Options.xml
index 25772ed40..a55c1fc2c 100755
--- a/workflow/engine/xmlform/inputdocs/inputdocs_Options.xml
+++ b/workflow/engine/xmlform/inputdocs/inputdocs_Options.xml
@@ -5,6 +5,7 @@
   <en>New</en>
 </MNU_ADD>
 <PAGED_TABLE_ID type="private"/>
+<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
 
 <PRO_UID type="private"/>
 <inputdocsEdit type="private" defaultValue="../inputdocs/inputdocs_Edit"/>
@@ -22,7 +23,7 @@ var currentPagedTable = @#PAGED_TABLE_ID;
     sw = sw && (getField('INP_DOC_TITLE').value!='');
     return sw;
   }
-  function inputdocsSave( form ) { 
+  function inputdocsSave( form ) {
   var nameInput = getField('INP_DOC_TITLE').value;
   var proUid = getField('PRO_UID').value;
   if(getField('INP_DOC_UID').value==''){
@@ -49,10 +50,10 @@ var currentPagedTable = @#PAGED_TABLE_ID;
     }
   }
   function inputdocsDelete( uid ) {
-  
+
 	  result = ajax_function('@G::encryptlink(@#inputdocsDelete)','getRelationInfDoc','INP_DOC_UID='+uid,'POST');
 	  labelToshow = (result)?'@G::LoadTranslation(ID_MSG_CONFIRM_DELETE_IDOCUMENT)':'@G::LoadTranslation(ID_MSG_CONFIRM_DELETE_DOCUMENT)';
-  
+
     new leimnud.module.app.confirm().make({
     	label:labelToshow,
     	action:function()
diff --git a/workflow/engine/xmlform/inputdocs/inputdocs_ShortList.xml b/workflow/engine/xmlform/inputdocs/inputdocs_ShortList.xml
index 70f3e7718..07b132b96 100755
--- a/workflow/engine/xmlform/inputdocs/inputdocs_ShortList.xml
+++ b/workflow/engine/xmlform/inputdocs/inputdocs_ShortList.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dynaForm sqlConnection="" menu="inputdocs/inputdocs_Options" width="100%" rowsPerPage="10">
+<dynaForm sqlConnection="" menu="inputdocs/inputdocs_Options" width="100%" rowsPerPage="10" searchBy="INP_DOC_TITLE">
 
 <INP_DOC_UID type="hidden" showInTable="0"/>
 
@@ -26,4 +26,4 @@ function pagedTableFilter(form) {
 }
 </JSFILTER>
 
-</dynaForm>  
\ No newline at end of file
+</dynaForm>
\ No newline at end of file
diff --git a/workflow/engine/xmlform/outputdocs/outputdocs_Options.xml b/workflow/engine/xmlform/outputdocs/outputdocs_Options.xml
index eb901c596..afd7f8b42 100755
--- a/workflow/engine/xmlform/outputdocs/outputdocs_Options.xml
+++ b/workflow/engine/xmlform/outputdocs/outputdocs_Options.xml
@@ -5,6 +5,7 @@
   <en>New</en>
 </MNU_ADD>
 <PAGED_TABLE_ID type="private"/>
+<PAGED_TABLE_FAST_SEARCH type="FastSearch" label="@G::LoadTranslation(ID_SEARCH)"/>
 
 <PRO_UID type="private"/><![CDATA[>
 ]]><outputdocs_New type="private" defaultValue="../outputdocs/outputdocs_New"/>
@@ -18,27 +19,27 @@ var outputdocsEditor;
   function outputdocsAdd(){
       popupWindow('@G::LoadTranslation(ID_OUTPUT_DOCUMENTS)', '@G::encryptlink(@#outputdocs_New)?PRO_UID=@%PRO_UID' , 600, 410);
   }
-  
+
   function PopupCenter(pageURL, title,w,h) {
     clientWinSize = getClientWindowSize();
-    
+
     var left = (screen.width/2)-(w/2);
     var top = (screen.height/2);//-(h/2);
     var targetWin = window.open (pageURL, title, 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=no, copyhistory=no, width='+w+', height='+h+', top='+top+', left='+left);
-  } 
+  }
 ////////////////////////////////////////////////////
 
 var outputdocsEditor;
   function outputdocsEdit( uid, typ ) {
-     
+
     if (( _BROWSER.name == 'msie' ) && ( _BROWSER.version < '9' )) {
       PopupCenter('../outputdocs/outputdocs_Edit?OUT_DOC_UID=' + uid, 's', 800, 410);
       return false;
     }
-    
+
     wi=770; he=510;
     if ( typ == 'JRXML' ||  typ == 'ACROFORM' ) { wi=500; he=310; }
-		
+
 		outputdocsEditor = new leimnud.module.panel();
 	  outputdocsEditor.options={
 		  limit	   : true,
@@ -48,10 +49,10 @@ var outputdocsEditor;
 		  control	 : {close:true,resize:false},fx: {modal:false},
 		  fx	     : {shadow:false,modal:false}
 	  };
-	  
+
 	  outputdocsEditor.make();
-	  
-	  
+
+
       var oRPC = new leimnud.module.rpc.xmlhttp({
         url : '../outputdocs/outputdocs_Ajax',
         args: 'action=loadOutputEditor&OUT_DOC_UID='+uid+'&OUT_DOC_TYPE='+typ
@@ -66,38 +67,38 @@ var outputdocsEditor;
     }.extend(this);
     oRPC.make();
   }
-  
+
   function outputdocsProperties( uid ) {
         popupWindow('@G::LoadTranslation(ID_OUTPUT_DOCUMENTS)', '@G::encryptlink(@#outputdocs_Properties)?OUT_DOC_UID='+ uid , 600, 530);
   }
-  
+
   function outputdocsPropertiesSave( form ) {
-    var doc = getField("OUT_DOC_FILENAME");    
+    var doc = getField("OUT_DOC_FILENAME");
     if(doc.value=='')
      { alert(G_STRINGS.ID_FILEGENERATED);
      }
-    else  
-     { 
+    else
+     {
         /*ajax_post( form.action, form, 'POST', function(){
        		  currentPopupWindow.remove();
        		  @#PAGED_TABLE_ID.refresh();
      			},
-     			true 
+     			true
      	  );*/
      	  ajax_post( form.action, form, 'POST' );
     		currentPopupWindow.remove();
     		@#PAGED_TABLE_ID.refresh();
-       
-     }  
+
+     }
   }
-  
+
   function outputdocsSave( form ) {
     tinyMCE.execCommand('mceRemoveControl',false,'form[OUT_DOC_TEMPLATE]');
     form.action = '../outputdocs/outputdocs_Save';
     ajax_post( form.action, form, 'POST' );
     outputdocsEditor.remove();
     @#PAGED_TABLE_ID.refresh();
-      
+
   }
 
   function outputdocsDelete( uid ) {
@@ -114,4 +115,4 @@ var outputdocsEditor;
 
 
 <SEARCH_FILTER_FORM type="private"/>
-</dynaForm>  
+</dynaForm>
diff --git a/workflow/engine/xmlform/outputdocs/outputdocs_ShortList.xml b/workflow/engine/xmlform/outputdocs/outputdocs_ShortList.xml
index 8fce0f034..73994c1ab 100755
--- a/workflow/engine/xmlform/outputdocs/outputdocs_ShortList.xml
+++ b/workflow/engine/xmlform/outputdocs/outputdocs_ShortList.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<dynaForm menu="outputdocs/outputdocs_Options" rowsPerPage="10">
+<dynaForm menu="outputdocs/outputdocs_Options" rowsPerPage="10" searchBy="OUT_DOC_TITLE">
 
 <OUT_DOC_UID type="hidden" showInTable="0"/>
 
@@ -32,4 +32,4 @@ function pagedTableFilter(form) {
 }
 </JSFILTER>
 
-</dynaForm>  
\ No newline at end of file
+</dynaForm>
\ No newline at end of file